APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1295738965 0 # Node ID 2a54dfbe434f68d9c7bb26be74723287ab456905 # Parent 34ab0e66aaca12152a9e6460f17007eafc0a6687 Don't quote keywords, they've been self-quoting for well over a decade. 2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net&gt; * bytecomp.el (byte-compile-setq, byte-compile-set): Remove kludge allowing keywords' values to be set, all the code that does that is gone. * cl-compat.el (elt-satisfies-test-p): * faces.el (set-face-parent): * faces.el (face-doc-string): * gtk-font-menu.el: * gtk-font-menu.el (gtk-reset-device-font-menus): * msw-font-menu.el: * msw-font-menu.el (mswindows-reset-device-font-menus): * package-get.el (package-get-installedp): * select.el (select-convert-from-image-data): * sound.el: * sound.el (load-sound-file): * x-font-menu.el (x-reset-device-font-menus-core): Don't quote keywords, they're self-quoting, and the win from backward-compatibility is sufficiently small now that the style problem overrides it. diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/ChangeLog --- a/lisp/ChangeLog Sat Jan 22 17:21:22 2011 +0000 +++ b/lisp/ChangeLog Sat Jan 22 23:29:25 2011 +0000 ＠＠ -1,3 +1,25 ＠＠ +2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * bytecomp.el (byte-compile-setq, byte-compile-set): + Remove kludge allowing keywords' values to be set, all the code + that does that is gone. + + * cl-compat.el (elt-satisfies-test-p): + * faces.el (set-face-parent): + * faces.el (face-doc-string): + * gtk-font-menu.el: + * gtk-font-menu.el (gtk-reset-device-font-menus): + * msw-font-menu.el: + * msw-font-menu.el (mswindows-reset-device-font-menus): + * package-get.el (package-get-installedp): + * select.el (select-convert-from-image-data): + * sound.el: + * sound.el (load-sound-file): + * x-font-menu.el (x-reset-device-font-menus-core): + Don't quote keywords, they're self-quoting, and the + win from backward-compatibility is sufficiently small now that the + style problem overrides it. + 2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net&gt; * cl-macs.el (block, return-from): Require that NAME be a symbol diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/bytecomp.el --- a/lisp/bytecomp.el Sat Jan 22 17:21:22 2011 +0000 +++ b/lisp/bytecomp.el Sat Jan 22 23:29:25 2011 +0000 ＠＠ -3729,13 +3729,10 ＠＠ ;; Odd number of args? Let `set' get the error. (byte-compile-form `(set ',var) for-effect) (setq val (pop args)) - (if (keywordp var) - ;; (setq :foo ':foo) compatibility kludge - (byte-compile-form `(set ',var ,val) (if args t for-effect)) - (byte-compile-form val) - (unless (or args for-effect) - (byte-compile-out 'byte-dup 0)) - (byte-compile-variable-ref 'byte-varset var)))))) + (byte-compile-form val) + (unless (or args for-effect) + (byte-compile-out 'byte-dup 0)) + (byte-compile-variable-ref 'byte-varset var))))) (setq for-effect nil)) (defun byte-compile-set (form) ＠＠ -3745,11 +3742,10 ＠＠ (let ((symform (nth 1 form)) (valform (nth 2 form)) sym) - (if (and (= (length form) 3) - (= (safe-length symform) 2) + (if (and (eql (length form) 3) + (eql (safe-length symform) 2) (eq (car symform) 'quote) - (symbolp (setq sym (car (cdr symform)))) - (not (byte-compile-constant-symbol-p sym))) + (symbolp (setq sym (car (cdr symform))))) (byte-compile-setq `(setq ,sym ,valform)) (byte-compile-two-args form)))) diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/cl-compat.el --- a/lisp/cl-compat.el Sat Jan 22 17:21:22 2011 +0000 +++ b/lisp/cl-compat.el Sat Jan 22 23:29:25 2011 +0000 ＠＠ -75,9 +75,9 ＠＠ (assq key klist)) (defun elt-satisfies-test-p (item elt klist) - (let ((test-not (cdr (assq ':test-not klist))) - (test (cdr (assq ':test klist))) - (key (cdr (assq ':key klist)))) + (let ((test-not (cdr (assq :test-not klist))) + (test (cdr (assq :test klist))) + (key (cdr (assq :key klist)))) (if key (setq elt (funcall key elt))) (if test-not (not (funcall test-not item elt)) (funcall (or test 'eql) item elt)))) diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/faces.el --- a/lisp/faces.el Sat Jan 22 17:21:22 2011 +0000 +++ b/lisp/faces.el Sat Jan 22 23:29:25 2011 +0000 ＠＠ -418,7 +418,7 ＠＠ how-to-add)) (set-difference built-in-face-specifiers '(display-table background-pixmap inherit))) - (set-face-background-pixmap face (vector 'inherit ':face parent) + (set-face-background-pixmap face (vector 'inherit :face parent) locale tag-set how-to-add) nil) diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/gtk-font-menu.el --- a/lisp/gtk-font-menu.el Sat Jan 22 17:21:22 2011 +0000 +++ b/lisp/gtk-font-menu.el Sat Jan 22 23:29:25 2011 +0000 ＠＠ -168,19 +168,19 ＠＠ (mapcar (lambda (x) (vector x (list 'font-menu-set-font x nil nil) - ':style 'radio ':active nil ':selected nil)) + :style 'radio :active nil :selected nil)) families) (mapcar (lambda (x) (vector (if (/= 0 (% x 10)) (number-to-string (/ x 10.0)) (number-to-string (/ x 10))) (list 'font-menu-set-font nil nil x) - ':style 'radio ':active nil ':selected nil)) + :style 'radio :active nil :selected nil)) sizes) (mapcar (lambda (x) (vector x (list 'font-menu-set-font nil x nil) - ':style 'radio ':active nil ':selected nil)) + :style 'radio :active nil :selected nil)) weights))) (cdr dev-cache))) diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/msw-font-menu.el --- a/lisp/msw-font-menu.el Sat Jan 22 17:21:22 2011 +0000 +++ b/lisp/msw-font-menu.el Sat Jan 22 23:29:25 2011 +0000 ＠＠ -140,17 +140,17 ＠＠ (mapcar (lambda (x) (vector x (list 'font-menu-set-font x nil nil) - ':style 'radio ':active nil ':selected nil)) + :style 'radio :active nil :selected nil)) families) (mapcar (lambda (x) (vector (int-to-string x) (list 'font-menu-set-font nil nil x) - ':style 'radio ':active nil ':selected nil)) + :style 'radio :active nil :selected nil)) sizes) (mapcar (lambda (x) (vector x (list 'font-menu-set-font nil x nil) - ':style 'radio ':active nil ':selected nil)) + :style 'radio :active nil :selected nil)) weights))) (cdr dev-cache))) diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/package-get.el --- a/lisp/package-get.el Sat Jan 22 17:21:22 2011 +0000 +++ b/lisp/package-get.el Sat Jan 22 23:29:25 2011 +0000 ＠＠ -1240,7 +1240,7 ＠＠ ;; Use packages-package-list which contains name and version (equal (plist-get (package-get-info-find-package packages-package-list - package) ':version) + package) :version) (if (floatp version) version (string-to-number version)))) diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/select.el --- a/lisp/select.el Sat Jan 22 17:21:22 2011 +0000 +++ b/lisp/select.el Sat Jan 22 23:29:25 2011 +0000 ＠＠ -767,7 +767,7 ＠＠ corresponding to that data as an end-glyph extent property of that space. " (let* ((str (make-string 1 ?\ )) (extent (make-extent 0 1 str)) - (glyph (make-glyph (vector image-type ':data value)))) + (glyph (make-glyph (vector image-type :data value)))) (when glyph (set-extent-property extent 'invisible t) (set-extent-property extent 'start-open t) diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/sound.el --- a/lisp/sound.el Sat Jan 22 17:21:22 2011 +0000 +++ b/lisp/sound.el Sat Jan 22 23:29:25 2011 +0000 ＠＠ -181,8 +181,8 ＠＠ (setq sound-alist (cons (nconc (list sound-name) (if (and volume (not (eq 0 volume))) - (list ':volume volume)) - (list ':sound data)) + (list :volume volume)) + (list :sound data)) sound-alist))) sound-name) diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/x-font-menu.el --- a/lisp/x-font-menu.el Sat Jan 22 17:21:22 2011 +0000 +++ b/lisp/x-font-menu.el Sat Jan 22 23:29:25 2011 +0000 ＠＠ -253,21 +253,21 ＠＠ (vector cache (mapcar (lambda (x) - (vector x + (vector x (list 'font-menu-set-font x nil nil) - ':style 'radio ':active nil ':selected nil)) + :style 'radio :active nil :selected nil)) families) (mapcar (lambda (x) (vector (if (/= 0 (% x 10)) (number-to-string (/ x 10.0)) (number-to-string (/ x 10))) (list 'font-menu-set-font nil nil x) - ':style 'radio ':active nil ':selected nil)) + :style 'radio :active nil :selected nil)) sizes) (mapcar (lambda (x) (vector x (list 'font-menu-set-font nil x nil) - ':style 'radio ':active nil ':selected nil)) + :style 'radio :active nil :selected nil)) weights))) (cdr dev-cache))) -- “Apart from the nine-banded armadillo, man is the only natural host of Mycobacterium leprae, although it can be grown in the footpads of mice.” -- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches