(copyright-fix-years): Match properly if the first year is 2-digit.

Don't mess up the whitespace after the years by filling.

2 files changed, 19 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2dcf6630f25..0c4a20be97c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,17 @@
 
 2005-05-15  Richard M. Stallman  <rms@gnu.org>
 
+	* emacs-lisp/copyright.el (copyright-fix-years):
+	Match properly if the first year is 2-digit.
+	Don't mess up the whitespace after the years by filling.
+
+	* dired-aux.el (dired-mark-confirm):
+	Pass t to dired-get-marked-files for DISTINGUISH-ONE-MARKED.
+
+	* dired.el (dired-map-over-marks): New arg DISTINGUISH-ONE-MARKED.
+	(dired-get-marked-files): New arg DISTINGUISH-ONE-MARKED.
+	(dired-mark-pop-up): Handle FILES = (t FILE) specially.
+
 	* emacs-lisp/lisp-mode.el (lisp-mode-variables):
 	Set font-lock-comment-start-skip.
 
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index c2d3303c825..30c76b8769a 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -189,6 +189,8 @@ Uses heuristic: year >= 50 means 19xx, < 50 means 20xx."
 	    last)
 	(set-marker e (1+ (match-end 2)))
 	(goto-char s)
+	;; Back up one character so that our search can match the first year.
+	(backward-char 1)
 	(while (and (< (point) (marker-position e))
 		    (re-search-forward "\\([^0-9]\\)\\([0-9]+\\)[^0-9]"
 				       (marker-position e) t))
@@ -204,8 +206,12 @@ Uses heuristic: year >= 50 means 19xx, < 50 means 20xx."
 	    (setq last p)))
 	(when last
 	  (goto-char last)
-	  (let ((fill-prefix "     "))
-	    (fill-region s last))
+	  ;; Don't mess up whitespace after the years.
+	  (skip-chars-backward " \t")
+	  (save-restriction
+	    (narrow-to-region (point-min) (point))
+	    (let ((fill-prefix "     "))
+	      (fill-region s last)))
 	  )
 	(set-marker e nil)
 	(copyright-update nil t))