Re: next-error-last-buffer

[Ted Zlatanov <tzz@lifelogs.com>]

[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]

On Sat, 29 May 2004, juri@jurta.org wrote:

> But there is even simpler solution for the user to select a buffer
> for the next C-x `.
> 
> Taking into account the recent addition of a rule in
> `next-error-find-buffer' which returns a buffer which is displayed
> only in one window with a next-error capable buffer on the selected
> frame, the user can simply remove the unwanted window with a
> next-error capable buffer (e.g. *grep* buffer in the aforementioned
> test case) from the selected frame and C-x ` will use the buffer from
> the remaining window (e.g. a patch file) even if it is not the same as
> next-error-last-buffer.

Nice, that simplifies things a lot.

> So the only change needed is to modify the rule order like you proposed,
> which could look as below:
> 
> 1. If one window on the selected frame displays such buffer, return it.
> 2. If next-error-last-buffer is set to a live buffer, use that.
> 3. If the current buffer is a next-error capable buffer, return it.
> ...

Patch attached (unified and context).

Ted


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: simple.patch --]
[-- Type: text/x-patch, Size: 2815 bytes --]

--- 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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: simple.context.patch --]
[-- Type: text/x-patch, Size: 3348 bytes --]

*** lisp/simple.el	Sat May 29 23:02:38 2004
--- /home/tzz/emacs/mine/simple.el	Sat May 29 23:04:45 2004
***************
*** 92,124 ****
  	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.
  ;; 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
         (let ((buffers (buffer-list)))
           (while (and buffers (or (not (next-error-buffer-p (car buffers) extra-test))
                                   (and other-buffer
--- 92,125 ----
  	next-error-function)))
  
  ;; Return a next-error capable buffer according to the following rules:
! ;; 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 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

[-- Attachment #4: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel