[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.75 emacs/lisp/diff-mode.el:1.76
*** emacs/lisp/diff-mode.el:1.75        Tue Jun 14 14:34:40 2005
--- emacs/lisp/diff-mode.el     Mon Jul  4 01:55:56 2005
***************
*** 57,63 ****
  
  
  (defgroup diff-mode ()
!   "Major mode for viewing/editing diffs"
    :version "21.1"
    :group 'tools
    :group 'diff)
--- 57,63 ----
  
  
  (defgroup diff-mode ()
!   "Major mode for viewing/editing diffs."
    :version "21.1"
    :group 'tools
    :group 'diff)
***************
*** 640,646 ****
                      (while (progn (setq last-pt (point))
                                    (= (forward-line -1) 0))
                        (case (char-after)
!                         (?  (insert " ") (setq modif nil) (backward-char 1))
                          (?+ (delete-region (point) last-pt) (setq modif t))
                          (?- (if (not modif)
                                  (progn (forward-char 1)
--- 640,646 ----
                      (while (progn (setq last-pt (point))
                                    (= (forward-line -1) 0))
                        (case (char-after)
!                         (?s (insert " ") (setq modif nil) (backward-char 1))
                          (?+ (delete-region (point) last-pt) (setq modif t))
                          (?- (if (not modif)
                                  (progn (forward-char 1)
***************
*** 723,729 ****
                (while (< (point) pt2)
                  (case (char-after)
                    ((?! ?-) (delete-char 2) (insert "-") (forward-line 1))
!                   (?\                 ;merge with the other half of the chunk
                     (let* ((endline2
                             (save-excursion
                               (goto-char pt2) (forward-line 1) (point)))
--- 723,729 ----
                (while (< (point) pt2)
                  (case (char-after)
                    ((?! ?-) (delete-char 2) (insert "-") (forward-line 1))
!                   (?\s                ;merge with the other half of the chunk
                     (let* ((endline2
                             (save-excursion
                               (goto-char pt2) (forward-line 1) (point)))
***************
*** 733,739 ****
                          (insert "+"
                                  (prog1 (buffer-substring (+ pt2 2) endline2)
                                    (delete-region pt2 endline2))))
!                        (?\            ;FIXME: check consistency
                          (delete-region pt2 endline2)
                          (delete-char 1)
                          (forward-line 1))
--- 733,739 ----
                          (insert "+"
                                  (prog1 (buffer-substring (+ pt2 2) endline2)
                                    (delete-region pt2 endline2))))
!                        (?\s           ;FIXME: check consistency
                          (delete-region pt2 endline2)
                          (delete-char 1)
                          (forward-line 1))
***************
*** 814,820 ****
                       (t (when (and first last (< first last))
                            (insert (delete-and-extract-region first last)))
                          (setq first nil last nil)
!                         (equal ?\  c)))
                (forward-line 1))))))))))
  
  (defun diff-fixup-modifs (start end)
--- 814,820 ----
                       (t (when (and first last (< first last))
                            (insert (delete-and-extract-region first last)))
                          (setq first nil last nil)
!                         (equal ?\s c)))
                (forward-line 1))))))))))
  
  (defun diff-fixup-modifs (start end)