(copyright-update): Removed the

requirement for a trailing space from `copyright-regexp', to
support copyrights with owner specified on a separate line..

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9cceccc3d20b14705d3861d8697d8d8cad11bf9..bc3ee6007fd8c758f0e58e26308d9449227be364 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2000-01-14  Gerd Moellmann  <gerd@gnu.org>
 
+       * emacs-lisp/copyright.el (copyright-update): Removed the
+       requirement for a trailing space from `copyright-regexp', to
+       support copyrights with owner specified on a separate line..
+       
        * align.el: New file.
 
        * menu-bar.el (menu-bar-tools-menu): Add EUDC submenu.

diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index c4fd29cc64c988858c60ed84dd5d84425c5f0ae2..8499b815df1448484dd4858e8f551a4397bd13db 100644 (file)
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -45,7 +45,7 @@
 (defcustom copyright-regexp
   "\\([\251\81©]\\|@copyright{}\\|[Cc]opyright\\s *:?\\s *(C)\
 \\|[Cc]opyright\\s *:?\\s *[\251\81©]\\)\
-\\s *\\([1-9][-0-9, ']*[0-9]+\\) "
+\\s *\\([1-9][-0-9, ']*[0-9]+\\)"
   "*What your copyright notice looks like.
 The second \\( \\) construct must match the years."
   :group 'copyright
@@ -88,7 +88,6 @@ copyright, if any, are updated as well."
              (if (string= (buffer-substring (- (match-end 2) 2) (match-end 2))
                           (substring copyright-current-year -2))
                  ()
-               (backward-char 1)
                (if (or (not copyright-query)
                        (and (eq copyright-query 'function)
                             (eq this-command 'copyright-update))