changeset 103919:ab3de87ae5a3

(copyright-update): Save match-data across y-or-n-p, for safety.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 16 Jul 2009 02:01:31 +0000
parents 74a905fff633
children 59df3dbbd245
files lisp/ChangeLog lisp/emacs-lisp/copyright.el
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Jul 16 01:52:32 2009 +0000
+++ b/lisp/ChangeLog	Thu Jul 16 02:01:31 2009 +0000
@@ -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>
 
--- a/lisp/emacs-lisp/copyright.el	Thu Jul 16 01:52:32 2009 +0000
+++ b/lisp/emacs-lisp/copyright.el	Thu Jul 16 02:01:31 2009 +0000
@@ -223,8 +223,9 @@
                (< (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