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

[Eli Zaretskii]

Index: emacs/lisp/menu-bar.el
diff -c emacs/lisp/menu-bar.el:1.216 emacs/lisp/menu-bar.el:1.217
*** emacs/lisp/menu-bar.el:1.216        Wed May  1 18:01:16 2002
--- emacs/lisp/menu-bar.el      Fri May 10 05:42:49 2002
***************
*** 615,627 ****
  
  (define-key menu-bar-showhide-menu [column-number-mode]
    (menu-bar-make-toggle toggle-column-number-mode column-number-mode
!                       "Show Column Number" "Column number mode %s"
!                       "Show the current column number in the mode-line"))
  
  (define-key menu-bar-showhide-menu [line-number-mode]
    (menu-bar-make-toggle toggle-line-number-mode line-number-mode
!                       "Show Line Number" "Line number mode %s"
!                       "Show the current line number in the mode-line"))
  
  (define-key menu-bar-showhide-menu [linecolumn-separator]
    '("--"))
--- 615,627 ----
  
  (define-key menu-bar-showhide-menu [column-number-mode]
    (menu-bar-make-toggle toggle-column-number-mode column-number-mode
!                       "Show Column Numbers" "Column number mode %s"
!                       "Show the current column number in the mode line"))
  
  (define-key menu-bar-showhide-menu [line-number-mode]
    (menu-bar-make-toggle toggle-line-number-mode line-number-mode
!                       "Show Line Numbers" "Line number mode %s"
!                       "Show the current line number in the mode line"))
  
  (define-key menu-bar-showhide-menu [linecolumn-separator]
    '("--"))
***************
*** 638,644 ****
                                (interactive)
                                (showhide-date-time)
                                (customize-mark-as-set 'display-time-mode))
!             :help "Display date and time in the mode-line"
              :button (:toggle . display-time-mode)))
  
  (define-key menu-bar-showhide-menu [datetime-separator]
--- 638,644 ----
                                (interactive)
                                (showhide-date-time)
                                (customize-mark-as-set 'display-time-mode))
!             :help "Display date and time in the mode line"
              :button (:toggle . display-time-mode)))
  
  (define-key menu-bar-showhide-menu [datetime-separator]
***************
*** 646,652 ****
  
  (define-key menu-bar-showhide-menu [showhide-speedbar]
    '(menu-item "Speedbar" speedbar-frame-mode
!             :help "Display speedbar"
              :button (:toggle
                       . (and (boundp 'speedbar-frame)
                              (frame-live-p (symbol-value 'speedbar-frame))
--- 646,652 ----
  
  (define-key menu-bar-showhide-menu [showhide-speedbar]
    '(menu-item "Speedbar" speedbar-frame-mode
!             :help "Display a Speedbar quick-navigation frame"
              :button (:toggle
                       . (and (boundp 'speedbar-frame)
                              (frame-live-p (symbol-value 'speedbar-frame))
***************
*** 661,667 ****
                (interactive)
                (customize-set-variable 'scroll-bar-mode 'right))
              :help "Scroll-bar on the right side"
!             :visible window-system
              :button (:radio . (eq (cdr (assq 'vertical-scroll-bars
                                               (frame-parameters))) 'right))))
  
--- 661,667 ----
                (interactive)
                (customize-set-variable 'scroll-bar-mode 'right))
              :help "Scroll-bar on the right side"
!             :visible (display-graphic-p)
              :button (:radio . (eq (cdr (assq 'vertical-scroll-bars
                                               (frame-parameters))) 'right))))
  
***************
*** 671,677 ****
                (interactive)
                (customize-set-variable 'scroll-bar-mode 'left))
              :help "Scroll-bar on the left side"
!             :visible window-system
              :button (:radio . (eq (cdr (assq 'vertical-scroll-bars
                                               (frame-parameters))) 'left))))
  
--- 671,677 ----
                (interactive)
                (customize-set-variable 'scroll-bar-mode 'left))
              :help "Scroll-bar on the left side"
!             :visible (display-graphic-p)
              :button (:radio . (eq (cdr (assq 'vertical-scroll-bars
                                               (frame-parameters))) 'left))))
  
***************
*** 681,693 ****
                (interactive)
                (customize-set-variable 'scroll-bar-mode nil))
              :help "Turn off scroll-bar"
!             :visible window-system
              :button (:radio . (eq (cdr (assq 'vertical-scroll-bars
                                               (frame-parameters))) nil))))
  
  (define-key menu-bar-showhide-menu [showhide-scroll-bar]
    (list 'menu-item "Scroll-bar" menu-bar-showhide-scroll-bar-menu
!       :visible 'window-system
        :help "Select scroll-bar mode"))
  
  (defun showhide-menu-bar ()
--- 681,693 ----
                (interactive)
                (customize-set-variable 'scroll-bar-mode nil))
              :help "Turn off scroll-bar"
!             :visible (display-graphic-p)
              :button (:radio . (eq (cdr (assq 'vertical-scroll-bars
                                               (frame-parameters))) nil))))
  
  (define-key menu-bar-showhide-menu [showhide-scroll-bar]
    (list 'menu-item "Scroll-bar" menu-bar-showhide-scroll-bar-menu
!       :visible `(display-graphic-p)
        :help "Select scroll-bar mode"))
  
  (defun showhide-menu-bar ()
***************
*** 696,728 ****
    (menu-bar-mode)
    (if menu-bar-mode
        (message "Menu-bar mode enabled.")
!     (message "Menu-bar mode disabled.  Use M-x menu-bar-mode to make the menu 
bar appear.")))
  
  (define-key menu-bar-showhide-menu [showhide-menu-bar]
!   '(menu-item "Menu-bar"
!             (lambda ()
!               (interactive)
!               (showhide-menu-bar)
!               (customize-mark-as-set 'menu-bar-mode))
              :help "Toggle menu-bar on/off"
              :button (:toggle . menu-bar-mode)))
  
! (defun showhide-tool-bar ()
    "Toggle whether to turn tool-bar on/off."
    (interactive)
    (if (tool-bar-mode)
        (message "Tool-bar mode enabled.")
!     (message "Tool-bar mode disabled.")))
  
  (define-key menu-bar-showhide-menu [showhide-tool-bar]
!   '(menu-item "Tool-bar"
!             (lambda ()
!               (interactive)
!               (showhide-tool-bar)
!               (customize-mark-as-set 'tool-bar-mode))
!             :help "Turn tool-bar on/off"
!             :visible window-system
!             :button (:toggle . tool-bar-mode)))
  
  (define-key menu-bar-options-menu [showhide]
    (list 'menu-item "Show/Hide" menu-bar-showhide-menu
--- 696,722 ----
    (menu-bar-mode)
    (if menu-bar-mode
        (message "Menu-bar mode enabled.")
!     (message "Menu-bar mode disabled.  Use M-x menu-bar-mode to make the menu 
bar appear."))
!   (customize-mark-as-set 'menu-bar-mode))
  
  (define-key menu-bar-showhide-menu [showhide-menu-bar]
!   '(menu-item "Menu-bar" showhide-menu-bar
              :help "Toggle menu-bar on/off"
              :button (:toggle . menu-bar-mode)))
  
! (defun showhide-toolbar ()
    "Toggle whether to turn tool-bar on/off."
    (interactive)
    (if (tool-bar-mode)
        (message "Tool-bar mode enabled.")
!     (message "Tool-bar mode disabled."))
!   (customize-mark-as-set 'tool-bar-mode))
  
  (define-key menu-bar-showhide-menu [showhide-tool-bar]
!   (list 'menu-item "Tool-bar" 'showhide-toolbar
!       :help "Turn tool-bar on/off"
!       :visible `(display-graphic-p)
!       :button `(:toggle . tool-bar-mode)))
  
  (define-key menu-bar-options-menu [showhide]
    (list 'menu-item "Show/Hide" menu-bar-showhide-menu