[elpa] externals/psgml 3cc7e32: * psgml: Fix up check_copyright on aux files

[Stefan Monnier]

branch: externals/psgml
commit 3cc7e322401789f01b933dfb1a77993317326672
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * psgml: Fix up check_copyright on aux files
    
    testcase/testsuit.el: Use cl-lib.
---
 auxfiles/reform.el   |   16 ++++++++++++++++
 psgml.el             |    2 +-
 sgmldecl/fum.el      |   29 +++++++++++++---------------
 testcase/tc13.el     |   17 +++++++++++++++++
 testcase/tc15.el     |   17 +++++++++++++++++
 testcase/tc16.el     |   17 +++++++++++++++++
 testcase/tc18.el     |   17 +++++++++++++++++
 testcase/tc22.el     |   17 +++++++++++++++++
 testcase/testsuit.el |   52 +++++++++++++++++++++++++++++++++-----------------
 9 files changed, 149 insertions(+), 35 deletions(-)

diff --git a/auxfiles/reform.el b/auxfiles/reform.el
index 438cd5c..2005297 100644
--- a/auxfiles/reform.el
+++ b/auxfiles/reform.el
@@ -1,3 +1,19 @@
+;;; reform.el --- ??
+
+;; Copyright (C)  2017 Free Software Foundation, Inc.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (require 'psgml-api)
 
diff --git a/psgml.el b/psgml.el
index b3a8be7..142079a 100644
--- a/psgml.el
+++ b/psgml.el
@@ -648,7 +648,7 @@ Should return a string suitable form printing in the echo 
area.")
    ["Untag Element"            sgml-untag-element t]
    ["Trim and leave element"   sgml-trim-and-leave-element t]
    ;; FIXME: These 2 commands used to be in psgml-charent, but I wasn't able to
-   ;; get their author's copyright (Steinar Bang and Falch Hurtigtrykk).
+   ;; get their author's paperwork (Steinar Bang and Falch Hurtigtrykk).
    ;; We should rewrite them, but I can't understand DTD enough to know how
    ;; it's really supposed to work.  --Stef
    ;;["Decode Character Entities"  sgml-charent-to-display-char t]
diff --git a/sgmldecl/fum.el b/sgmldecl/fum.el
index 6b0f7c3..36fb431 100644
--- a/sgmldecl/fum.el
+++ b/sgmldecl/fum.el
@@ -1,27 +1,24 @@
 ;;; fum.el --- 
 
-;; Copyright (C) 1995 Lennart Staflin
+;; Copyright (C)  1995, 2017 Free Software Foundation, Inc.
 
 ;; Author: Lennart Staflin <address@hidden>
 ;; Version: $Id: fum.el,v 1.1 2000/04/12 16:44:26 lenst Exp $
 ;; Keywords: 
 ;; Last edited: Sat Aug 31 23:35:29 1996 by address@hidden (Lennart Staflin)
 
-;;; This program is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 1, or (at your option)
-;;; any later version.
-;;;
-;;; This program is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; A copy of the GNU General Public License can be obtained from this
-;;; program's author (send electronic mail to address@hidden) or from
-;;; the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
-;;; 02139, USA.
-;;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; LCD Archive Entry:
 ;; fum|Lennart Staflin|address@hidden|
diff --git a/testcase/tc13.el b/testcase/tc13.el
index 955aaa9..113b6e4 100644
--- a/testcase/tc13.el
+++ b/testcase/tc13.el
@@ -1,3 +1,20 @@
+;;; tc13.el --- 
+
+;; Copyright (C)  2017 Free Software Foundation, Inc.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 (defun psgml-tc13 ()
   (set-buffer (get-buffer-create "*Tc13*"))
   (erase-buffer)
diff --git a/testcase/tc15.el b/testcase/tc15.el
index 2ca8d85..49d5a58 100644
--- a/testcase/tc15.el
+++ b/testcase/tc15.el
@@ -1,3 +1,20 @@
+;;; tc15.el --- 
+
+;; Copyright (C)  2017 Free Software Foundation, Inc.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 (defun psgml-tc15 ()
   ;; Check that completing honors insert-case
   (set-buffer (get-buffer-create "*Tc15*"))
diff --git a/testcase/tc16.el b/testcase/tc16.el
index 45ca671..7722e26 100644
--- a/testcase/tc16.el
+++ b/testcase/tc16.el
@@ -1,3 +1,20 @@
+;;; tc16.el --- 
+
+;; Copyright (C)  2017 Free Software Foundation, Inc.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 (let ()
   (switch-to-buffer (generate-new-buffer "tc16 temp"))
   (insert-file-contents "tc16.html")
diff --git a/testcase/tc18.el b/testcase/tc18.el
index 520c432..6b91593 100644
--- a/testcase/tc18.el
+++ b/testcase/tc18.el
@@ -1,3 +1,20 @@
+;;; tc18.el --- 
+
+;; Copyright (C)  2017 Free Software Foundation, Inc.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 (with-temp-buffer
   (insert-file-contents "tc18.html")
   (goto-char (point-min))
diff --git a/testcase/tc22.el b/testcase/tc22.el
index a28e492..0e19904 100644
--- a/testcase/tc22.el
+++ b/testcase/tc22.el
@@ -1,3 +1,20 @@
+;;; tc22.el --- 
+
+;; Copyright (C)  2017 Free Software Foundation, Inc.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 (let ((sgml-ecat-files '("tc22.ecat"))
       (dd default-directory))
diff --git a/testcase/testsuit.el b/testcase/testsuit.el
index 2fae881..2486691 100644
--- a/testcase/testsuit.el
+++ b/testcase/testsuit.el
@@ -1,8 +1,23 @@
-;;; testsuit.el -- Test Suit for PSGML
+;;; testsuit.el --- Test Suite for PSGML
 
-;; $Id: testsuit.el,v 1.15 2005/03/08 18:39:30 lenst Exp $
+;; Copyright (C)  2017 Free Software Foundation, Inc.
 
-(require 'cl)
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'cl-lib)
 (require 'psgml)
 (require 'psgml-parse)
 
@@ -31,8 +46,8 @@
 (defun testsuit-pi-handler (string)
   (when (string-match "ASSERT\\>" string )
     (let ((form (car (read-from-string (substring string (match-end 0))))))
-      (assert (eval form) nil
-              "Assertion fail: %S" form))))
+      (cl-assert (eval form) nil
+                 "Assertion fail: %S" form))))
 
   
 (defun testsuit-run-test-case (case-description)
@@ -48,7 +63,7 @@
     (setq sgml-warning-message-flag nil)
     (condition-case errcode
         (progn
-          (if (string-match "\\.el$" (buffer-file-name))
+          (if (string-match "\\.el\\'" buffer-file-name)
               (progn (eval-buffer))
             (message "current buffer: %s" (current-buffer))
             (sgml-load-doctype)
@@ -56,29 +71,30 @@
             (sgml-parse-until-end-of nil)))
       (error
        (if expected
-           (case (caar expected)
-             (error (debug)))
+           (pcase (caar expected)
+             (`error (debug)))
          (error "Unexpected %s" errcode))))
 
-    (while (and expected)
-      (case (caar expected)
-        (warning
+    (dolist (test expected)
+      (pcase (car test)
+        (`warning
          (setq warning-expected t)
-         (let ((warning-pattern (cadar expected)))
+         (let ((warning-pattern (cadr test)))
            (with-current-buffer  "*Messages*"
              (goto-char (point-min))
              (or (re-search-forward warning-pattern nil t)
                  (error "No %s warning" warning-pattern)))))
-        (assert
-         (or (eval (cadar expected))
-             (error "Fail: %s" (cadar expected)))))
-      (setq expected (cdr expected)))
+        (`assert
+         (or (eval (cadr test))
+             (error "Fail: %s" (cadr test))))))
     (when (and sgml-warning-message-flag (not warning-expected))
       (error "Unexpected warnings")) ))
 
 
 (defun testsuit-run ()
   (interactive)
-  (loop for tc in psgml-test-cases
-        do (testsuit-run-test-case tc))
+  (cl-loop for tc in psgml-test-cases
+           do (testsuit-run-test-case tc))
   (message "Done"))
+
+;;; testsuit.el ends here