Mercurial > hg > xemacs-beta

diff lisp/modeline.el @ 5267:668c73e222fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change forms like (delq nil (mapcar ...)) to (mapcan ...). lisp/ChangeLog addition: 2010-09-16 Aidan Kehoe <kehoea@parhasard.net> * x-faces.el (x-available-font-sizes): * specifier.el (let-specifier): * package-ui.el (pui-add-required-packages): * msw-faces.el (mswindows-available-font-sizes): * modeline.el (modeline-minor-mode-menu): * minibuf.el (minibuf-directory-files): Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 16 Sep 2010 15:06:38 +0100
parents 49e17f7182f5
children 308d34e9f07d
line wrap: on
line diff
--- a/lisp/modeline.el	Thu Sep 16 14:31:40 2010 +0100
+++ b/lisp/modeline.el	Thu Sep 16 15:06:38 2010 +0100
@@ -524,35 +524,31 @@
      (cons
       "Minor Mode Toggles"
       (sort
-       (delq nil (mapcar
-		 #'(lambda (x)
-		     (let* ((toggle-sym (car x))
-			    (toggle-fun (or (get toggle-sym
-						 'modeline-toggle-function)
-					    (and (commandp toggle-sym)
-						 toggle-sym)))
-			    (menu-tag (symbol-name (if (symbolp toggle-fun)
-						       toggle-fun
-						     toggle-sym))
-				      ;; Here a function should
-				      ;; maybe be invoked to
-				      ;; beautify the symbol's
-				      ;; menu appearance.
-				      ))
-		       (and toggle-fun
-			    (vector menu-tag
-				    toggle-fun
-				    ;; The following two are wrong
-				    ;; because of possible name
-				    ;; clashes.
-				    ;:active (get toggle-sym :active t)
-				    ;:included (get toggle-sym :included t)
-				    :style 'toggle
-				    :selected (and (boundp toggle-sym)
-						   toggle-sym)))))
-		 minor-mode-alist))
-       (lambda (e1 e2)
-	 (string< (aref e1 0) (aref e2 0)))))
+       (mapcan
+        #'(lambda (x)
+            (let* ((toggle-sym (car x))
+                   (toggle-fun (or (get toggle-sym
+                                        'modeline-toggle-function)
+                                   (and (commandp toggle-sym)
+                                        toggle-sym)))
+                   (menu-tag (symbol-name (if (symbolp toggle-fun)
+                                              toggle-fun
+                                            toggle-sym))
+                             ;; Here a function should maybe be invoked to
+                             ;; beautify the symbol's menu appearance.
+                             ))
+              (and toggle-fun
+                   (list (vector menu-tag
+                                 toggle-fun
+                                 ;; The following two are wrong because of
+                                 ;; possible name clashes.
+                                 ;:active (get toggle-sym :active t)
+                                 ;:included (get toggle-sym :included t)
+                                 :style 'toggle
+                                 :selected (and (boundp toggle-sym)
+                                                toggle-sym))))))
+		 minor-mode-alist)
+       (lambda (e1 e2) (string< (aref e1 0) (aref e2 0)))))
      event)))
 
 (defvar modeline-minor-mode-map (make-sparse-keymap 'modeline-minor-mode-map)