comparison 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
comparison
equal deleted inserted replaced
3298:4f60b18bdee8 3299:b593e47979a5
175 (interactive "p") 175 (interactive "p")
176 (occur-find-match n #'previous-single-property-change "No earlier matches")) 176 (occur-find-match n #'previous-single-property-change "No earlier matches"))
177 177
178 (defun occur-next-error (&optional argp reset) 178 (defun occur-next-error (&optional argp reset)
179 "Move to the Nth (default 1) next match in an Occur mode buffer. 179 "Move to the Nth (default 1) next match in an Occur mode buffer.
180 Compatibility function for \\[next-error] invocations." 180 Compatibility function for \\[next-error-framework-next-error] invocations."
181 (interactive "p") 181 (interactive "p")
182 ;; we need to run occur-find-match from within the Occur buffer 182 ;; we need to run occur-find-match from within the Occur buffer
183 (with-current-buffer 183 (with-current-buffer
184 ;; Choose the buffer and make it current. 184 ;; Choose the buffer and make it current.
185 (if (next-error-buffer-p (current-buffer)) 185 (if (next-error-buffer-p (current-buffer))
323 ;;;###autoload 323 ;;;###autoload
324 (defun multi-occur (bufs regexp &optional nlines) 324 (defun multi-occur (bufs regexp &optional nlines)
325 "Show all lines in buffers BUFS containing a match for REGEXP. 325 "Show all lines in buffers BUFS containing a match for REGEXP.
326 This function acts on multiple buffers; otherwise, it is exactly like 326 This function acts on multiple buffers; otherwise, it is exactly like
327 `occur'." 327 `occur'."
328 (defvar ido-ignore-item-temp-list)
329 (interactive 328 (interactive
330 (cons 329 (cons
331 (let* ((bufs (list (read-buffer "First buffer to search: " 330 (let* ((bufs (list (read-buffer "First buffer to search: "
332 (current-buffer) t))) 331 (current-buffer) t)))
333 (buf nil) 332 (buf nil)
334 (ido-ignore-item-temp-list bufs)) 333 ; (ido-ignore-item-temp-list bufs)
334 )
335 (while (not (string-equal 335 (while (not (string-equal
336 (setq buf (read-buffer 336 (setq buf (read-buffer
337 (if (and-boundp 'read-buffer-function 337 (if (and-boundp 'read-buffer-function
338 '(eq read-buffer-function 'ido-read-buffer)) 338 '(eq read-buffer-function 'ido-read-buffer))
339 "Next buffer to search (C-j to end): " 339 "Next buffer to search (C-j to end): "
340 "Next buffer to search (RET to end): ") 340 "Next buffer to search (RET to end): ")
341 nil t)) 341 nil t))
342 "")) 342 ""))
343 (add-to-list 'bufs buf) 343 (add-to-list 'bufs buf)
344 (setq ido-ignore-item-temp-list bufs)) 344 ; (setq ido-ignore-item-temp-list bufs)
345 )
345 (nreverse (mapcar #'get-buffer bufs))) 346 (nreverse (mapcar #'get-buffer bufs)))
346 (occur-read-primary-args))) 347 (occur-read-primary-args)))
347 (occur-1 regexp nlines bufs)) 348 (occur-1 regexp nlines bufs))
348 349
349 ;;;###autoload 350 ;;;###autoload