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

2 files changed, 10 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cafbe09329..2098dfa7f50 100644
--- 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 f454d2ef52d..67b521240c1 100644
--- 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