Mercurial > hg > xemacs-beta
diff lisp/occur.el @ 3299:b593e47979a5
[xemacs-hg @ 2006-03-25 11:20:50 by malcolmp]
Rename functions that clash with the next-error family in compile.el.
| author | malcolmp |
|---|---|
| date | Sat, 25 Mar 2006 11:20:51 +0000 |
| parents | 42f7d9eb33a4 |
| children | b4f4e0cc90f1 |
line wrap: on
line diff
--- a/lisp/occur.el Fri Mar 24 22:51:55 2006 +0000 +++ b/lisp/occur.el Sat Mar 25 11:20:51 2006 +0000 @@ -177,7 +177,7 @@ (defun occur-next-error (&optional argp reset) "Move to the Nth (default 1) next match in an Occur mode buffer. -Compatibility function for \\[next-error] invocations." +Compatibility function for \\[next-error-framework-next-error] invocations." (interactive "p") ;; we need to run occur-find-match from within the Occur buffer (with-current-buffer @@ -325,13 +325,13 @@ "Show all lines in buffers BUFS containing a match for REGEXP. This function acts on multiple buffers; otherwise, it is exactly like `occur'." - (defvar ido-ignore-item-temp-list) (interactive (cons (let* ((bufs (list (read-buffer "First buffer to search: " (current-buffer) t))) (buf nil) - (ido-ignore-item-temp-list bufs)) +; (ido-ignore-item-temp-list bufs) + ) (while (not (string-equal (setq buf (read-buffer (if (and-boundp 'read-buffer-function @@ -341,7 +341,8 @@ nil t)) "")) (add-to-list 'bufs buf) - (setq ido-ignore-item-temp-list bufs)) +; (setq ido-ignore-item-temp-list bufs) + ) (nreverse (mapcar #'get-buffer bufs))) (occur-read-primary-args))) (occur-1 regexp nlines bufs))