allow % and # as well as ; in copyright notice

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 08d3d17ce0be991785cb2cfeee40bc3dd82919ec..14963f0ef8c9ece5fbb1734b3a2e16fe23bfd0fc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-04  Karl Berry  <karl@gnu.org>
+
+       * emacs-lisp/copyright.el (copyright-regexp): allow the common
+       comment characters % and # in the copyright year notice,
+       as well as ;.
+
 2004-01-04  Per Abrahamsen  <abraham@dina.kvl.dk>
 
        * wid-edit.el (default): Define dummy :value-delete.

diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index fc0a5b7472619622d3f184ac666bb345933b8b77..4532f7e5b776c00447881f05f63fb2dbbf2497d8 100644 (file)
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -1,6 +1,6 @@
 ;;; copyright.el --- update the copyright notice in current buffer
 
-;; Copyright (C) 1991, 92, 93, 94, 95, 1998, 2001, 2003
+;; Copyright (C) 1991, 92, 93, 94, 95, 1998, 2001, 2003, 2004
 ;;           Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
@@ -47,7 +47,7 @@ A value of nil means to search whole buffer."
 (defcustom copyright-regexp
  "\\([\81©\8e©]\\|@copyright{}\\|[Cc]opyright\\s *:?\\s *\\(?:(C)\\)?\
 \\|[Cc]opyright\\s *:?\\s *[\81©\8e©]\\)\
-\\s *\\([1-9]\\([-0-9, ';\n\t]\\|\\s<\\|\\s>\\)*[0-9]+\\)"
+\\s *\\([1-9]\\([-0-9, ';%#\n\t]\\|\\s<\\|\\s>\\)*[0-9]+\\)"
   "*What your copyright notice looks like.
 The second \\( \\) construct must match the years."
   :group 'copyright