Mercurial > hg > xemacs-beta

diff lisp/loadhist.el @ 5567:3bc58dc9d688

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 308d34e9f07d
children 071b810ceb18
line wrap: on
line diff
--- a/lisp/loadhist.el	Wed Sep 07 16:26:45 2011 +0100
+++ b/lisp/loadhist.el	Wed Sep 07 21:21:36 2011 +0100
@@ -175,29 +175,29 @@
   (let* ((flist (feature-symbols feature))
 	 (file (car flist))
 	 (unloading-module nil))
-    (flet ((reset-aload (x)
-	     (let ((aload (get x 'autoload)))
-	       (if aload (fset x (cons 'autoload aload))))))
-    (mapc
-     #'(lambda (x)
-	 (cond ((stringp x) nil)
-	       ((consp x)
-		;; Remove any feature names that this file provided.
-		(if (eq (car x) 'provide)
-		    (setq features (delq (cdr x) features))
-		  (if (eq (car x) 'module)
-		      (setq unloading-module t))))
-	       ((and (boundp x)
-		     (fboundp x))
-		(makunbound x)
-		(fmakunbound x)
-		(reset-aload x))
-	       ((boundp x)
-		(makunbound x))
-	       ((fboundp x)
-		(fmakunbound x)
-		(reset-aload x))))
-     (cdr flist)))
+    (labels ((reset-aload (x)
+               (let ((aload (get x 'autoload)))
+                 (if aload (fset x (cons 'autoload aload))))))
+      (mapc
+       #'(lambda (x)
+           (cond ((stringp x) nil)
+                 ((consp x)
+                  ;; Remove any feature names that this file provided.
+                  (if (eq (car x) 'provide)
+                      (setq features (delq (cdr x) features))
+                    (if (eq (car x) 'module)
+                        (setq unloading-module t))))
+                 ((and (boundp x)
+                       (fboundp x))
+                  (makunbound x)
+                  (fmakunbound x)
+                  (reset-aload x))
+                 ((boundp x)
+                  (makunbound x))
+                 ((fboundp x)
+                  (fmakunbound x)
+                  (reset-aload x))))
+       (cdr flist)))
     ;; Delete the load-history element for this file.
     (let ((elt (assoc file load-history)))
       (setq load-history (delq elt load-history)))