emacs: lisp/simple.el comparison

comparison lisp/simple.el @ 89969:3219f94257bc

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-34 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-514 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-522 Update from CVS

author	Miles Bader <miles@gnu.org>
date	Sat, 04 Sep 2004 09:14:28 +0000
parents	d8411455de48 c8bb5aca0581
children	cce1c0ee76ee

comparison

equal deleted inserted replaced

-:1e9fa4848335
+:3219f94257bc
 	(if (and (not (get-buffer-window buffer))
 		 (not (string-match "\\` " (buffer-name buffer))))
 	    (setq found buffer)))
 (setq list (cdr list)))
 (switch-to-buffer found)))
 ;;; next-error support framework
 (defvar next-error-last-buffer nil
 "The most recent next-error buffer.
 A buffer becomes most recent when its compilation, grep, or
 similar mode is started, or when it is used with \\[next-error]
 "Test if BUFFER is a next-error capable buffer."
 (with-current-buffer buffer
 (or (and extra-test (funcall extra-test))
 	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)
+"Return a next-error capable buffer."
-	   (next-error-buffer-p (current-buffer) extra-test))
+(or
-;; The current buffer is a next-error capable buffer.
+;; 1. If one window on the selected frame displays such buffer, return it.
-(current-buffer)
+(let ((window-buffers
-(or
+(delete-dups
-(let ((window-buffers
+(delq nil (mapcar (lambda (w)
-(delete-dups
+(if (next-error-buffer-p
-(delq nil
+(window-buffer w) extra-test)
-(mapcar (lambda (w)
+(window-buffer w)))
-(and (next-error-buffer-p (window-buffer w) extra-test)
+(window-list))))))
-(window-buffer w)))
+(if other-buffer
-(window-list))))))
+(setq window-buffers (delq (current-buffer) window-buffers)))
-(if other-buffer
+(if (eq (length window-buffers) 1)
-(setq window-buffers (delq (current-buffer) window-buffers)))
+(car window-buffers)))
-(if (eq (length window-buffers) 1)
+;; 2. If next-error-last-buffer is set to a live buffer, use that.
-(car window-buffers)))
+(if (and next-error-last-buffer
-(if (and next-error-last-buffer (buffer-name 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
+(or (not other-buffer)
-(current-buffer)))))
+(not (eq next-error-last-buffer (current-buffer)))))
-next-error-last-buffer
+next-error-last-buffer)
-(let ((buffers (buffer-list)))
+;; 3. If the current buffer is a next-error capable buffer, return it.
-(while (and buffers (or (not (next-error-buffer-p (car buffers) extra-test))
+(if (and (not other-buffer)
-(and other-buffer
+(next-error-buffer-p (current-buffer) extra-test))
-(eq (car buffers) (current-buffer)))))
+(current-buffer))
-(setq buffers (cdr buffers)))
+;; 4. Look for a next-error capable buffer in a buffer list.
-(if buffers
+(let ((buffers (buffer-list)))
-(car buffers)
+(while (and buffers
-(or (and other-buffer
+(or (not (next-error-buffer-p (car buffers) extra-test))
-(next-error-buffer-p (current-buffer) extra-test)
+(and other-buffer (eq (car buffers) (current-buffer)))))
-;; The current buffer is a next-error capable buffer.
+(setq buffers (cdr buffers)))
-(progn
+(if buffers
-(if other-buffer
+(car buffers)
-(message "This is the only next-error capable buffer."))
+(or (and other-buffer
-(current-buffer)))
+(next-error-buffer-p (current-buffer) extra-test)
-(error "No next-error capable buffer found"))))))))
+;; The current buffer is a next-error capable buffer.
+(progn
-(defun next-error (arg &optional reset)
+(if other-buffer
+(message "This is the only next-error capable buffer"))
+(current-buffer)))
+(error "No next-error capable buffer found"))))))
+(defun next-error (&optional arg reset)
 "Visit next next-error message and corresponding source code.
 If all the error messages parsed so far have been processed already,
 the message buffer is checked for new ones.
 \\[next-error] normally uses the most recently started
 compilation, grep, or occur buffer.  It can also operate on any
 buffer with output from the \\[compile], \\[grep] commands, or,
 more generally, on any buffer in Compilation mode or with
 Compilation Minor mode enabled, or any buffer in which
-`next-error-function' is bound to an appropriate
+`next-error-function' is bound to an appropriate function.
-function.  To specify use of a particular buffer for error
+To specify use of a particular buffer for error messages, type
-messages, type \\[next-error] in that buffer.
+\\[next-error] in that buffer when it is the only one displayed
+in the current frame.
 Once \\[next-error] has chosen the buffer for error messages,
 it stays with that buffer until you use it in some other buffer which
 uses Compilation mode or Compilation Minor mode.
 (defalias 'goto-next-locus 'next-error)
 (defalias 'next-match 'next-error)
 (define-key ctl-x-map "`" 'next-error)
-(defun previous-error (n)
+(defun previous-error (&optional n)
 "Visit previous next-error message and corresponding source code.
 Prefix arg N says how many error messages to move backwards (or
 forwards, if negative).
 This operates on the output from the \\[compile] and \\[grep] commands."
 (interactive "p")
-(next-error (- n)))
+(next-error (- (or n 1))))
-(defun first-error (n)
+(defun first-error (&optional n)
 "Restart at the first error.
 Visit corresponding source code.
 With prefix arg N, visit the source code of the Nth error.
 This operates on the output from the \\[compile] command, for instance."
 (interactive "p")
 (next-error n t))
-(defun next-error-no-select (n)
+(defun next-error-no-select (&optional n)
 "Move point to the next error in the next-error buffer and highlight match.
 Prefix arg N says how many error messages to move forwards (or
 backwards, if negative).
 Finds and highlights the source line like \\[next-error], but does not
 select the source buffer."
 (interactive "p")
-(next-error n)
+(let ((next-error-highlight next-error-highlight-no-select))
+(next-error n))
 (pop-to-buffer next-error-last-buffer))
-(defun previous-error-no-select (n)
+(defun previous-error-no-select (&optional n)
 "Move point to the previous error in the next-error buffer and highlight match.
 Prefix arg N says how many error messages to move backwards (or
 forwards, if negative).
 Finds and highlights the source line like \\[previous-error], but does not
 select the source buffer."
 (interactive "p")
-(next-error-no-select (- n)))
+(next-error-no-select (- (or n 1))))
+(defgroup next-error nil
+"next-error support framework."
+:group 'compilation
+:version "21.4")
+(defface next-error
+'((t (:inherit region)))
+"Face used to highlight next error locus."
+:group 'next-error
+:version "21.4")
+(defcustom next-error-highlight 0.1
+"*Highlighting of locations in selected source buffers.
+If number, highlight the locus in next-error face for given time in seconds.
+If t, use persistent overlays fontified in next-error face.
+If nil, don't highlight the locus in the source buffer.
+If `fringe-arrow', indicate the locus by the fringe arrow."
+:type '(choice (number :tag "Delay")
+(const :tag "Persistent overlay" t)
+(const :tag "No highlighting" nil)
+(const :tag "Fringe arrow" 'fringe-arrow))
+:group 'next-error
+:version "21.4")
+(defcustom next-error-highlight-no-select 0.1
+"*Highlighting of locations in non-selected source buffers.
+If number, highlight the locus in next-error face for given time in seconds.
+If t, use persistent overlays fontified in next-error face.
+If nil, don't highlight the locus in the source buffer.
+If `fringe-arrow', indicate the locus by the fringe arrow."
+:type '(choice (number :tag "Delay")
+(const :tag "Persistent overlay" t)
+(const :tag "No highlighting" nil)
+(const :tag "Fringe arrow" 'fringe-arrow))
+:group 'next-error
+:version "21.4")
 ;;;
 (defun fundamental-mode ()
 "Major mode not specialized for anything in particular.
 Other major modes are defined by comparison with this one."

Mercurial > emacs

comparison lisp/simple.el @ 89969:3219f94257bc