(copyright-update): Save match-data across y-or-n-p, for safety.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cafbe093293864d9aa22b5344f4847a787f98aa..2098dfa7f5089be05a3c0c0bea784e711912d24e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-16  Kevin Ryde  <user42@zip.com.au>
+
+       * emacs-lisp/copyright.el (copyright-update): Save match-data across
+       y-or-n-p, for safety.
+
 2009-07-16  Richard Stallman  <rms@gnu.org>
 
        * files.el (auto-save-mode): If buffer-saved-size is -2,
@@ -130,8 +135,8 @@
 
 2009-07-10  Eli Zaretskii  <eliz@gnu.org>
 
-       * cus-edit.el (customize-changed-options-previous-release): Bump
-       value to 22.1.  (Bug#3804)
+       * cus-edit.el (customize-changed-options-previous-release):
+       Bump value to 22.1.  (Bug#3804)
 
 2009-07-08  Sam Steingold  <sds@gnu.org>
 

diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index f454d2ef52dc4c1f230f39c655f2f0440376c3f0..67b521240c16ba687d629f15ccbbae5329baa059 100644 (file)
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -223,8 +223,9 @@ version \\([0-9]+\\), or (at"
                (< (string-to-number (match-string 3))
                   (string-to-number copyright-current-gpl-version))
               (or noquery
-                  (y-or-n-p (format "Replace GPL version by %s? "
-                                    copyright-current-gpl-version)))
+                   (save-match-data
+                     (y-or-n-p (format "Replace GPL version by %s? "
+                                       copyright-current-gpl-version))))
               (progn
                 (if (match-end 2)
                     ;; Esperanto bilingual comment in two-column.el