Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
5266:f9ec07abdbf9 5267:668c73e222fd
522 (set-buffer (event-buffer event)) 522 (set-buffer (event-buffer event))
523 (popup-menu-and-execute-in-window 523 (popup-menu-and-execute-in-window
524 (cons 524 (cons
525 "Minor Mode Toggles" 525 "Minor Mode Toggles"
526 (sort 526 (sort
527 (delq nil (mapcar 527 (mapcan
528 #'(lambda (x) 528 #'(lambda (x)
529 (let* ((toggle-sym (car x)) 529 (let* ((toggle-sym (car x))
530 (toggle-fun (or (get toggle-sym 530 (toggle-fun (or (get toggle-sym
531 'modeline-toggle-function) 531 'modeline-toggle-function)
532 (and (commandp toggle-sym) 532 (and (commandp toggle-sym)
533 toggle-sym))) 533 toggle-sym)))
534 (menu-tag (symbol-name (if (symbolp toggle-fun) 534 (menu-tag (symbol-name (if (symbolp toggle-fun)
535 toggle-fun 535 toggle-fun
536 toggle-sym)) 536 toggle-sym))
537 ;; Here a function should 537 ;; Here a function should maybe be invoked to
538 ;; maybe be invoked to 538 ;; beautify the symbol's menu appearance.
539 ;; beautify the symbol's 539 ))
540 ;; menu appearance. 540 (and toggle-fun
541 )) 541 (list (vector menu-tag
542 (and toggle-fun 542 toggle-fun
543 (vector menu-tag 543 ;; The following two are wrong because of
544 toggle-fun 544 ;; possible name clashes.
545 ;; The following two are wrong 545 ;:active (get toggle-sym :active t)
546 ;; because of possible name 546 ;:included (get toggle-sym :included t)
547 ;; clashes. 547 :style 'toggle
548 ;:active (get toggle-sym :active t) 548 :selected (and (boundp toggle-sym)
549 ;:included (get toggle-sym :included t) 549 toggle-sym))))))
550 :style 'toggle 550 minor-mode-alist)
551 :selected (and (boundp toggle-sym) 551 (lambda (e1 e2) (string< (aref e1 0) (aref e2 0)))))
552 toggle-sym)))))
553 minor-mode-alist))
554 (lambda (e1 e2)
555 (string< (aref e1 0) (aref e2 0)))))
556 event))) 552 event)))
557 553
558 (defvar modeline-minor-mode-map (make-sparse-keymap 'modeline-minor-mode-map) 554 (defvar modeline-minor-mode-map (make-sparse-keymap 'modeline-minor-mode-map)
559 "Keymap consulted for mouse-clicks on the minor-mode modeline list.") 555 "Keymap consulted for mouse-clicks on the minor-mode modeline list.")
560 (define-key modeline-minor-mode-map 'button3 'modeline-minor-mode-menu) 556 (define-key modeline-minor-mode-map 'button3 'modeline-minor-mode-menu)