comparison lisp/x-font-menu.el @ 4783:e29fcfd8df5f

Eliminate most core code byte-compile warnings. 2009-12-18 Aidan Kehoe <kehoea@parhasard.net> * alist.el (modify-alist): * autoload.el (update-autoload-files, autoload-print-form): * bytecomp.el (batch-byte-compile-1) (byte-compile-multiple-value-call, byte-compile-funcall) (byte-compile-insert, byte-compile-concat, byte-compile-list) (byte-compile-normal-call, byte-compile-flush-pending): * cl-macs.el (letf): * cl.el: * disass.el (disassemble-1): * easy-mmode.el (easy-mmode-define-syntax): * faces.el (set-face-parent): * files.el (cd): * finder.el (finder-list-matches, finder-list-keywords) (finder-compile-keywords): * frame.el (frame-notice-user-settings) (frame-remove-geometry-props): * ldap.el (ldap-delete-entries, ldap-modify-entries) (ldap-add-entries): * loadhist.el (unload-feature): * map-ynp.el (map-y-or-n-p): * menubar-items.el (default-menubar): * mouse.el (default-mouse-track-next-move-rect) (default-mouse-track-next-move-rect) (default-mouse-track-cleanup-hook) (default-mouse-track-cleanup-extent): * mule/ethio-util.el (ethio-fidel-to-sera-buffer) (ethio-modify-vowel): * obsolete.el: * package-get.el (package-get-update-all): * package-ui.el (pui-list-packages) (pui-install-selected-packages, pui-install-selected-packages): * select.el (select-make-extent-for-selection) (dehilight-selection): * simple.el (clone-buffer): * term/tvi970.el: * term/wyse50.el: * unicode.el: (load-unicode-tables): * x-font-menu.el (fc-make-font-menu-entry) (x-reset-device-font-menus-xft): * x-misc.el (x-init-specifier-from-resources): Eliminate byte-compile warnings, with the exception of Stephen's various non-defined fontconfig functions, as I don't know if he plans to add them and is keeping the warnings around as a reminder. The warnings actually eliminated involve i) using mapcar instead of mapc where the result is discarded and ii) using a lambda quoted as data in a context where it is unequivocally used as a function.
author Aidan Kehoe <kehoea@parhasard.net>
date Fri, 18 Dec 2009 17:49:43 +0000
parents b4f4e0cc90f1
children 2a54dfbe434f 308d34e9f07d
comparison
equal deleted inserted replaced
4782:1523f1d28be1 4783:e29fcfd8df5f
117 (defun fc-make-font-menu-entry (family) 117 (defun fc-make-font-menu-entry (family)
118 (let ((weights (fc-find-available-weights-for-family family))) 118 (let ((weights (fc-find-available-weights-for-family family)))
119 (vector 119 (vector
120 family 120 family
121 (mapcar 121 (mapcar
122 '(lambda (weight-symbol) 122 (lambda (weight-symbol)
123 (let ((pair (assoc weight-symbol 123 (let ((pair (assoc weight-symbol
124 '((:light "Light") 124 '((:light "Light")
125 (:medium "Medium") 125 (:medium "Medium")
126 (:demibold "Demibold") 126 (:demibold "Demibold")
127 (:bold "Bold") 127 (:bold "Bold")
128 (:black "Black"))))) 128 (:black "Black")))))
129 (if pair (cadr pair)))) 129 (if pair (cadr pair))))
130 weights) 130 weights)
131 '(0) 131 '(0)
132 nil))) 132 nil)))
133 133
134 (defun x-reset-device-font-menus-xft (device &optional debug) 134 (defun x-reset-device-font-menus-xft (device &optional debug)
138 (sort families-1 'string-lessp))) 138 (sort families-1 'string-lessp)))
139 (data 139 (data
140 (vector 140 (vector
141 (mapcar 'fc-make-font-menu-entry families) 141 (mapcar 'fc-make-font-menu-entry families)
142 (mapcar 142 (mapcar
143 '(lambda (family) 143 (lambda (family)
144 (vector family `(font-menu-set-font ,family nil nil) 144 (vector family `(font-menu-set-font ,family nil nil)
145 :style 'radio :active nil :selected nil)) 145 :style 'radio :active nil :selected nil))
146 families) 146 families)
147 (mapcar 147 (mapcar
148 '(lambda (size) 148 (lambda (size)
149 (vector 149 (vector
150 (number-to-string size) 150 (number-to-string size)
151 `(font-menu-set-font nil nil ,size) 151 `(font-menu-set-font nil nil ,size)
152 :style 'radio :active nil :selected nil)) 152 :style 'radio :active nil :selected nil))
153 ;; common size list in decipoints, fontconfig wants points 153 ;; common size list in decipoints, fontconfig wants points
154 (mapcar (lambda (x) (/ x 10)) font-menu-common-sizes)) 154 (mapcar (lambda (x) (/ x 10)) font-menu-common-sizes))
155 (mapcar 155 (mapcar
156 '(lambda (weight) 156 (lambda (weight)
157 (vector 157 (vector
158 weight 158 weight
159 `(font-menu-set-font nil ,weight nil) 159 `(font-menu-set-font nil ,weight nil)
160 :style 'radio :active nil :selected nil)) 160 :style 'radio :active nil :selected nil))
161 '("Light" "Medium" "Demibold" "Bold" "Black")))) 161 '("Light" "Medium" "Demibold" "Bold" "Black"))))
162 ;; get or initialize the entry for device 162 ;; get or initialize the entry for device
163 (dev-cache (or (assq device device-fonts-cache) 163 (dev-cache (or (assq device device-fonts-cache)
164 (car (push (list device) device-fonts-cache))))) 164 (car (push (list device) device-fonts-cache)))))
165 ;; update the device-fonts-cache entry for device in place 165 ;; update the device-fonts-cache entry for device in place