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/info.el	Wed Sep 07 16:26:45 2011 +0100
+++ b/lisp/info.el	Wed Sep 07 21:21:36 2011 +0100
@@ -3232,14 +3232,14 @@
 	up-p prev-p next-p menu xrefs subnodes in)
     (save-excursion
       ;; `one-space' fixes "Notes:" xrefs that are split across lines.
-      (flet
+      (labels
 	  ((one-space (text)
-		      (let (i)
-			(while (setq i (string-match "[ \n\t]+" text i))
-			  (setq text (concat (substring text 0 i) " "
-					     (substring text (match-end 0))))
-			  (setq i (1+ i)))
-			text)))
+             (let (i)
+               (while (setq i (string-match "[ \n\t]+" text i))
+                 (setq text (concat (substring text 0 i) " "
+                                    (substring text (match-end 0))))
+                 (setq i (1+ i)))
+               text)))
 	(goto-char (point-min))
 	(if (looking-at ".*\\bNext:") (setq next-p t))
 	(if (looking-at ".*\\bPrev:") (setq prev-p t))