From: Luc Teirlinck Date: Wed, 18 Aug 2004 02:11:36 +0000 (+0000) Subject: (copyright-update-year): Delete code that replaces 20xy with xy. X-Git-Tag: ttn-vms-21-2-B4~5255 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=697f502a87969aa238c060e018181c5975da6185;p=emacs.git (copyright-update-year): Delete code that replaces 20xy with xy. --- diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index 4ed82d22239..3d160f54606 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -100,7 +100,7 @@ When this is `function', only ask when called non-interactively." (forward-line 1) (re-search-forward comment-start-skip) (re-search-forward copyright-years-regexp)) - + ;; Note that `current-time-string' isn't locale-sensitive. (setq copyright-current-year (substring (current-time-string) -4)) (unless (string= (buffer-substring (- (match-end 2) 2) (match-end 2)) @@ -124,26 +124,6 @@ When this is `function', only ask when called non-interactively." (eq (char-after (+ (point) size -2)) ?-))) ;; This is a range so just replace the end part. (delete-char size) - ;; Detect if this is using the following shorthand: - ;; (C) 1993, 94, 95, 1998, 2000, 01, 02, 2003 - (if (and - ;; Check that the last year was 4-chars and same century. - (eq size -4) - (equal (buffer-substring (- (point) 4) (- (point) 2)) - (substring copyright-current-year 0 2)) - ;; Check that there are 2-char years as well. - (save-excursion - (re-search-backward "[^0-9][0-9][0-9][^0-9]" - (line-beginning-position) t)) - ;; Make sure we don't remove the first century marker. - (save-excursion - (forward-char size) - (re-search-backward - (concat (buffer-substring (point) (+ (point) 2)) - "[0-9][0-9]") - (line-beginning-position) t))) - ;; Remove the century marker of the last entry. - (delete-region (- (point) 4) (- (point) 2))) ;; Insert a comma with the preferred number of spaces. (insert (save-excursion