Mercurial > hg > xemacs-beta

diff lisp/package-ui.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 2e528066e2fc
children 311f6817efc2 308d34e9f07d
line wrap: on
line diff
--- a/lisp/package-ui.el	Thu Sep 16 14:31:40 2010 +0100
+++ b/lisp/package-ui.el	Thu Sep 16 15:06:38 2010 +0100
@@ -408,26 +408,25 @@
   (let ((tmpbuf "*Required-Packages*") do-select)
     (if pui-selected-packages
 	(let ((dependencies
-               (delq nil (mapcar
-                          (lambda (pkg)
-                            (let ((installed
-                                   (package-get-key pkg :version))
-                                  (current
-                                   (package-get-info-prop
-                                    (package-get-info-version
-                                     (package-get-info-find-package
-                                      package-get-base pkg) nil)
-                                    'version)))
-                              (if (or (null installed)
-                                     (< (if (stringp installed)
-                                         (string-to-number installed)
-                                       installed)
-                                     (if (stringp current)
-                                         (string-to-number current)
-                                       current)))
-                                  pkg
-                                nil)))
-                          (package-get-dependencies pui-selected-packages)))))
+               (mapcan
+                (lambda (pkg)
+                  (let ((installed
+                         (package-get-key pkg :version))
+                        (current
+                         (package-get-info-prop
+                          (package-get-info-version
+                           (package-get-info-find-package
+                            package-get-base pkg) nil)
+                          'version)))
+                    (if (or (null installed)
+                            (< (if (stringp installed)
+                                   (string-to-number installed)
+                                 installed)
+                               (if (stringp current)
+                                   (string-to-number current)
+                                 current)))
+                        (list pkg))))
+                (package-get-dependencies pui-selected-packages))))
 	  ;; Don't change window config when asking the user if he really
 	  ;; wants to add the packages.  We do this to avoid messing up
 	  ;; the window configuration if errors occur (we don't want to