[elpa] master 835ca0f: [gnugo int] Fix verse meter; nfc.

[Thien-Thi Nguyen]

branch: master
commit 835ca0f26d2be9b216e1cf4d47b8c67af674925f
Author: Thien-Thi Nguyen 
Commit: Thien-Thi Nguyen 

[gnugo int] Fix verse meter; nfc.
---
 packages/gnugo/gnugo.el |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/gnugo/gnugo.el b/packages/gnugo/gnugo.el
index b466e24..ada6fd9 100644
--- a/packages/gnugo/gnugo.el
+++ b/packages/gnugo/gnugo.el
@@ -2055,7 +2055,7 @@ If COMMENT is nil or the empty string, remove the 
property entirely."
 ;; walk to the west, fly to the east,
 ;; talk and then rest, cry and then feast.
 ;;   99 beers down thirsty throats sloshed?
-;;   500 years under pink mountains squashed?
+;;   500 years 'neath pink mountains squashed?
 ;; balk with the best, child now re-creased!
 (if updn
 (push color karma)

[elpa] externals/psgml a6c9fa0: Fix compilation of files in subdirs; use lexical-binding

[Stefan Monnier]

branch: externals/psgml
commit a6c9fa072e0bbfa795000eea6cf5a4eb9cd1f1d8
Author: Stefan Monnier 
Commit: Stefan Monnier 

Fix compilation of files in subdirs; use lexical-binding

* sgmldecl/fum.el: Fix compilation.
(replace-grammar): Avoid insert-buffer.
(spt-synexp): Use pcase.

* testcase/tc22.el, testcase/tc18.el, testcase/tc16.el
* testcase/tc15.el, testcase/tc13.el: Fix compilation, use lexical-binding.

* auxfiles/reform.el, testcase/testsuit.el: Use lexical-binding.
---
 auxfiles/reform.el   |2 +-
 sgmldecl/fum.el  |   50 +-
 testcase/tc13.el |7 +--
 testcase/tc15.el |7 +--
 testcase/tc16.el |7 +--
 testcase/tc18.el |7 +--
 testcase/tc22.el |5 -
 testcase/testsuit.el |6 +++---
 8 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/auxfiles/reform.el b/auxfiles/reform.el
index 2005297..1c6e82e 100644
--- a/auxfiles/reform.el
+++ b/auxfiles/reform.el
@@ -1,4 +1,4 @@
-;;; reform.el --- ??
+;;; reform.el --- ??  -*- lexical-binding:t -*-
 
 ;; Copyright (C)  2017 Free Software Foundation, Inc.
 
diff --git a/sgmldecl/fum.el b/sgmldecl/fum.el
index 36fb431..1da7d3e 100644
--- a/sgmldecl/fum.el
+++ b/sgmldecl/fum.el
@@ -1,10 +1,10 @@
-;;; fum.el --- 
+;;; fum.el ---  -*- lexical-binding:t -*-
 
 ;; Copyright (C)  1995, 2017 Free Software Foundation, Inc.
 
 ;; Author: Lennart Staflin 
 ;; Version: $Id: fum.el,v 1.1 2000/04/12 16:44:26 lenst Exp $
-;; Keywords: 
+;; Keywords:
 ;; Last edited: Sat Aug 31 23:35:29 1996 by le...@triton.lstaflin.pp.se 
(Lennart Staflin)
 
 ;; This program is free software; you can redistribute it and/or
@@ -27,10 +27,12 @@
 
 ;;; Commentary:
 
-;; 
+;;
 
 ;;; Code:
 
+(require 'psgml-parse)
+
  Translation macros
 
 (defun macroexpand-next ()
@@ -50,7 +52,7 @@
   (let ((end (point)))
 (backward-page 1)
 (kill-region (point) (1- end))
-(insert-buffer "*Formatted*")))
+(insert-buffer-substring "*Formatted*")))
 
 (defun spt-nt-name (id)
   (intern (format "sgml-parse-nt-%s" id)))
@@ -61,7 +63,7 @@
   (setq *current-id* id)
   `(defun ,(spt-nt-name id) (check)
  (message "Enter %s" ,id)
- (let ((res 
+ (let ((res
,(spt-synexp 'check synexp)))
(message "Exit %s: %s" ,id res)
res)))
@@ -69,29 +71,17 @@
 (defun spt-synexp (check synexp)
   "Translate the syntax expression SYNEX to lisp with check option CHECK.
 The check option can be `t', `nil', or a variable name."
-  (cond ((stringp synexp)  ; Token
-(spt-token check synexp))
-   ((consp synexp)
-(case (car synexp)
-  ((delim)
-   (spt-delim check (cadr synexp)))
-  ((nt)
-   (spt-nt check (cadr synexp)))
-  ((seq)
-   (spt-seq check (cdr synexp)))
-  ((alt)
-   (spt-alt check (cdr synexp)))
-  ((must once)
-   (spt-synexp check (cadr synexp)))
-  ((many)
-   (spt-many check (cadr synexp)))
-  ((opt)
-   (spt-opt check (cadr synexp)))
-  ((var)
-   (spt-var check (cadr synexp) (caddr synexp)))
-  (else
-   (error "Illegal syntax expression: %s" synexp))
-
+  (pcase synexp
+((pred stringp) (spt-token check synexp))  ; Token
+(`(delim ,d) (spt-delim check d))
+(`(nt ,id) (spt-nt check id))
+(`(seq . ,es) (spt-seq check es))
+(`(alt . ,es) (spt-alt check es))
+(`(,(or `must `once) ,e) (spt-synexp check e))
+(`(many ,e) (spt-many check e))
+(`(opt ,e) (spt-opt check e))
+(`(var ,v ,e) (spt-var check v e))
+(_ (error "Illegal syntax expression: %S" synexp
 
 (defun spt-var (check var synexp)
   (if (null var)
@@ -150,7 +140,7 @@ The check option can be `t', `nil', or a variable name."
(while ,(spt-synexp nil synexp)))
res
 
-(defun spt-opt (check synexp)
+(defun spt-opt (_check synexp)
   `(or ,(spt-synexp nil synexp)
t))
 
@@ -223,6 +213,7 @@ The check option can be `t', `nil', or a variable name."
 
  SGML Declaration Grammar
 
+(eval-when-compile (unless (fboundp 'spt-nt-name) (require 'fum)))
 
 (defnt "171+"
   ;; SGML declaration
@@ -791,4 +782,5 @@ The check option can be `t', `nil', or a variable name."
 
   )
 
+(provide 'fum)
 ;;; fum.el ends here
diff --git a/testcase/tc13.el b/testcase/tc13.el
index 113b6e4..632bfff 100644
--- a/testcase/tc13.el
+++ b/testcase/tc13.el
@@ -1,4 +1,4 @@
-;;; tc13.el --- 
+;;; tc13.el ---   -*- lexical-binding:t -*-
 
 ;; Copyright (C)  2017 Free Software Foundation, Inc.
 
@@ -15,6 +15,9 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see .
 
+(require 'psgml-parse)
+(require 'cl-lib)
+
 (defun psgml-tc13 ()
   (set-buffer