[Emacs-diffs] Changes to emacs/lisp/menu-bar.el

[Stefan Monnier]

Index: emacs/lisp/menu-bar.el
diff -c emacs/lisp/menu-bar.el:1.254 emacs/lisp/menu-bar.el:1.255
*** emacs/lisp/menu-bar.el:1.254        Sun Mar  6 20:18:06 2005
--- emacs/lisp/menu-bar.el      Tue Mar 22 19:44:30 2005
***************
*** 1,6 ****
  ;;; menu-bar.el --- define a default menu bar
  
! ;; Copyright (C) 1993,94,1995,2000,01,02,2003  Free Software Foundation, Inc.
  
  ;; Author: RMS
  ;; Maintainer: FSF
--- 1,7 ----
  ;;; menu-bar.el --- define a default menu bar
  
! ;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2005
! ;;           Free Software Foundation, Inc.
  
  ;; Author: RMS
  ;; Maintainer: FSF
***************
*** 596,602 ****
  HELP is the text to use for the tooltip.
  PROPS are additional properties."
    `'(menu-item ,doc ,fname
!      ,@(if props props)
       :help ,help
       :button (:toggle . (and (default-boundp ',fname)
                             (default-value ',fname)))))
--- 597,603 ----
  HELP is the text to use for the tooltip.
  PROPS are additional properties."
    `'(menu-item ,doc ,fname
!      ,@props
       :help ,help
       :button (:toggle . (and (default-boundp ',fname)
                             (default-value ',fname)))))
***************
*** 693,710 ****
  (define-key menu-bar-showhide-menu [linecolumn-separator]
    '("--"))
  
- (defun showhide-date-time ()
-   "Toggle whether to show date and time in the mode-line."
-   (interactive)
-   (if (display-time-mode)
-       (message "Display-time mode enabled.")
-     (message "Display-time mode disabled."))
-   (customize-mark-as-set 'display-time-mode))
- 
  (define-key menu-bar-showhide-menu [showhide-date-time]
!   '(menu-item "Date, Time and Mail" showhide-date-time
!             :help "Display date, time, mail status in mode line"
!             :button (:toggle . display-time-mode)))
  
  (define-key menu-bar-showhide-menu [datetime-separator]
    '("--"))
--- 694,703 ----
  (define-key menu-bar-showhide-menu [linecolumn-separator]
    '("--"))
  
  (define-key menu-bar-showhide-menu [showhide-date-time]
!   (menu-bar-make-mm-toggle display-time-mode
!                          "Date, Time and Mail"
!                          "Display date, time, mail status in mode line"))
  
  (define-key menu-bar-showhide-menu [datetime-separator]
    '("--"))