[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/copyright.el

[Lute Kamstra]

Index: emacs/lisp/emacs-lisp/copyright.el
diff -c emacs/lisp/emacs-lisp/copyright.el:1.52 
emacs/lisp/emacs-lisp/copyright.el:1.53
*** emacs/lisp/emacs-lisp/copyright.el:1.52     Sun May 15 22:02:39 2005
--- emacs/lisp/emacs-lisp/copyright.el  Thu May 19 08:13:31 2005
***************
*** 185,209 ****
    (widen)
    (goto-char (point-min))
    (if (re-search-forward copyright-regexp (+ (point) copyright-limit) t)
!       (let ((s (match-beginning 2)) (e (make-marker))
            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))
!         (let ((p (point))
!               (sep (match-string 1))
!               (year (string-to-number (match-string 2))))
!           (goto-char (1+ (match-beginning 0)))
!           (unless (= (char-syntax (string-to-char sep)) ?\s)
              (insert " "))
!           (if (< year 100)
!               (insert (if (>= year 50) "19" "20")))
!           (goto-char p)
!           (setq last p)))
        (when last
          (goto-char last)
          ;; Don't mess up whitespace after the years.
--- 185,208 ----
    (widen)
    (goto-char (point-min))
    (if (re-search-forward copyright-regexp (+ (point) copyright-limit) t)
!       (let ((s (match-beginning 2))
!           (e (copy-marker (1+ (match-end 2))))
!           (p (make-marker))
            last)
        (goto-char s)
!       (while (re-search-forward "[0-9]+" e t)
!         (set-marker p (point))
!         (goto-char (match-beginning 0))
!         (let ((sep (char-before))
!               (year (string-to-number (match-string 0))))
!           (when (and sep
!                      (/= (char-syntax sep) ?\s)
!                      (/= sep ?-))
              (insert " "))
!           (when (< year 100)
!             (insert (if (>= year 50) "19" "20"))))
!         (goto-char p)
!         (setq last p))
        (when last
          (goto-char last)
          ;; Don't mess up whitespace after the years.
***************
*** 211,222 ****
          (save-restriction
            (narrow-to-region (point-min) (point))
            (let ((fill-prefix "     "))
!             (fill-region s last)))
!         )
        (set-marker e nil)
        (copyright-update nil t))
!     (message "No copyright message")
!     (goto-char (point-min))))
  
  ;;;###autoload
  (define-skeleton copyright
--- 210,220 ----
          (save-restriction
            (narrow-to-region (point-min) (point))
            (let ((fill-prefix "     "))
!             (fill-region s last))))
        (set-marker e nil)
+       (set-marker p nil)
        (copyright-update nil t))
!     (message "No copyright message")))
  
  ;;;###autoload
  (define-skeleton copyright