comparison lisp/minibuf.el @ 5567:3bc58dc9d688

Replace #'flet by #'labels where appropriate, core code. lisp/ChangeLog addition: 2011-09-07 Aidan Kehoe <kehoea@parhasard.net> * simple.el (transpose-subr): * specifier.el (let-specifier): * specifier.el (derive-device-type-from-tag-set): * test-harness.el (batch-test-emacs): * x-compose.el (alias-colon-to-doublequote): * mule/chinese.el (make-chinese-cns11643-charset): * mule/mule-cmds.el (set-locale-for-language-environment): * mule/mule-cmds.el (set-language-environment-coding-systems): * mule/mule-x-init.el (x-use-halfwidth-roman-font): * about.el (about-xemacs): * about.el (about-hackers): * diagnose.el (show-memory-usage): * diagnose.el (show-object-memory-usage-stats): * diagnose.el (show-mc-alloc-memory-usage): * diagnose.el (show-gc-stats): * dialog.el (make-dialog-box): * faces.el: * faces.el (Face-frob-property): * faces.el (set-face-stipple): * glyphs.el: * glyphs.el (init-glyphs): Removed. * help-macro.el (make-help-screen): * info.el (Info-construct-menu): * keymap.el (key-sequence-list-description): * lisp-mode.el (construct-lisp-mode-menu): * loadhist.el (unload-feature): * minibuf.el (get-user-response): * mouse.el (default-mouse-track-check-for-activation): * mouse.el (mouse-track-insert-1): Follow my own advice from the last commit and use #'labels instead of #'flet in core code.
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 07 Sep 2011 21:21:36 +0100
parents 4dee0387b9de
children b7ae5f44b950
comparison
equal deleted inserted replaced
5566:4654c01af32b 5567:3bc58dc9d688
2282 answers))) 2282 answers)))
2283 (save-excursion 2283 (save-excursion
2284 (let* ((answers (remove-if-not #'consp answers)) 2284 (let* ((answers (remove-if-not #'consp answers))
2285 (possible 2285 (possible
2286 (gettext 2286 (gettext
2287 (flet ((car-to-string-if (x) 2287 (labels ((car-to-string-if (x)
2288 (setq x (car x)) 2288 (setq x (car x))
2289 (if (stringp x) x (char-to-string x)))) 2289 (if (stringp x) x (char-to-string x))))
2290 (concat (mapconcat #'car-to-string-if 2290 (concat (mapconcat #'car-to-string-if
2291 (butlast answers) ", ") " or " 2291 (butlast answers) ", ") " or "
2292 (car-to-string-if (car (last answers))))))) 2292 (car-to-string-if (car (last answers)))))))
2293 (question (gettext question)) 2293 (question (gettext question))
2294 (p (format "%s(%s) " question possible))) 2294 (p (format "%s(%s) " question possible)))