date:20190817

[elpa] master 6cd1c85: In ada-mode and wisi, release ada-mode 6.2.1, wisi 2.2.1; fix packaging bugs

2019-08-17 Thread Stephen Leake

branch: master
commit 6cd1c85c9f4b59c639a5d63d61f6c0af86d3d6b5
Author: Stephen Leake 
Commit: Stephen Leake 

In ada-mode and wisi, release ada-mode 6.2.1, wisi 2.2.1; fix packaging bugs
---
 packages/ada-mode/NEWS |   6 +
 packages/ada-mode/README   |   2 +-
 packages/ada-mode/ada-mode.el  |   6 +-
 packages/ada-mode/ada-mode.info|   2 +-
 packages/ada-mode/ada-mode.texi|   4 +-
 packages/ada-mode/ada-project.el   | 120 
 packages/ada-mode/ada_lr1_parse_table.txt.gz   | Bin 3170831 -> 3170831 
bytes
 packages/ada-mode/ada_mode_wisi_parse.gpr.gp   |   4 +
 packages/ada-mode/build.sh |   4 +-
 packages/ada-mode/gnat-core.el |   1 +
 packages/ada-mode/run_ada_lalr_parse.ads   |  32 +++
 packages/ada-mode/run_ada_libadalang_parse.ads |  25 ++
 packages/ada-mode/run_ada_lr1_parse.ads|  33 +++
 packages/ada-mode/run_gpr_parse.ads|  31 ++
 .../ada-mode/wisi-ada-format_parameter_list.adb| 315 +
 packages/uniquify-files/uniquify-files.el  |   3 +-
 packages/wisi/NEWS |   7 +-
 packages/wisi/README   |   2 +-
 packages/wisi/build-wisitoken-bnf-generate.sh  |   4 +-
 packages/wisi/wisi.el  |  47 ++-
 packages/wisi/wisi.gpr |   2 +-
 21 files changed, 622 insertions(+), 28 deletions(-)

diff --git a/packages/ada-mode/NEWS b/packages/ada-mode/NEWS
index 5cbd336..22a55ff 100644
--- a/packages/ada-mode/NEWS
+++ b/packages/ada-mode/NEWS
@@ -7,6 +7,12 @@ Please send ada-mode bug reports to bug-gnu-em...@gnu.org, with
 
 
 * Ada Mode 6.2.1
+17 Aug 2019
+
+** fix packaging bugs
+
+* Ada Mode 6.2.0
+13 Aug 2019
 
 ** parser Ada language protocol version 2
 
diff --git a/packages/ada-mode/README b/packages/ada-mode/README
index f8bd5f2..7cec70d 100644
--- a/packages/ada-mode/README
+++ b/packages/ada-mode/README
@@ -1,4 +1,4 @@
-Emacs Ada mode version 6.2.0
+Emacs Ada mode version 6.2.1
 
 Ada mode provides auto-casing, fontification, navigation, and
 indentation for Ada source code files.
diff --git a/packages/ada-mode/ada-mode.el b/packages/ada-mode/ada-mode.el
index f51cd35..3995491 100644
--- a/packages/ada-mode/ada-mode.el
+++ b/packages/ada-mode/ada-mode.el
@@ -6,8 +6,8 @@
 ;; Maintainer: Stephen Leake 
 ;; Keywords: languages
 ;;  ada
-;; Version: 6.2.0
-;; package-requires: ((uniquify-files "1.0") (wisi "2.2.0") (emacs "25.0"))
+;; Version: 6.2.1
+;; package-requires: ((uniquify-files "1.0.1") (wisi "2.2.1") (emacs "25.0"))
 ;; url: http://www.nongnu.org/ada-mode/
 ;;
 ;; This file is part of GNU Emacs.
