(diff-next-error): New fun.

(diff-mode): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1992f60108905731de25fa557df79bd3b5b6ca5..da2bb942b6553e8261d3b2d4b99639216856bc41 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * diff-mode.el (diff-next-error): New fun.
+       (diff-mode): Use it.
+
+       * simple.el (next-error): Change arg name.
+       Add support for the documented C-u C-x ` usage.
+
+       * frame.el (special-display-popup-frame, next-multiframe-window)
+       (previous-multiframe-window): Only consider frames on same display.
+
 2004-04-22  Lars Hansen  <larsh@math.ku.dk>
 
        * info.el (Info-restore-desktop-buffer): Delete with-no-warnings.

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index d41bfcad58aa5581df36a5a12619f757b96992fb..176023179581974a5835a589c9d59a9e7c4b1f4e 100644 (file)
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -48,7 +48,6 @@
 ;;
 ;; - Refine hunk on a word-by-word basis.
 ;;
-;; - Use the new next-error-function to allow C-x `.
 ;; - Handle `diff -b' output in context->unified.
 
 ;;; Code:
@@ -886,9 +885,14 @@ See `after-change-functions' for the meaning of BEG, END and LEN."
          (diff-fixup-modifs (point) (cdr diff-unhandled-changes)))))
     (setq diff-unhandled-changes nil)))
 
-;;;;
-;;;; The main function
-;;;;
+(defun diff-next-error (arg reset)
+  ;; Select a window that displays the current buffer so that point
+  ;; movements are reflected in that window.  Otherwise, the user might
+  ;; never see the hunk corresponding to the source she's jumping to.
+  (pop-to-buffer (current-buffer))
+  (if reset (goto-char (point-min)))
+  (diff-hunk-next arg)
+  (diff-goto-source))
 
 ;;;###autoload
 (define-derived-mode diff-mode fundamental-mode "Diff"
@@ -916,6 +920,7 @@ a diff with \\[diff-reverse-direction]."
   ;;   (set (make-local-variable 'paragraph-separate) paragraph-start)
   ;;   (set (make-local-variable 'page-delimiter) "--- [^\t]+\t")
   ;; compile support
+  (set (make-local-variable 'next-error-function) 'diff-next-error)
 
   (when (and (> (point-max) (point-min)) diff-default-read-only)
     (toggle-read-only t))