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

[Martin Rudalics]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Martin Rudalics <m061211>       09/04/21 06:56:54

Modified files:
        lisp           : ChangeLog diff-mode.el 

Log message:
        (diff-find-source-location): Don't call
        diff-sanity-check-hunk when NOPROMPT is non-nil.  (Bug#3030)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15604&r2=1.15605
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/diff-mode.el?cvsroot=emacs&r1=1.157&r2=1.158

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15604
retrieving revision 1.15605
diff -u -b -r1.15604 -r1.15605
--- ChangeLog   21 Apr 2009 02:10:41 -0000      1.15604
+++ ChangeLog   21 Apr 2009 06:56:51 -0000      1.15605
@@ -1,3 +1,8 @@
+2009-04-21  Martin Rudalics  <address@hidden>
+
+       * diff-mode.el (diff-find-source-location): Don't call
+       diff-sanity-check-hunk when NOPROMPT is non-nil.  (Bug#3030)
+
 2009-04-21  Kenichi Handa  <address@hidden>
 
        * international/uni-decomposition.el: Re-generated.

Index: diff-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/diff-mode.el,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- diff-mode.el        13 Jan 2009 14:55:57 -0000      1.157
+++ diff-mode.el        21 Apr 2009 06:56:54 -0000      1.158
@@ -1575,7 +1575,9 @@
            ;; the user may disagree on what constitutes the hunk
            ;; (e.g. because an empty line truncates the hunk mid-course),
            ;; leading to potentially nasty surprises for the user.
-           (_ (diff-sanity-check-hunk))
+          ;;
+          ;; Suppress check when NOPROMPT is non-nil (Bug#3030).
+           (_ (unless noprompt (diff-sanity-check-hunk)))
           (hunk (buffer-substring
                   (point) (save-excursion (diff-end-of-hunk) (point))))
           (old (diff-hunk-text hunk reverse char-offset))