Mercurial > emacs
diff lisp/emacs-lisp/copyright.el @ 109786:29d15cb50113
Save window excursion before prompting in copyright-update-* (Bug#5394).
* emacs-lisp/copyright.el (copyright-update-year)
(copyright-update): Use save-window-excursion (Bug#5394).
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 14 Aug 2010 19:30:51 -0400 |
parents | 1d1d5d9bd884 |
children | 417b1e4d63cd |
line wrap: on
line diff
--- a/lisp/emacs-lisp/copyright.el Sat Aug 14 19:01:42 2010 -0400 +++ b/lisp/emacs-lisp/copyright.el Sat Aug 14 19:30:51 2010 -0400 @@ -158,13 +158,15 @@ (unless (string= (buffer-substring (- (match-end 3) 2) (match-end 3)) (substring copyright-current-year -2)) (if (or noquery - ;; Fixes some point-moving oddness (bug#2209). - (save-excursion - (y-or-n-p (if replace - (concat "Replace copyright year(s) by " - copyright-current-year "? ") - (concat "Add " copyright-current-year - " to copyright? "))))) + (save-window-excursion + (switch-to-buffer (current-buffer)) + ;; Fixes some point-moving oddness (bug#2209). + (save-excursion + (y-or-n-p (if replace + (concat "Replace copyright year(s) by " + copyright-current-year "? ") + (concat "Add " copyright-current-year + " to copyright? ")))))) (if replace (replace-match copyright-current-year t t nil 3) (let ((size (save-excursion (skip-chars-backward "0-9")))) @@ -224,8 +226,10 @@ (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)))) + (save-window-excursion + (switch-to-buffer (current-buffer)) + (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