Mercurial > hg > xemacs-beta

comparison lisp/occur.el @ 5652:cc6f0266bc36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid #'delq in core Lisp, for the sake of style, a very slightly smaller binary lisp/ChangeLog addition: 2012-05-01 Aidan Kehoe <kehoea@parhasard.net> Avoid #'delq in core code, for the sake of style and a (very slightly) smaller binary. * behavior.el (disable-behavior): * behavior.el (compute-behavior-group-children): * buff-menu.el (buffers-tab-items): * byte-optimize.el (byte-optimize-delay-constants-math): * byte-optimize.el (byte-optimize-logmumble): * byte-optimize.el (byte-decompile-bytecode-1): * byte-optimize.el (byte-optimize-lapcode): * bytecomp.el: * bytecomp.el (byte-compile-arglist-warn): * bytecomp.el (byte-compile-warn-about-unresolved-functions): * bytecomp.el (byte-compile-lambda): * bytecomp.el (byte-compile-out-toplevel): * bytecomp.el (byte-compile-insert): * bytecomp.el (byte-compile-defalias-warn): * cl-macs.el (cl-upcase-arg): * cl-macs.el (cl-transform-lambda): * cl-macs.el (cl-do-proclaim): * cl-macs.el (defstruct): * cl-macs.el (cl-make-type-test): * cl-macs.el (define-compiler-macro): * cl-macs.el (delete-duplicates): * cus-edit.el (widget-face-value-delete): * cus-edit.el (face-history): * easymenu.el (easy-menu-remove): * files.el (files-fetch-hook-value): * files.el (file-expand-wildcards): * font-lock.el (font-lock-update-removed-keyword-alist): * font-lock.el (font-lock-remove-keywords): * frame.el (frame-initialize): * frame.el (frame-notice-user-settings): * frame.el (set-frame-font): * frame.el (delete-other-frames): * frame.el (get-frame-for-buffer-noselect): * gnuserv.el (gnuserv-kill-buffer-function): * gnuserv.el (gnuserv-check-device): * gnuserv.el (gnuserv-kill-client): * gnuserv.el (gnuserv-buffer-done-1): * gtk-font-menu.el (gtk-reset-device-font-menus): * gutter-items.el (buffers-tab-items): * gutter.el (set-gutter-element-visible-p): * info.el (Info-find-file-node): * info.el (Info-history-add): * info.el (Info-build-annotation-completions): * info.el (Info-index): * info.el (Info-reannotate-node): * itimer.el (delete-itimer): * itimer.el (start-itimer): * lib-complete.el (lib-complete:cache-completions): * loadhist.el (unload-feature): * menubar-items.el (build-buffers-menu-internal): * menubar.el (delete-menu-item): * menubar.el (relabel-menu-item): * msw-font-menu.el (mswindows-reset-device-font-menus): * mule/make-coding-system.el (fixed-width-generate-helper): * next-error.el (next-error-find-buffer): * obsolete.el: * obsolete.el (find-non-ascii-charset-string): * obsolete.el (find-non-ascii-charset-region): * occur.el (multi-occur-by-filename-regexp): * occur.el (occur-1): * packages.el (packages-package-hierarchy-directory-names): * packages.el (package-get-key-1): * process.el (setenv): * simple.el (undo): * simple.el (handle-pre-motion-command-current-command-is-motion): * sound.el (load-sound-file): * wid-edit.el (widget-field-value-delete): * wid-edit.el (widget-checklist-match-inline): * wid-edit.el (widget-checklist-match-find): * wid-edit.el (widget-editable-list-delete-at): * wid-edit.el (widget-editable-list-entry-create): * window.el (quit-window): * x-font-menu.el (x-reset-device-font-menus-core): 1. Replace (delq nil (mapcar ....)) with analogous (mapcan ...) forms; this is in non-dumped files, it was done previously in dumped files. 2. Replace (delq FOO (copy-sequence BAR)) with (remove* FOO BAR), where #'eq and #'eql are equivalent 3. Replace (delq FOO BAR) with (delete* FOO BAR), where FOO is not a non-fixnum number. Saves a little space in the dumped file (since the compiler macro adds :test #'eq to the delete* call if it's not clear that FOO is not a non-fixnum number).
author Aidan Kehoe <kehoea@parhasard.net>
date Tue, 01 May 2012 16:17:42 +0100
parents ac37a5f7e5be
children 0bddb59072b6
comparison
equal deleted inserted replaced
5651:ae2fdb1fd9e0 5652:cc6f0266bc36
363 default 363 default
364 input)) 364 input))
365 (occur-read-primary-args))) 365 (occur-read-primary-args)))
366 (when bufregexp 366 (when bufregexp
367 (occur-1 regexp nlines 367 (occur-1 regexp nlines
368 (delq nil 368 (mapcan #'(lambda (buf)
369 (mapcar (lambda (buf) 369 (when (and (buffer-file-name buf)
370 (when (and (buffer-file-name buf) 370 (string-match bufregexp
371 (string-match bufregexp 371 (buffer-file-name buf)))
372 (buffer-file-name buf))) 372 (list buf)))
373 buf)) 373 (buffer-list)))))
374 (buffer-list))))))
375 374
376 (defun occur-1 (regexp nlines bufs &optional buf-name) 375 (defun occur-1 (regexp nlines bufs &optional buf-name)
377 (unless buf-name 376 (unless buf-name
378 (setq buf-name "*Occur*")) 377 (setq buf-name "*Occur*"))
379 (let (occur-buf 378 (let (occur-buf
380 (active-bufs (delq nil (mapcar #'(lambda (buf) 379 (active-bufs (remove-if-not #'buffer-live-p bufs)))
381 (when (buffer-live-p buf) buf))
382 bufs))))
383 ;; Handle the case where one of the buffers we're searching is the 380 ;; Handle the case where one of the buffers we're searching is the
384 ;; output buffer. Just rename it. 381 ;; output buffer. Just rename it.
385 (when (member buf-name (mapcar 'buffer-name active-bufs)) 382 (when (position buf-name active-bufs :test #'equal :key #'buffer-name)
386 (with-current-buffer (get-buffer buf-name) 383 (with-current-buffer (get-buffer buf-name)
387 (rename-uniquely))) 384 (rename-uniquely)))
388 385
389 ;; Now find or create the output buffer. 386 ;; Now find or create the output buffer.
390 ;; If we just renamed that buffer, we will make a new one here. 387 ;; If we just renamed that buffer, we will make a new one here.