comparison lisp/easymenu.el @ 5366:f00192e1cd49

Examining the result of #'length: `eql', not `=', it's better style & cheaper 2011-03-08 Aidan Kehoe <kehoea@parhasard.net> * buff-menu.el (list-buffers-noselect): * byte-optimize.el (byte-optimize-identity): * byte-optimize.el (byte-optimize-if): * byte-optimize.el (byte-optimize-nth): * byte-optimize.el (byte-optimize-nthcdr): * bytecomp.el (byte-compile-warn-wrong-args): * bytecomp.el (byte-compile-two-args-19->20): * bytecomp.el (byte-compile-list): * bytecomp.el (byte-compile-beginning-of-line): * bytecomp.el (byte-compile-set): * bytecomp.el (byte-compile-set-default): * bytecomp.el (byte-compile-values): * bytecomp.el (byte-compile-values-list): * bytecomp.el (byte-compile-integerp): * bytecomp.el (byte-compile-multiple-value-list-internal): * bytecomp.el (byte-compile-throw): * cl-macs.el (cl-do-arglist): * cl-macs.el (cl-parse-loop-clause): * cl-macs.el (multiple-value-bind): * cl-macs.el (multiple-value-setq): * cl-macs.el (get-setf-method): * cmdloop.el (command-error): * cmdloop.el (y-or-n-p-minibuf): * cmdloop.el (yes-or-no-p-minibuf): * coding.el (unencodable-char-position): * cus-edit.el (custom-face-prompt): * cus-edit.el (custom-buffer-create-internal): * cus-edit.el (widget-face-action): * cus-edit.el (custom-group-value-create): * descr-text.el (describe-char-unicode-data): * dialog-gtk.el (popup-builtin-question-dialog): * dragdrop.el (experimental-dragdrop-drop-log-function): * dragdrop.el (experimental-dragdrop-drop-mime-default): * easymenu.el (easy-menu-add): * easymenu.el (easy-menu-remove): * faces.el (read-face-name): * faces.el (set-face-stipple): * files.el (file-name-non-special): * font.el (font-combine-fonts): * font.el (font-set-face-font): * font.el (font-parse-rgb-components): * font.el (font-rgb-color-p): * font.el (font-color-rgb-components): * gnuserv.el (gnuserv-edit-files): * help.el (key-or-menu-binding): * help.el (function-documentation-1): * help.el (function-documentation): * info.el (info): * isearch-mode.el (isearch-exit): * isearch-mode.el (isearch-edit-string): * isearch-mode.el (isearch-*-char): * isearch-mode.el (isearch-complete1): * ldap.el (ldap-encode-country-string): * ldap.el (ldap-decode-string): * minibuf.el (read-file-name-internal-1): * minibuf.el (read-non-nil-coding-system): * minibuf.el (get-user-response): * mouse.el (drag-window-divider): * mule/ccl.el: * mule/ccl.el (ccl-compile-if): * mule/ccl.el (ccl-compile-break): * mule/ccl.el (ccl-compile-repeat): * mule/ccl.el (ccl-compile-write-repeat): * mule/ccl.el (ccl-compile-call): * mule/ccl.el (ccl-compile-end): * mule/ccl.el (ccl-compile-read-multibyte-character): * mule/ccl.el (ccl-compile-write-multibyte-character): * mule/ccl.el (ccl-compile-translate-character): * mule/ccl.el (ccl-compile-mule-to-unicode): * mule/ccl.el (ccl-compile-unicode-to-mule): * mule/ccl.el (ccl-compile-lookup-integer): * mule/ccl.el (ccl-compile-lookup-character): * mule/ccl.el (ccl-compile-map-multiple): * mule/ccl.el (ccl-compile-map-single): * mule/devan-util.el (devanagari-compose-to-one-glyph): * mule/devan-util.el (devanagari-composition-component): * mule/mule-cmds.el (finish-set-language-environment): * mule/viet-util.el: * mule/viet-util.el (viet-encode-viscii-char): * multicast.el (open-multicast-group): * newcomment.el (comment-quote-nested): * newcomment.el (comment-region): * newcomment.el (comment-dwim): * regexp-opt.el (regexp-opt-group): * replace.el (map-query-replace-regexp): * specifier.el (derive-device-type-from-tag-set): * subr.el (skip-chars-quote): * test-harness.el (test-harness-from-buffer): * test-harness.el (batch-test-emacs): * wid-edit.el (widget-choice-action): * wid-edit.el (widget-symbol-prompt-internal): * wid-edit.el (widget-color-action): * window-xemacs.el (push-window-configuration): * window-xemacs.el (pop-window-configuration): * window.el (quit-window): * x-compose.el (electric-diacritic): It's better style, and cheaper (often one assembler instruction vs. a C funcall in the byte code), to use `eql' instead of `=' when it's clear what numerical type a given result will be. Change much of our code to do this, with the help of a byte-compiler change (not comitted) that looked for calls to #'length (which always returns an integer) in its args.
author Aidan Kehoe <kehoea@parhasard.net>
date Tue, 08 Mar 2011 23:41:52 +0000
parents cd167465bf69
children ac37a5f7e5be
comparison
equal deleted inserted replaced
5365:dbae25a8949d 5366:f00192e1cd49
192 ; "easy-menu-all-popups is %s") 192 ; "easy-menu-all-popups is %s")
193 ; menu mode-popup-menu (current-buffer) 193 ; menu mode-popup-menu (current-buffer)
194 ; (default-value 'mode-popup-menu) easy-menu-all-popups) 194 ; (default-value 'mode-popup-menu) easy-menu-all-popups)
195 (when (featurep 'menubar) 195 (when (featurep 'menubar)
196 ;; Save the existing mode-popup-menu, if it's been changed. 196 ;; Save the existing mode-popup-menu, if it's been changed.
197 (when (and (zerop (length easy-menu-all-popups)) 197 (when (and (eql (length easy-menu-all-popups) 0)
198 (not (equal (default-value 'mode-popup-menu) mode-popup-menu))) 198 (not (equal (default-value 'mode-popup-menu) mode-popup-menu)))
199 (push mode-popup-menu easy-menu-all-popups)) 199 (push mode-popup-menu easy-menu-all-popups))
200 ;; Add the menu to our list of all the popups for the buffer. 200 ;; Add the menu to our list of all the popups for the buffer.
201 (pushnew menu easy-menu-all-popups :test 'equal) 201 (pushnew menu easy-menu-all-popups :test 'equal)
202 ;; If there are multiple popup menus available, make the popup menu 202 ;; If there are multiple popup menus available, make the popup menu
203 ;; normally shown with button-3 a menu of them. If there is just one, 203 ;; normally shown with button-3 a menu of them. If there is just one,
204 ;; make that button show it, and no super-menu. 204 ;; make that button show it, and no super-menu.
205 (setq mode-popup-menu (if (= 1 (length easy-menu-all-popups)) 205 (setq mode-popup-menu (if (eql 1 (length easy-menu-all-popups))
206 (car easy-menu-all-popups) 206 (car easy-menu-all-popups)
207 (cons (easy-menu-title) 207 (cons (easy-menu-title)
208 (reverse easy-menu-all-popups)))) 208 (reverse easy-menu-all-popups))))
209 (cond ((null current-menubar) 209 (cond ((null current-menubar)
210 ;; Don't add it to a non-existing menubar. 210 ;; Don't add it to a non-existing menubar.
227 ;; Remove this menu from the list of popups we know about. 227 ;; Remove this menu from the list of popups we know about.
228 easy-menu-all-popups (delq menu easy-menu-all-popups) 228 easy-menu-all-popups (delq menu easy-menu-all-popups)
229 ;; If there are multiple popup menus available, make the popup menu 229 ;; If there are multiple popup menus available, make the popup menu
230 ;; normally shown with button-3 a menu of them. If there is just one, 230 ;; normally shown with button-3 a menu of them. If there is just one,
231 ;; make that button show it, and no super-menu. 231 ;; make that button show it, and no super-menu.
232 mode-popup-menu (if (= 1 (length easy-menu-all-popups)) 232 mode-popup-menu (if (eql 1 (length easy-menu-all-popups))
233 (car easy-menu-all-popups) 233 (car easy-menu-all-popups)
234 (cons (easy-menu-title) 234 (cons (easy-menu-title)
235 (reverse easy-menu-all-popups)))) 235 (reverse easy-menu-all-popups))))
236 ;; If we've just set mode-popup-menu to an empty menu, change that menu 236 ;; If we've just set mode-popup-menu to an empty menu, change that menu
237 ;; to its default value (without intervention from easy-menu). 237 ;; to its default value (without intervention from easy-menu).
238 (if (zerop (length easy-menu-all-popups)) 238 (if (eql (length easy-menu-all-popups) 0)
239 (setq mode-popup-menu (default-value 'mode-popup-menu))) 239 (setq mode-popup-menu (default-value 'mode-popup-menu)))
240 (and current-menubar 240 (and current-menubar
241 (assoc (car menu) current-menubar) 241 (assoc (car menu) current-menubar)
242 (delete-menu-item (list (car menu)))))) 242 (delete-menu-item (list (car menu))))))
243 243