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

[Juanma Barranquero]

Index: emacs/lisp/diff-mode.el
diff -c emacs/lisp/diff-mode.el:1.50 emacs/lisp/diff-mode.el:1.51
*** emacs/lisp/diff-mode.el:1.50        Wed Sep 18 08:09:07 2002
--- emacs/lisp/diff-mode.el     Tue Feb  4 06:08:19 2003
***************
*** 417,423 ****
              (number-to-string newstart2) ",1 @@\n")
        ;; Fix the original hunk-header.
        (diff-fixup-modifs start pos))))
!       
  
  ;;;;
  ;;;; jump to other buffers
--- 417,423 ----
              (number-to-string newstart2) ",1 @@\n")
        ;; Fix the original hunk-header.
        (diff-fixup-modifs start pos))))
! 
  
  ;;;;
  ;;;; jump to other buffers
***************
*** 519,527 ****
        (ediff-patch-file nil (current-buffer))
      (wrong-number-of-arguments (ediff-patch-file))))
  
! ;;;; 
  ;;;; Conversion functions
! ;;;; 
  
  ;;(defvar diff-inhibit-after-change nil
  ;;  "Non-nil means inhibit `diff-mode's after-change functions.")
--- 519,527 ----
        (ediff-patch-file nil (current-buffer))
      (wrong-number-of-arguments (ediff-patch-file))))
  
! ;;;;
  ;;;; Conversion functions
! ;;;;
  
  ;;(defvar diff-inhibit-after-change nil
  ;;  "Non-nil means inhibit `diff-mode's after-change functions.")
***************
*** 791,799 ****
                  (unless (string= new old) (replace-match new t t nil 2))))))
            (setq space 0 plus 0 minus 0 bang 0)))))))
  
! ;;;; 
  ;;;; Hooks
! ;;;; 
  
  (defun diff-write-contents-hooks ()
    "Fixup hunk headers if necessary."
--- 791,799 ----
                  (unless (string= new old) (replace-match new t t nil 2))))))
            (setq space 0 plus 0 minus 0 bang 0)))))))
  
! ;;;;
  ;;;; Hooks
! ;;;;
  
  (defun diff-write-contents-hooks ()
    "Fixup hunk headers if necessary."
***************
*** 847,855 ****
          (diff-fixup-modifs (point) (cdr diff-unhandled-changes)))))
      (setq diff-unhandled-changes nil)))
  
! ;;;; 
  ;;;; The main function
! ;;;; 
  
  ;;;###autoload
  (define-derived-mode diff-mode fundamental-mode "Diff"
--- 847,855 ----
          (diff-fixup-modifs (point) (cdr diff-unhandled-changes)))))
      (setq diff-unhandled-changes nil)))
  
! ;;;;
  ;;;; The main function
! ;;;;
  
  ;;;###autoload
  (define-derived-mode diff-mode fundamental-mode "Diff"