comparison lisp/bindings.el @ 83545:034f67f59091

Merged from emacs@sv.gnu.org. Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-479 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-480 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-481 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-482 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-483 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-484 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-485 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-153 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-154 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-155 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-585
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 03 Dec 2006 12:25:18 +0000
parents 2d56e13fd23d 334001e04b9b
children c71725faff1a
comparison
equal deleted inserted replaced
83544:58cf725f5330 83545:034f67f59091
432 432
433 (defmacro bound-and-true-p (var) 433 (defmacro bound-and-true-p (var)
434 "Return the value of symbol VAR if it is bound, else nil." 434 "Return the value of symbol VAR if it is bound, else nil."
435 `(and (boundp (quote ,var)) ,var)) 435 `(and (boundp (quote ,var)) ,var))
436 436
437 ;; Use mode-line-mode-menu for local minor-modes only.
438 ;; Global ones can go on the menubar (Options --> Show/Hide).
437 (define-key mode-line-mode-menu [overwrite-mode] 439 (define-key mode-line-mode-menu [overwrite-mode]
438 `(menu-item ,(purecopy "Overwrite (Ovwrt)") overwrite-mode 440 `(menu-item ,(purecopy "Overwrite (Ovwrt)") overwrite-mode
439 :button (:toggle . overwrite-mode))) 441 :button (:toggle . overwrite-mode)))
440 (define-key mode-line-mode-menu [outline-minor-mode] 442 (define-key mode-line-mode-menu [outline-minor-mode]
441 `(menu-item ,(purecopy "Outline (Outl)") outline-minor-mode 443 `(menu-item ,(purecopy "Outline (Outl)") outline-minor-mode
442 :button (:toggle . (bound-and-true-p outline-minor-mode)))) 444 :button (:toggle . (bound-and-true-p outline-minor-mode))))
443 (define-key mode-line-mode-menu [line-number-mode]
444 `(menu-item ,(purecopy "Line number") line-number-mode
445 :button (:toggle . line-number-mode)))
446 (define-key mode-line-mode-menu [highlight-changes-mode] 445 (define-key mode-line-mode-menu [highlight-changes-mode]
447 `(menu-item ,(purecopy "Highlight changes (Chg)") highlight-changes-mode 446 `(menu-item ,(purecopy "Highlight changes (Chg)") highlight-changes-mode
448 :button (:toggle . (bound-and-true-p highlight-changes-mode)))) 447 :button (:toggle . (bound-and-true-p highlight-changes-mode))))
449 (define-key mode-line-mode-menu [hide-ifdef-mode] 448 (define-key mode-line-mode-menu [hide-ifdef-mode]
450 `(menu-item ,(purecopy "Hide ifdef (Ifdef)") hide-ifdef-mode 449 `(menu-item ,(purecopy "Hide ifdef (Ifdef)") hide-ifdef-mode
456 `(menu-item ,(purecopy "Font Lock") font-lock-mode 455 `(menu-item ,(purecopy "Font Lock") font-lock-mode
457 :button (:toggle . font-lock-mode))) 456 :button (:toggle . font-lock-mode)))
458 (define-key mode-line-mode-menu [flyspell-mode] 457 (define-key mode-line-mode-menu [flyspell-mode]
459 `(menu-item ,(purecopy "Flyspell (Fly)") flyspell-mode 458 `(menu-item ,(purecopy "Flyspell (Fly)") flyspell-mode
460 :button (:toggle . (bound-and-true-p flyspell-mode)))) 459 :button (:toggle . (bound-and-true-p flyspell-mode))))
461 (define-key mode-line-mode-menu [column-number-mode]
462 `(menu-item ,(purecopy "Column number") column-number-mode
463 :button (:toggle . column-number-mode)))
464 (define-key mode-line-mode-menu [auto-revert-tail-mode] 460 (define-key mode-line-mode-menu [auto-revert-tail-mode]
465 `(menu-item ,(purecopy "Auto revert tail (Tail)") auto-revert-tail-mode 461 `(menu-item ,(purecopy "Auto revert tail (Tail)") auto-revert-tail-mode
462 :enable (buffer-file-name)
466 :button (:toggle . (bound-and-true-p auto-revert-tail-mode)))) 463 :button (:toggle . (bound-and-true-p auto-revert-tail-mode))))
467 (define-key mode-line-mode-menu [auto-revert-mode] 464 (define-key mode-line-mode-menu [auto-revert-mode]
468 `(menu-item ,(purecopy "Auto revert (ARev)") auto-revert-mode 465 `(menu-item ,(purecopy "Auto revert (ARev)") auto-revert-mode
469 :button (:toggle . (bound-and-true-p auto-revert-mode)))) 466 :button (:toggle . (bound-and-true-p auto-revert-mode))))
470 (define-key mode-line-mode-menu [auto-fill-mode] 467 (define-key mode-line-mode-menu [auto-fill-mode]