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.

--- a/lisp/minibuf.el	Wed Sep 07 16:26:45 2011 +0100
+++ b/lisp/minibuf.el	Wed Sep 07 21:21:36 2011 +0100
@@ -2284,9 +2284,9 @@
       (let* ((answers (remove-if-not #'consp answers))
 	     (possible
 	      (gettext
-	       (flet ((car-to-string-if (x)
-			(setq x (car x))
-			(if (stringp x)  x (char-to-string x))))
+	       (labels ((car-to-string-if (x)
+                          (setq x (car x))
+                          (if (stringp x)  x (char-to-string x))))
 		 (concat (mapconcat #'car-to-string-if
 			   (butlast answers) ", ") " or "
 			   (car-to-string-if (car (last answers)))))))