APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1307193479 -3600 # Node ID bcd74c477a387f6a7ea62cf0244af98635c473ac # Parent 3cc7470ea71c67a24a19e0185caa0271fe46933a Switch to #'dolist instead of #'mapcar in a couple of places if result not used 2011-06-04 Aidan Kehoe <kehoea(a)parhasard.net&gt; * gutter-items.el (add-tab-to-gutter): * toolbar-items.el (toolbar-add-item-data): Switch to #'dolist instead of #'mapcar in a couple of places where the result isn't used. (Committed now mostly to trigger a commit mail so Mats' buildbot gets woken up.) diff -r 3cc7470ea71c -r bcd74c477a38 lisp/ChangeLog --- a/lisp/ChangeLog Fri Jun 03 18:40:57 2011 +0100 +++ b/lisp/ChangeLog Sat Jun 04 14:17:59 2011 +0100 ＠＠ -1,3 +1,11 ＠＠ +2011-06-04 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * gutter-items.el (add-tab-to-gutter): + * toolbar-items.el (toolbar-add-item-data): + Switch to #'dolist instead of #'mapcar in a couple of places where + the result isn't used. (Committed now mostly to trigger a commit + mail so Mats' buildbot gets woken up.) + 2011-05-29 Aidan Kehoe <kehoea(a)parhasard.net&gt; * cl-macs.el (cl-transform-lambda): diff -r 3cc7470ea71c -r bcd74c477a38 lisp/gutter-items.el --- a/lisp/gutter-items.el Fri Jun 03 18:40:57 2011 +0100 +++ b/lisp/gutter-items.el Sat Jun 04 14:17:59 2011 +0100 ＠＠ -314,28 +314,26 ＠＠ (remove-gutter-element left-gutter 'buffers-tab) (remove-gutter-element right-gutter 'buffers-tab) ;; Put tabs into all devices that will be able to display them - (mapcar - #'(lambda (x) - (when (valid-image-instantiator-format-p 'tab-control x) - (cond ((eq gutter-buffers-tab-orientation 'top) - ;; This looks better than a 3d border - (set-specifier top-gutter-border-width 0 'global x) - (set-gutter-element top-gutter 'buffers-tab - gutter-string 'global x)) - ((eq gutter-buffers-tab-orientation 'bottom) - (set-specifier bottom-gutter-border-width 0 'global x) - (set-gutter-element bottom-gutter 'buffers-tab - gutter-string 'global x)) - ((eq gutter-buffers-tab-orientation 'left) - (set-specifier left-gutter-border-width 0 'global x) - (set-gutter-element left-gutter 'buffers-tab - gutter-string 'global x)) - ((eq gutter-buffers-tab-orientation 'right) - (set-specifier right-gutter-border-width 0 'global x) - (set-gutter-element right-gutter 'buffers-tab - gutter-string 'global x)) - ))) - (console-type-list)))) + (dolist (x (console-type-list)) + (when (valid-image-instantiator-format-p 'tab-control x) + (case gutter-buffers-tab-orientation + (top + ;; This looks better than a 3d border + (set-specifier top-gutter-border-width 0 'global x) + (set-gutter-element top-gutter 'buffers-tab + gutter-string 'global x)) + (bottom + (set-specifier bottom-gutter-border-width 0 'global x) + (set-gutter-element bottom-gutter 'buffers-tab + gutter-string 'global x)) + (left + (set-specifier left-gutter-border-width 0 'global x) + (set-gutter-element left-gutter 'buffers-tab + gutter-string 'global x)) + (right + (set-specifier right-gutter-border-width 0 'global x) + (set-gutter-element right-gutter 'buffers-tab gutter-string 'global + x))))))) (defun update-tab-in-gutter (frame &optional force-selection) "Update the tab control in the gutter area." diff -r 3cc7470ea71c -r bcd74c477a38 lisp/toolbar-items.el --- a/lisp/toolbar-items.el Fri Jun 03 18:40:57 2011 +0100 +++ b/lisp/toolbar-items.el Sat Jun 04 14:17:59 2011 +0100 ＠＠ -454,26 +454,20 ＠＠ (defun toolbar-add-item-data (icon-list &optional icon-dir) (if (eq icon-dir nil) (setq icon-dir toolbar-icon-directory)) - (mapcar - (lambda (cons) - (let ((prefix (expand-file-name (cdr cons) icon-dir))) - ;; #### This should use a better mechanism for finding the - ;; glyphs, allowing for formats other than x[pb]m. Look at - ;; `widget-glyph-find' for an example how it might be done. - (set (car cons) - (if (featurep 'xpm) - (toolbar-make-button-list - (concat prefix "-up.xpm") - nil - (concat prefix "-xx.xpm") - (concat prefix "-cap-up.xpm") - nil - (concat prefix "-cap-xx.xpm")) - (toolbar-make-button-list - (concat prefix "-up.xbm") - (concat prefix "-dn.xbm") - (concat prefix "-xx.xbm")))))) - icon-list)) + (dolist (cons icon-list) + (let ((prefix (expand-file-name (cdr cons) icon-dir))) + ;; #### This should use a better mechanism for finding the + ;; glyphs, allowing for formats other than x[pb]m. Look at + ;; `widget-glyph-find' for an example how it might be done. + (set (car cons) + (if (load-time-value (featurep 'xpm)) + (toolbar-make-button-list (concat prefix "-up.xpm") nil + (concat prefix "-xx.xpm") + (concat prefix "-cap-up.xpm") + nil (concat prefix "-cap-xx.xpm")) + (toolbar-make-button-list (concat prefix "-up.xbm") + (concat prefix "-dn.xbm") + (concat prefix "-xx.xbm"))))))) (defvar toolbar-vector-open [toolbar-file-icon toolbar-open t "Open a file"] -- ‘Iodine deficiency was endemic in parts of the UK until, through what has been described as “an unplanned and accidental public health triumph”, iodine was added to cattle feed to improve milk production in the 1930s.’ (EN Pearce, Lancet, June 2011) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches