--- lisp/simple.el	2004-05-29 23:02:38.000000000 -0400
+++ /home/tzz/emacs/mine/simple.el	2004-05-29 23:04:45.000000000 -0400
@@ -92,33 +92,34 @@
 	next-error-function)))
 
 ;; Return a next-error capable buffer according to the following rules:
-;; 1. If the current buffer is a next-error capable buffer, return it.
-;; 2. If one window on the selected frame displays such buffer, return it.
-;; 3. If next-error-last-buffer is set to a live buffer, use that.
+;; 1. If next-error-last-buffer is set to a live buffer, use that.
+;; 2. If the current buffer is a next-error capable buffer, return it.
+;; 3. If one window on the selected frame displays such buffer, return it.
 ;; 4. Otherwise, look for a next-error capable buffer in a buffer list.
 ;; 5. Signal an error if there are none.
 (defun next-error-find-buffer (&optional other-buffer extra-test)
-  (if (and (not other-buffer)
-	   (next-error-buffer-p (current-buffer) extra-test))
-      ;; The current buffer is a next-error capable buffer.
-      (current-buffer)
-    (or
-     (let ((window-buffers
-            (delete-dups
-             (delq nil
-              (mapcar (lambda (w)
-                        (and (next-error-buffer-p (window-buffer w) extra-test)
-                             (window-buffer w)))
-                      (window-list))))))
-       (if other-buffer
-           (setq window-buffers (delq (current-buffer) window-buffers)))
-       (if (eq (length window-buffers) 1)
-           (car window-buffers)))
-     (if (and next-error-last-buffer (buffer-name next-error-last-buffer)
-              (next-error-buffer-p next-error-last-buffer extra-test)
-              (or (not other-buffer) (not (eq next-error-last-buffer
-                                              (current-buffer)))))
-         next-error-last-buffer
+  (if (and next-error-last-buffer 
+	   (buffer-name next-error-last-buffer)
+	   (next-error-buffer-p next-error-last-buffer extra-test)
+	   (or (not other-buffer) 
+	       (not (eq next-error-last-buffer (current-buffer)))))
+      next-error-last-buffer
+    (if (and (not other-buffer)
+	     (next-error-buffer-p (current-buffer) extra-test))
+	;; The current buffer is a next-error capable buffer.
+	(current-buffer)
+      (or
+       (let ((window-buffers
+	      (delete-dups
+	       (delq nil
+		     (mapcar (lambda (w)
+			       (and (next-error-buffer-p (window-buffer w) extra-test)
+				    (window-buffer w)))
+			     (window-list))))))
+	 (if other-buffer
+	     (setq window-buffers (delq (current-buffer) window-buffers)))
+	 (if (eq (length window-buffers) 1)
+	     (car window-buffers)))
        (let ((buffers (buffer-list)))
          (while (and buffers (or (not (next-error-buffer-p (car buffers) extra-test))
                                  (and other-buffer