Index: lisp/diff-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/diff-mode.el,v
retrieving revision 1.113
diff -c -r1.113 diff-mode.el
*** lisp/diff-mode.el	11 Sep 2007 06:59:13 -0000	1.113
--- lisp/diff-mode.el	12 Sep 2007 01:32:24 -0000
***************
*** 1243,1264 ****
                  (after (if (match-string 2) (string-to-number (match-string 2)) 1)))
              (forward-line)
              (while
!                 (case (char-after)
!                   (?\s (decf before) (decf after) t)
!                   (?- (decf before) t)
!                   (?+ (decf after) t)
!                   (t
!                    (cond
!                     ((and (zerop before) (zerop after)) nil)
!                     ((or (< before 0) (< after 0))
!                      (error (if (or (zerop before) (zerop after))
!                                 "End of hunk ambiguously marked"
!                               "Hunk seriously messed up")))
!                     ((not (y-or-n-p "Try to auto-fix whitespace loss and word-wrap damage? "))
!                      (error "Abort!"))
!                     ((eolp) (insert " ") (forward-line -1) t)
!                     (t (insert " ")
!                        (delete-region (- (point) 2) (- (point) 1)) t))))
                (forward-line)))))
  
         ;; A plain diff.
--- 1243,1262 ----
                  (after (if (match-string 2) (string-to-number (match-string 2)) 1)))
              (forward-line)
              (while
! 		(cond ((and (zerop before) (zerop after)) nil)
! 		      ((case (char-after)
! 			 (?\s (decf before) (decf after) t)
! 			 (?- (decf before) t)
! 			 (?+ (decf after) t)))
! 		      ((or (< before 0) (< after 0))
! 		       (error (if (or (zerop before) (zerop after))
! 				  "End of hunk ambiguously marked"
! 				  "Hunk seriously messed up")))
! 		      ((not (y-or-n-p "Try to auto-fix whitespace loss and word-wrap damage? "))
! 		       (error "Abort!"))
! 		      ((eolp) (insert " ") (forward-line -1) t)
! 		      (t (insert " ")
! 			 (delete-region (- (point) 2) (- (point) 1)) t))
                (forward-line)))))
  
         ;; A plain diff.