Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 866-879)

   - Merge multi-tty branch
   - Update from CVS
   - Merge from emacs--rel--22

Revision: [email protected]/emacs--unicode--0--patch-257

1 files changed, 7 insertions, 4 deletions

diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index b7e8c84cf2..77781ec390 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -55,7 +55,7 @@ The second \\( \\) construct must match the years."
 (defcustom copyright-names-regexp ""
   "Regexp matching the names which correspond to the user.
 Only copyright lines where the name matches this regexp will be updated.
-This allows you to avoid adding yars to a copyright notice belonging to
+This allows you to avoid adding years to a copyright notice belonging to
 someone else or to a group for which you do not work."
   :group 'copyright
   :type 'regexp)
@@ -184,10 +184,13 @@ interactively."
  either \\|; a\\^u eldono \\([0-9]+\\)a, ? a\\^u (la\\^u via	 \\)\
 version \\([0-9]+\\), or (at"
                 (copyright-limit) t)
-	       (not (string= (match-string 3) copyright-current-gpl-version))
+               ;; Don't update if the file is already using a more recent
+               ;; version than the "current" one.
+               (< (string-to-number (match-string 3))
+                  (string-to-number copyright-current-gpl-version))
 	       (or noquery
-		   (y-or-n-p (concat "Replace GPL version by "
-				     copyright-current-gpl-version "? ")))
+		   (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