[Emacs-diffs] emacs/lisp ChangeLog emacs-lisp/copyright.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/07/16 02:01:36

Modified files:
        lisp           : ChangeLog 
        lisp/emacs-lisp: copyright.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15813&r2=1.15814
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/copyright.el?cvsroot=emacs&r1=1.81&r2=1.82

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15813
retrieving revision 1.15814
diff -u -b -r1.15813 -r1.15814
--- ChangeLog   16 Jul 2009 01:52:32 -0000      1.15813
+++ ChangeLog   16 Jul 2009 02:01:31 -0000      1.15814
@@ -1,3 +1,8 @@
+2009-07-16  Kevin Ryde  <address@hidden>
+
+       * emacs-lisp/copyright.el (copyright-update): Save match-data across
+       y-or-n-p, for safety.
+
 2009-07-16  Richard Stallman  <address@hidden>
 
        * files.el (auto-save-mode): If buffer-saved-size is -2,
@@ -130,8 +135,8 @@
 
 2009-07-10  Eli Zaretskii  <address@hidden>
 
-       * 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  <address@hidden>
 

Index: emacs-lisp/copyright.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/copyright.el,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- emacs-lisp/copyright.el     17 Feb 2009 10:14:01 -0000      1.81
+++ emacs-lisp/copyright.el     16 Jul 2009 02:01:36 -0000      1.82
@@ -223,8 +223,9 @@
                (< (string-to-number (match-string 3))
                   (string-to-number copyright-current-gpl-version))
               (or noquery
+                   (save-match-data
                   (y-or-n-p (format "Replace GPL version by %s? "
-                                    copyright-current-gpl-version)))
+                                       copyright-current-gpl-version))))
               (progn
                 (if (match-end 2)
                     ;; Esperanto bilingual comment in two-column.el