Tweak copyright-regexp

Tweaked to match copyright statements where the years follow the name.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1549

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 77aa43c77af..31cc564e05e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-17  Miles Bader  <miles@gnu.org>
+
+        * emacs-lisp/copyright.el (copyright-regexp): Tweaked to match
+        copyright statements where the years follow the name.
+
 2009-02-17  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/copyright.el (copyright-update-year): Don't let y-or-n-p
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index 04020d652e7..f454d2ef52d 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -51,7 +51,8 @@ This is useful for ChangeLogs."
 (defcustom copyright-regexp
  "\\(©\\|@copyright{}\\|[Cc]opyright\\s *:?\\s *\\(?:(C)\\)?\
 \\|[Cc]opyright\\s *:?\\s *©\\)\
-\\s *\\([1-9]\\([-0-9, ';/*%#\n\t]\\|\\s<\\|\\s>\\)*[0-9]+\\)"
+\\s *\\(?:[^0-9\n]*\\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