@@ -167,7 +167,7 @@
 (defun ada-mode-version ()
   "Return Ada mode version."
   (interactive)
-  (let ((version-string "6.2.0"))
+  (let ((version-string "6.2.1"))
 ;; must match:
 ;; ada-mode.texi
 ;; README-ada-mode
diff --git a/packages/ada-mode/ada-mode.info b/packages/ada-mode/ada-mode.info
index df583fa..375f960 100644
--- a/packages/ada-mode/ada-mode.info
+++ b/packages/ada-mode/ada-mode.info
@@ -25,7 +25,7 @@ File: ada-mode.info,  Node: Top,  Next: Overview,  Prev: 
(dir),  Up: (dir)
 Top
 ***
 
-Ada Mode Version 6.2.0
+Ada Mode Version 6.2.1
 
 * Menu:
 
diff --git a/packages/ada-mode/ada-mode.texi b/packages/ada-mode/ada-mode.texi
index beaf7b1..718abbd 100644
--- a/packages/ada-mode/ada-mode.texi
+++ b/packages/ada-mode/ada-mode.texi
@@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
 
 @titlepage
 @sp 10
-@title Ada Mode Version 6.2.0
+@title Ada Mode Version 6.2.1
 @page
 @vskip 0pt plus 1filll
 @insertcopying
@@ -37,7 +37,7 @@ developing GNU and promoting software freedom.''
 @node Top, Overview, (dir), (dir)
 @top Top
 
-Ada Mode Version 6.2.0
+Ada Mode Version 6.2.1
 @end ifnottex
 
 @menu
diff --git a/packages/ada-mode/ada-project.el b/packages/ada-mode/ada-project.el
new file mode 100644
index 000..ae5b3a4
--- /dev/null
+++ b/packages/ada-mode/ada-project.el
@@ -0,0 +1,120 @@
+;; ada-project.el - project.el backend for ada-mode projects -*- 
lexical-binding: t -*-
+;;
+;; Copyright (C) 2017 - 2019  Free Software Foundation, Inc.
+;;
+;; Author: Stephen Leake 
+;;
+;; This file is part of GNU Emacs.
+;;
+;; GNU Emacs 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.
+;;
+;; GNU Emacs 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 GNU

[elpa] externals/wisitoken-grammar-mode 39f8d03 3/3: * wisitoken-grammar-mmm.el: Delete; merged with wisitoken-grammar-mode.el

2019-08-17 Thread Stephen Leake

branch: externals/wisitoken-grammar-mode
commit 39f8d03a989e76a37c44af683647fc02cca7d79c
Merge: 5322510 fae4953
Author: Stephen Leake 
Commit: Stephen Leake 

* wisitoken-grammar-mmm.el: Delete; merged with wisitoken-grammar-mode.el

* wisitoken-grammar-mode.el: Resolve FIXME.
---
 wisitoken-grammar-mmm.el  | 44 
 wisitoken-grammar-mode.el |  2 --
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/wisitoken-grammar-mmm.el b/wisitoken-grammar-mmm.el
new file mode 100644
index 000..cc19a7c
--- /dev/null
+++ b/wisitoken-grammar-mmm.el
@@ -0,0 +1,44 @@
+;;; Define multi-major-mode stuff for wisitoken-grammar mode.  -*- 
lexical-binding:t -*-
+
+;; Copyright (C) 2019  Free Software Foundation, Inc.
+
+;; This file 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, or (at your option)
+;; any later version.
+
+;; This file 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 GNU Emacs.  If not, see .
+
+(require 'mmm-mode)
+
+(mmm-add-classes
+ '((wisi-action
+:match-submode wisitoken-grammar-mmm-submode
+:face mmm-code-submode-face
+:front "%("
+:back ")%"
+:insert ((?a wisi-action nil @ "%(" @ "" _ "" @ ")%")))
+   (wisi-code
+:match-submode wisi-mmm-submode
+:face mmm-code-submode-face
+:front "%{"
+:back "}%"
+:insert ((?a wisi-code nil @ "%{" @ "" _ "" @ "}%")))
+   ))
+
+(defvar wisitoken-grammar-action-mode) ;; in wisitoken-grammar-mode.el
+(defun wisitoken-grammar-mmm-submode (_delim)
+  "for :match-submode"
+  wisitoken-grammar-action-mode)
+
+(add-to-list 'mmm-mode-ext-classes-alist '(wisitoken-grammar-mode nil 
wisi-action))
+(add-to-list 'mmm-mode-ext-classes-alist '(wisitoken-grammar-mode nil 
wisi-code))
+
+(provide 'wisitoken-grammar-mmm)
+;;; end of file
diff --git a/wisitoken-grammar-mode.el b/wisitoken-grammar-mode.el
index 1f6e53a..42bfe65 100644
--- a/wisitoken-grammar-mode.el
+++ b/wisitoken-grammar-mode.el
@@ -362,8 +362,6 @@ Otherwise insert a plain new line."
   (add-hook 'xref-backend-functions #'wisitoken-grammar--xref-backend
nil ;; append
t)
-  (add-hook 'before-save-hook 'delete-trailing-whitespace nil t)
-  (add-hook 'before-save-hook 'copyright-update nil t)
 
   (wisi-setup
:indent-calculate nil

[elpa] externals/wisitoken-grammar-mode e475bf9 1/3: Release version 1.0.1; fix packaging bugs

2019-08-17 Thread Stephen Leake

branch: externals/wisitoken-grammar-mode
commit e475bf98f9e5a87c98c97cda3dd9639c2f998020
Author: Stephen Leake 
Commit: Stephen Leake 

Release version 1.0.1; fix packaging bugs
---
 build.sh   |   4 +-
 wisi-wisitoken_grammar.adb |   4 +-
 wisi-wisitoken_grammar.ads |   2 +-
 wisitoken-grammar-mmm.el   |  29 -
 wisitoken-grammar-mode.el  |  72 +++---
 wisitoken_grammar.gpr  |   4 +-
 wisitoken_grammar_1-process.el | 133 +
 7 files changed, 190 insertions(+), 58 deletions(-)

diff --git a/build.sh b/build.sh
index cc44216..bd8fb9d 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 # Build and install executables for WisiToken grammar mode.
 
-export GPR_PROJECT_PATH="../wisi-2.0.1"
+export GPR_PROJECT_PATH="../wisi-2.2.1"
+
+gnatprep -DELPA="yes" wisitoken_grammar.gpr.gp wisitoken_grammar.gpr
 
 gprbuild -p -P wisitoken_grammar.gpr
 gprinstall -f -p -P wisitoken_grammar.gpr --install-name=wisitoken_grammar
diff --git a/wisi-wisitoken_grammar.adb b/wisi-wisitoken_grammar.adb
index a45fd78..0b83748 100644
--- a/wisi-wisitoken_grammar.adb
+++ b/wisi-wisitoken_grammar.adb
@@ -27,7 +27,7 @@ package body Wisi.WisiToken_Grammar is
  (Data  : in out Parse_Data_Type;
   Lexer : in WisiToken.Lexer.Handle;
   Descriptor: access constant WisiToken.Descriptor;
-  Source_File_Name  : in String;
+  Base_Terminals: in WisiToken.Base_Token_Array_Access;
   Post_Parse_Action : in Post_Parse_Action_Type;
   Begin_Line: in WisiToken.Line_Number_Type;
   End_Line  : in WisiToken.Line_Number_Type;
@@ -38,7 +38,7 @@ package body Wisi.WisiToken_Grammar is
   use all type Wisitoken_Grammar_1_Process_Actions.Token_Enum_ID;
begin
   Wisi.Initialize
-(Wisi.Parse_Data_Type (Data), Lexer, Descriptor, Source_File_Name, 
Post_Parse_Action,
+(Wisi.Parse_Data_Type (Data), Lexer, Descriptor, Base_Terminals, 
Post_Parse_Action,
  Begin_Line, End_Line, Begin_Indent, "");
 
   Data.First_Comment_ID := +COMMENT_ID;
diff --git a/wisi-wisitoken_grammar.ads b/wisi-wisitoken_grammar.ads
index d2c3e5d..6bc87ad 100644
--- a/wisi-wisitoken_grammar.ads
+++ b/wisi-wisitoken_grammar.ads
@@ -28,7 +28,7 @@ package Wisi.WisiToken_Grammar is
  (Data  : in out Parse_Data_Type;
   Lexer : in WisiToken.Lexer.Handle;
   Descriptor: access constant WisiToken.Descriptor;
-  Source_File_Name  : in String;
+  Base_Terminals: in WisiToken.Base_Token_Array_Access;
   Post_Parse_Action : in Post_Parse_Action_Type;
   Begin_Line: in WisiToken.Line_Number_Type;
   End_Line  : in WisiToken.Line_Number_Type;
diff --git a/wisitoken-grammar-mmm.el b/wisitoken-grammar-mmm.el
deleted file mode 100644
index 7c76b21..000
--- a/wisitoken-grammar-mmm.el
+++ /dev/null
@@ -1,29 +0,0 @@
-;;; Define multi-major-mode stuff for wisitoken-grammar mode.  -*- 
lexical-binding:t -*-
-
-(require 'mmm-mode)
-
-(mmm-add-classes
- '((wisi-action
-:match-submode wisitoken-grammar-mmm-submode
-:face mmm-code-submode-face
-:front "%("
-:back ")%"
-:insert ((?a wisi-action nil @ "%(" @ "" _ "" @ ")%")))
-   (wisi-code
-:match-submode wisi-mmm-submode
-:face mmm-code-submode-face
-:front "%{"
-:back "}%"
-:insert ((?a wisi-code nil @ "%{" @ "" _ "" @ "}%")))
-   ))
-
-(defvar wisitoken-grammar-action-mode) ;; in wisitoken-grammar-mode.el
-(defun wisitoken-grammar-mmm-submode (_delim)
-  "for :match-submode"
-  wisitoken-grammar-action-mode)
-
-(add-to-list 'mmm-mode-ext-classes-alist '(wisitoken-grammar-mode nil 
wisi-action))
-(add-to-list 'mmm-mode-ext-classes-alist '(wisitoken-grammar-mode nil 
wisi-code))
-
-(provide 'wisitoken-grammar-mmm)
-;;; end of file
diff --git a/wisitoken-grammar-mode.el b/wisitoken-grammar-mode.el
index aab4ee7..1b0b29f 100644
--- a/wisitoken-grammar-mode.el
+++ b/wisitoken-grammar-mode.el
@@ -6,10 +6,9 @@
 ;; Maintainer: Stephen Leake 
 ;; Keywords: languages
 ;; Version: 1.0.0
-;; package-requires: ((wisi "2.1.1") (emacs "25.0") (mmm-mode "0.5.7"))
+;; package-requires: ((wisi "2.2.1") (emacs "25.0") (mmm-mode "0.5.7"))
 
-;; (Gnu ELPA requires single digits between dots in versions)
-;; no ’url’; just ELPA
+;; no upstream url; just ELPA
 
 ;; This file is part of GNU Emacs.
 
@@ -31,15 +30,12 @@
 ;;; Commentary:
 
 (require 'cl-lib)
+(require 'mmm-mode)
 (require 'xref)
 (require 'wisi)
 (require 'wisitoken_grammar_1-process)
 (require 'wisi-process-parse)
 
-(eval-and-compile
-  (when (locate-library "mmm-mode")
-(require 'wisitoken-grammar-mmm)))
-
 (defgroup wisitoken-grammar nil
   "Major mode for editing Wisi grammar files in Emacs."
   :group 'languages)
@@ -68,9 +64,6 @@
 map
   )  "Local keymap used for wisitoken-grammar mode.")

[elpa] externals/wisitoken-grammar-mode updated (fae4953 -> 39f8d03)

2019-08-17 Thread Stephen Leake

stephen_leake pushed a change to branch externals/wisitoken-grammar-mode.

  from  fae4953   * wisitoken-grammar-mmm.el: Add missing copyright notice
   new  e475bf9   Release version 1.0.1; fix packaging bugs
   new  5322510   Fix copyright
   new  39f8d03   * wisitoken-grammar-mmm.el: Delete; merged with 
wisitoken-grammar-mode.el


Summary of changes:
 build.sh |  23 +-
 run_wisitoken_grammar_parse.ads  |   2 +-
 wisi-wisitoken_grammar.adb   |   6 +-
 wisi-wisitoken_grammar.ads   |   4 +-
 wisitoken-grammar-mode.el|  78 +
 wisitoken_grammar.gpr| 148 +++
 wisitoken_grammar_1-process.el   | 133 +++
 wisitoken_grammar_mode_parse.ads |   2 +-
 8 files changed, 286 insertions(+), 110 deletions(-)
 create mode 100644 wisitoken_grammar_1-process.el

[elpa] externals/wisitoken-grammar-mode 5322510 2/3: Fix copyright

2019-08-17 Thread Stephen Leake

branch: externals/wisitoken-grammar-mode
commit 53225101cf47ca83235e48cd88dffd3463549ba6
Author: Stephen Leake 
Commit: Stephen Leake 

Fix copyright

* build.sh: Add copyright.

* run_wisitoken_grammar_parse.ads (): Fix copyright.
* wisi-wisitoken_grammar.adb ():

* wisitoken-grammar-mode.el: Bump version.

* wisitoken_grammar.gpr: Fix copyright.
* wisitoken_grammar_mode_parse.ads ():
---
 build.sh |  19 +
 run_wisitoken_grammar_parse.ads  |   2 +-
 wisi-wisitoken_grammar.adb   |   2 +-
 wisi-wisitoken_grammar.ads   |   2 +-
 wisitoken-grammar-mode.el|   2 +-
 wisitoken_grammar.gpr| 148 +++
 wisitoken_grammar_mode_parse.ads |   2 +-
 7 files changed, 98 insertions(+), 79 deletions(-)

diff --git a/build.sh b/build.sh
index bd8fb9d..bfbb378 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,24 @@
 #!/bin/sh
 # Build and install executables for WisiToken grammar mode.
+#
+# Copyright (C) 2017 - 2019  Free Software Foundation, Inc.
+# This file is part of GNU Emacs.
+
+# wisitoken-grammar-mode 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, or (at your option)
+# any later version.
+
+# wisitoken-grammar-mode 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 GNU Emacs; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 
 export GPR_PROJECT_PATH="../wisi-2.2.1"
 
diff --git a/run_wisitoken_grammar_parse.ads b/run_wisitoken_grammar_parse.ads
index 678cdf0..eb698cd 100644
--- a/run_wisitoken_grammar_parse.ads
+++ b/run_wisitoken_grammar_parse.ads
@@ -2,7 +2,7 @@
 --
 --  Run the wisitoken-grammar parser standalone. Useful for debugging grammar 
issues.
 --
---  Copyright (C) 2017 - 2019 Stephen Leake All Rights Reserved.
+--  Copyright (C) 2017 - 2019 Free Software Foundation, Inc.
 --
 --  This program is free software; you can redistribute it and/or
 --  modify it under terms of the GNU General Public License as
diff --git a/wisi-wisitoken_grammar.adb b/wisi-wisitoken_grammar.adb
index 0b83748..2de5a05 100644
--- a/wisi-wisitoken_grammar.adb
+++ b/wisi-wisitoken_grammar.adb
@@ -2,7 +2,7 @@
 --
 --  See spec.
 --
---  Copyright (C) 2019 Stephen Leake All Rights Reserved.
+--  Copyright (C) 2019 Free Software Foundation, Inc.
 --
 --  This library is free software;  you can redistribute it and/or modify it
 --  under terms of the  GNU General Public License  as published by the Free
diff --git a/wisi-wisitoken_grammar.ads b/wisi-wisitoken_grammar.ads
index 6bc87ad..70c404d 100644
--- a/wisi-wisitoken_grammar.ads
+++ b/wisi-wisitoken_grammar.ads
@@ -2,7 +2,7 @@
 --
 --  Wisitoken_grammar parser language-specific runtime
 --
---  Copyright (C) 2019 Stephen Leake All Rights Reserved.
+--  Copyright (C) 2019 Free Software Foundation, Inc.
 --
 --  This library is free software;  you can redistribute it and/or modify it
 --  under terms of the  GNU General Public License  as published by the Free
diff --git a/wisitoken-grammar-mode.el b/wisitoken-grammar-mode.el
index 1b0b29f..1f6e53a 100644
--- a/wisitoken-grammar-mode.el
+++ b/wisitoken-grammar-mode.el
@@ -5,7 +5,7 @@
 ;; Author: Stephen Leake 
 ;; Maintainer: Stephen Leake 
 ;; Keywords: languages
-;; Version: 1.0.0
+;; Version: 1.0.2
 ;; package-requires: ((wisi "2.2.1") (emacs "25.0") (mmm-mode "0.5.7"))
 
 ;; no upstream url; just ELPA
diff --git a/wisitoken_grammar.gpr b/wisitoken_grammar.gpr
index 61e22c0..7d65dde 100644
--- a/wisitoken_grammar.gpr
+++ b/wisitoken_grammar.gpr
@@ -1,74 +1,74 @@
---  Abstract :
---
---  build executables
---
---  Copyright (C) 2017, 2019 Stephen Leake All Rights Reserved.
---
---  This program is free software; you can redistribute it and/or
---  modify it under terms of the GNU General Public License as
---  published by the Free Software Foundation; either version 3, 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
---  distributed with this program; see file COPYING. If not, write to
---  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston,
---  MA 02110-1335, USA.
-
-with "wisi";
-with "wisitoken";
-with "standard_common";
-project WisiToken_Grammar is
-
-   for Main use
-

[elpa] externals/phps-mode 561e8eb: * phps-mode.el: Make sure `Maintainer:` has a valid email address

2019-08-17 Thread Stefan Monnier

branch: externals/phps-mode
commit 561e8eb66a0e1918e06b0a32cdf1490fd057e6f2
Author: Stefan Monnier 
Commit: Stefan Monnier 

* phps-mode.el: Make sure `Maintainer:` has a valid email address
---
 phps-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phps-mode.el b/phps-mode.el
index 29afbd4..7535f62 100644
--- a/phps-mode.el
+++ b/phps-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2018-2019  Free Software Foundation, Inc.
 
 ;; Author: Christian Johansson 
-;; Maintainer: Christian Johansson 
+;; Maintainer: Christian Johansson 
 ;; Created: 3 Mar 2018
 ;; Modified: 16 Aug 2019
 ;; Version: 0.2.4

[elpa] master 55e1e81: * GNUmakefile (check_copyrights): Only look at "copyright" in comments

2019-08-17 Thread Stefan Monnier

branch: master
commit 55e1e81a6db055ec093173b73db6c17d379f686f
Author: Stefan Monnier 
Commit: Stefan Monnier 

* GNUmakefile (check_copyrights): Only look at "copyright" in comments

(%-autoloads.el): Be less noisy.  No need for `archive-refresh-pkg-file`.

* copyright_exceptions: Remove exceptions now ignored by `check_copyrights`
---
 GNUmakefile  |  5 ++---
 copyright_exceptions | 31 ---
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 5d2095f..2560ab9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -26,7 +26,7 @@ check_copyrights:
fquoted="$$(echo $$f|tr '|' '_')";  \
sed -n -e '/[Cc]opyright.*, *[1-9][-0-9]*,\?$$/N'   \
-e '/Free Software Foundation/d'\
-   -e "s|^\\(.*[Cc]opyright\\)|$$fquoted:\\1|p"\
+   -e "s|^\\(.*;.*[Cc]opyright\\)|$$fquoted:\\1|p" \
   "$$f";   \
done) | sort >$(CR_EXCEPTIONS)~
diff -u "$(CR_EXCEPTIONS)" "$(CR_EXCEPTIONS)~"
@@ -137,10 +137,9 @@ autoloads := $(foreach pkg, $(pkgs), $(pkg)/$(notdir 
$(pkg))-autoloads.el)
 
 $(foreach al, $(autoloads), $(eval $(call RULE-srcdeps, $(al
 %-autoloads.el:
-   @echo 'Generating autoloads for $@'
+   @#echo 'Generating autoloads for $@'
@cd $(dir $@) &&   \
  $(EMACS) -l $(CURDIR)/admin/archive-contents.el  \
- --eval "(archive-refresh-pkg-file)"  \
  --eval "(require 'package)"  \
  --eval "(load (expand-file-name \"../names/names-autoloads.el\") 
t t)" \
  --eval "(package-generate-autoloads \"$$(basename $$(pwd))\" \
diff --git a/copyright_exceptions b/copyright_exceptions
index 0f2d2f6..6a5e590 100644
--- a/copyright_exceptions
+++ b/copyright_exceptions
@@ -1,24 +1,6 @@
 ./ada-mode/ada-prj.el
-./ada-mode/ada-skel.el:("copyright_license"
-./ada-mode/ada-skel.el:  "--  Copyright (C) " (format-time-string "%Y ") 
user-full-name " All Rights Reserved.\n"
-./ada-mode/ada-skel.el:  "--  Copyright (C) " (format-time-string "%Y ") 
user-full-name " All Rights Reserved.\n"
-./ada-mode/ada-skel.el:  "--  Copyright (C) " (format-time-string "%Y ") 
user-full-name " All Rights Reserved.\n"
-./ada-mode/ada-skel.el:  "Example copyright/license skeleton, with automatic 
year and owner, GPLv3."
-./ada-mode/ada-skel.el:  "Example copyright/license skeleton, with automatic 
year and owner."
-./ada-mode/ada-skel.el:  "Insert a file header comment, with automatic 
copyright year and prompt for copyright owner/license.
-./ada-mode/ada-skel.el:  "Modified GPLv3 copyright/license skeleton, with 
automatic year and owner."
-./ada-mode/ada-skel.el:  "{copyright_license}\n"
 ./ada-mode/ada-stmt.el
 ./ada-mode/ada-xref.el
-./ada-mode/gpr-skel.el:("copyright_license"
-./ada-mode/gpr-skel.el:  "--  Copyright (C) " (format-time-string "%Y ") 
user-full-name " All Rights Reserved.\n"
-./ada-mode/gpr-skel.el:  "--  Copyright (C) " (format-time-string "%Y ") 
user-full-name " All Rights Reserved.\n"
-./ada-mode/gpr-skel.el:  "Example copyright/license skeleton, with automatic 
year and owner, GPLv3."
-./ada-mode/gpr-skel.el:  "Example copyright/license skeleton, with automatic 
year and owner."
-./ada-mode/gpr-skel.el:  "Insert a file header comment, with automatic 
copyright year and prompt for copyright owner/license.
-./ada-mode/gpr-skel.el:  "{copyright_license}\n"
-./auctex/latex.el:   "pounds" "copyright"
-./auctex/plain-tex.el:   "copyright"
 ./auctex/style/amsart.el
 ./auctex/style/amsbook.el
 ./auctex/style/amsbsy.el
@@ -44,7 +26,6 @@
 ./auctex/style/jsarticle.el
 ./auctex/style/jsbook.el
 ./auctex/style/jurabib.el:;; you assign the copyright to the FSF.
-./auctex/style/latexinfo.el: '("copyright" nil)
 ./auctex/style/mflogo.el
 ./auctex/style/ngerman.el
 ./auctex/style/plfonts.el
@@ -57,16 +38,9 @@
 ./auctex/style/scrreprt.el
 ./auctex/style/slovak.el
 ./auctex/style/swedish.el
-./auctex/style/textcomp.el:'("textcopyright"0) ; Type: 
Symbol -- Slot: 169
 ./auctex/style/virtex.el
-./auctex/tex-fold.el:("(C)" ("copyright"))
-./auctex/tex-info.el:   '("copyright" nil)
-./debbugs/debbugs-gnu.el:(insert "  Copyright-paperwork-exempt: yes"))
-./ergoemacs-mode/ergoemacs-themes.el: ,(lambda () 
emacs-copyright)
 ./excorporate/excorporate-calfw.el:;; copyright assignment papers on file with 
the FSF.
-./gnugo/gnugo.el:(CP "Copyright"   game  simpletext)
 ./hyperbole/hib-doc-id.el:;;  Copyright:
-./math-symbol-lists/math-symbol-lists.el:"columnsep" "columnseprule" 
"columnwidth" "contentsline" "copyright"
 ./mmm-mode/mmm-noweb.el:;; Copyright 1995 by Thorsten.Ohl @ 
Physik.TH-Darmstadt.de

[elpa] externals/wisitoken-grammar-mode fae4953: * wisitoken-grammar-mmm.el: Add missing copyright notice

2019-08-17 Thread Stefan Monnier

branch: externals/wisitoken-grammar-mode
commit fae4953bc73f324300ef9c2a407fd447b9ce42c3
Author: Stefan Monnier 
Commit: Stefan Monnier 

* wisitoken-grammar-mmm.el: Add missing copyright notice
---
 wisitoken-grammar-mmm.el  | 15 +++
 wisitoken-grammar-mode.el |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/wisitoken-grammar-mmm.el b/wisitoken-grammar-mmm.el
index 7c76b21..cc19a7c 100644
--- a/wisitoken-grammar-mmm.el
+++ b/wisitoken-grammar-mmm.el
@@ -1,5 +1,20 @@
 ;;; Define multi-major-mode stuff for wisitoken-grammar mode.  -*- 
lexical-binding:t -*-
 
+;; Copyright (C) 2019  Free Software Foundation, Inc.
+
+;; This file 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, or (at your option)
+;; any later version.
+
+;; This file 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 GNU Emacs.  If not, see .
+
 (require 'mmm-mode)
 
 (mmm-add-classes
diff --git a/wisitoken-grammar-mode.el b/wisitoken-grammar-mode.el
index aab4ee7..08d3e92 100644
--- a/wisitoken-grammar-mode.el
+++ b/wisitoken-grammar-mode.el
@@ -336,6 +336,8 @@ Otherwise insert a plain new line."
   (add-hook 'xref-backend-functions #'wisitoken-grammar--xref-backend
nil ;; append
t)
+  ;; FIXME: What do these two have to do with wisi?
+  ;; They seem like a personal preference only.
   (add-hook 'before-save-hook 'delete-trailing-whitespace nil t)
   (add-hook 'before-save-hook 'copyright-update nil t)

[elpa] master 6cd1c85: In ada-mode and wisi, release ada-mode 6.2.1, wisi 2.2.1; fix packaging bugs

[elpa] externals/wisitoken-grammar-mode 39f8d03 3/3: * wisitoken-grammar-mmm.el: Delete; merged with wisitoken-grammar-mode.el

[elpa] externals/wisitoken-grammar-mode e475bf9 1/3: Release version 1.0.1; fix packaging bugs

[elpa] externals/wisitoken-grammar-mode updated (fae4953 -> 39f8d03)

[elpa] externals/wisitoken-grammar-mode 5322510 2/3: Fix copyright

[elpa] externals/phps-mode 561e8eb: * phps-mode.el: Make sure `Maintainer:` has a valid email address

[elpa] master 55e1e81: * GNUmakefile (check_copyrights): Only look at "copyright" in comments

[elpa] externals/wisitoken-grammar-mode fae4953: * wisitoken-grammar-mmm.el: Add missing copyright notice

8 matches

Site Navigation

Mail list logo

Footer information