Mercurial > hg > xemacs-beta
comparison lisp/font-lock.el @ 5652:cc6f0266bc36
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 | 0af042a0c116 |
children | e32ce9c59c23 |
comparison
equal
deleted
inserted
replaced
5651:ae2fdb1fd9e0 | 5652:cc6f0266bc36 |
---|---|
985 (if cell | 985 (if cell |
986 (if (eq how 'set) | 986 (if (eq how 'set) |
987 ;; A new set of keywords is defined. Forget all about | 987 ;; A new set of keywords is defined. Forget all about |
988 ;; our old keywords that should be removed. | 988 ;; our old keywords that should be removed. |
989 (setq font-lock-removed-keywords-alist | 989 (setq font-lock-removed-keywords-alist |
990 (delq cell font-lock-removed-keywords-alist)) | 990 (delete* cell font-lock-removed-keywords-alist)) |
991 ;; Delete all previously removed keywords. | 991 ;; Delete all previously removed keywords. |
992 (dolist (kword keywords) | 992 (dolist (kword keywords) |
993 (setcdr cell (delete kword (cdr cell)))) | 993 (setcdr cell (delete kword (cdr cell)))) |
994 ;; Delete the mode cell if empty. | 994 ;; Delete the mode cell if empty. |
995 (if (null (cdr cell)) | 995 (if (null (cdr cell)) |
996 (setq font-lock-removed-keywords-alist | 996 (setq font-lock-removed-keywords-alist |
997 (delq cell font-lock-removed-keywords-alist))))))) | 997 (delete* cell font-lock-removed-keywords-alist))))))) |
998 | 998 |
999 ;; Written by Anders Lindgren <andersl@andersl.com>. | 999 ;; Written by Anders Lindgren <andersl@andersl.com>. |
1000 ;; | 1000 ;; |
1001 ;; Case study: | 1001 ;; Case study: |
1002 ;; (I) The keywords are removed from a major mode. | 1002 ;; (I) The keywords are removed from a major mode. |
1051 (setq cell (cdr cell))))) | 1051 (setq cell (cdr cell))))) |
1052 ;; Final cleanup, remove major mode cell if last keyword | 1052 ;; Final cleanup, remove major mode cell if last keyword |
1053 ;; was deleted. | 1053 ;; was deleted. |
1054 (if (null (cdr top-cell)) | 1054 (if (null (cdr top-cell)) |
1055 (setq font-lock-keywords-alist | 1055 (setq font-lock-keywords-alist |
1056 (delq top-cell font-lock-keywords-alist)))) | 1056 (delete* top-cell font-lock-keywords-alist)))) |
1057 ;; Remember the keyword in case it is not local. | 1057 ;; Remember the keyword in case it is not local. |
1058 (let ((cell (assq mode font-lock-removed-keywords-alist))) | 1058 (let ((cell (assq mode font-lock-removed-keywords-alist))) |
1059 (if cell | 1059 (if cell |
1060 (unless (member keyword (cdr cell)) | 1060 (unless (member keyword (cdr cell)) |
1061 (nconc cell (list keyword))) | 1061 (nconc cell (list keyword))) |