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

[Luc Teirlinck]

Index: emacs/lisp/menu-bar.el
diff -c emacs/lisp/menu-bar.el:1.267 emacs/lisp/menu-bar.el:1.268
*** emacs/lisp/menu-bar.el:1.267        Thu Aug 11 01:54:40 2005
--- emacs/lisp/menu-bar.el      Thu Aug 11 20:57:36 2005
***************
*** 703,709 ****
  
  (define-key menu-bar-showhide-menu [showhide-battery]
    (menu-bar-make-mm-toggle display-battery-mode
!                          "Battery status"
                           "Display battery status information in mode line"))
  
  (define-key menu-bar-showhide-menu [showhide-date-time]
--- 703,709 ----
  
  (define-key menu-bar-showhide-menu [showhide-battery]
    (menu-bar-make-mm-toggle display-battery-mode
!                          "Battery Status"
                           "Display battery status information in mode line"))
  
  (define-key menu-bar-showhide-menu [showhide-date-time]
***************
*** 735,741 ****
    (customize-variable 'indicate-buffer-boundaries))
  
  (define-key menu-bar-showhide-fringe-ind-menu [customize]
!   '(menu-item "Other (customize)"
              menu-bar-showhide-fringe-ind-customize
              :help "Additional choices available through Custom buffer"
              :visible (display-graphic-p)))
--- 735,741 ----
    (customize-variable 'indicate-buffer-boundaries))
  
  (define-key menu-bar-showhide-fringe-ind-menu [customize]
!   '(menu-item "Other (Customize)"
              menu-bar-showhide-fringe-ind-customize
              :help "Additional choices available through Custom buffer"
              :visible (display-graphic-p)))
***************
*** 747,753 ****
                          '((t . right) (top . left))))
  
  (define-key menu-bar-showhide-fringe-ind-menu [mixed]
!   '(menu-item "Opposite, arrows right" menu-bar-showhide-fringe-ind-mixed
              :help
              "Show top/bottom indicators in opposite fringes, arrows in right"
              :visible (display-graphic-p)
--- 747,753 ----
                          '((t . right) (top . left))))
  
  (define-key menu-bar-showhide-fringe-ind-menu [mixed]
!   '(menu-item "Opposite, Arrows Right" menu-bar-showhide-fringe-ind-mixed
              :help
              "Show top/bottom indicators in opposite fringes, arrows in right"
              :visible (display-graphic-p)
***************
*** 761,767 ****
                          '((top . left) (bottom . right))))
  
  (define-key menu-bar-showhide-fringe-ind-menu [box]
!   '(menu-item "Opposite, no arrows" menu-bar-showhide-fringe-ind-box
              :help "Show top/bottom indicators in opposite fringes, no arrows"
              :visible (display-graphic-p)
              :button (:radio . (eq indicate-buffer-boundaries
--- 761,767 ----
                          '((top . left) (bottom . right))))
  
  (define-key menu-bar-showhide-fringe-ind-menu [box]
!   '(menu-item "Opposite, No Arrows" menu-bar-showhide-fringe-ind-box
              :help "Show top/bottom indicators in opposite fringes, no arrows"
              :visible (display-graphic-p)
              :button (:radio . (eq indicate-buffer-boundaries
***************
*** 773,779 ****
    (customize-set-variable 'indicate-buffer-boundaries 'right))
  
  (define-key menu-bar-showhide-fringe-ind-menu [right]
!   '(menu-item "In right fringe" menu-bar-showhide-fringe-ind-right
              :help "Show buffer boundaries and arrows in right fringe"
              :visible (display-graphic-p)
              :button (:radio . (eq indicate-buffer-boundaries 'right))))
--- 773,779 ----
    (customize-set-variable 'indicate-buffer-boundaries 'right))
  
  (define-key menu-bar-showhide-fringe-ind-menu [right]
!   '(menu-item "In Right Fringe" menu-bar-showhide-fringe-ind-right
              :help "Show buffer boundaries and arrows in right fringe"
              :visible (display-graphic-p)
              :button (:radio . (eq indicate-buffer-boundaries 'right))))
***************
*** 784,790 ****
    (customize-set-variable 'indicate-buffer-boundaries 'left))
  
  (define-key menu-bar-showhide-fringe-ind-menu [left]
!   '(menu-item "In left fringe" menu-bar-showhide-fringe-ind-left
              :help "Show buffer boundaries and arrows in left fringe"
              :visible (display-graphic-p)
              :button (:radio . (eq indicate-buffer-boundaries 'left))))
--- 784,790 ----
    (customize-set-variable 'indicate-buffer-boundaries 'left))
  
  (define-key menu-bar-showhide-fringe-ind-menu [left]
!   '(menu-item "In Left Fringe" menu-bar-showhide-fringe-ind-left
              :help "Show buffer boundaries and arrows in left fringe"
              :visible (display-graphic-p)
              :button (:radio . (eq indicate-buffer-boundaries 'left))))
***************
*** 795,813 ****
    (customize-set-variable 'indicate-buffer-boundaries nil))
  
  (define-key menu-bar-showhide-fringe-ind-menu [none]
!   '(menu-item "No indicators" menu-bar-showhide-fringe-ind-none
              :help "Hide all buffer boundary indicators and arrows"
              :visible (display-graphic-p)
              :button (:radio . (eq indicate-buffer-boundaries nil))))
  
  (define-key menu-bar-showhide-fringe-menu [showhide-fringe-ind]
!   (list 'menu-item "Buffer boundaries" menu-bar-showhide-fringe-ind-menu
        :visible `(display-graphic-p)
        :help "Indicate buffer boundaries in fringe"))
  
  (define-key menu-bar-showhide-fringe-menu [indicate-empty-lines]
    (menu-bar-make-toggle toggle-indicate-empty-lines indicate-empty-lines
!                       "Empty line indicators"
                        "Indicating of empty lines %s"
                        "Indicate trailing empty lines in fringe"))
  
--- 795,813 ----
    (customize-set-variable 'indicate-buffer-boundaries nil))
  
  (define-key menu-bar-showhide-fringe-ind-menu [none]
!   '(menu-item "No Indicators" menu-bar-showhide-fringe-ind-none
              :help "Hide all buffer boundary indicators and arrows"
              :visible (display-graphic-p)
              :button (:radio . (eq indicate-buffer-boundaries nil))))
  
  (define-key menu-bar-showhide-fringe-menu [showhide-fringe-ind]
!   (list 'menu-item "Buffer Boundaries" menu-bar-showhide-fringe-ind-menu
        :visible `(display-graphic-p)
        :help "Indicate buffer boundaries in fringe"))
  
  (define-key menu-bar-showhide-fringe-menu [indicate-empty-lines]
    (menu-bar-make-toggle toggle-indicate-empty-lines indicate-empty-lines
!                       "Empty Line Indicators"
                        "Indicating of empty lines %s"
                        "Indicate trailing empty lines in fringe"))
  
***************
*** 817,823 ****
    (customize-variable 'fringe-mode))
  
  (define-key menu-bar-showhide-fringe-menu [customize]
!   '(menu-item "Customize fringe" menu-bar-showhide-fringe-menu-customize
              :help "Detailed customization of fringe"
              :visible (display-graphic-p)))
  
--- 817,823 ----
    (customize-variable 'fringe-mode))
  
  (define-key menu-bar-showhide-fringe-menu [customize]
!   '(menu-item "Customize Fringe" menu-bar-showhide-fringe-menu-customize
              :help "Detailed customization of fringe"
              :visible (display-graphic-p)))
  
***************
*** 1009,1015 ****
    '("--"))
  (define-key menu-bar-options-menu [cua-mode]
    (menu-bar-make-mm-toggle cua-mode
!                          "C-x/C-c/C-v cut and paste (CUA)"
                           "Use C-z/C-x/C-c/C-v keys for undo/cut/copy/paste"))
  
  (define-key menu-bar-options-menu [case-fold-search]
--- 1009,1015 ----
    '("--"))
  (define-key menu-bar-options-menu [cua-mode]
    (menu-bar-make-mm-toggle cua-mode
!                          "C-x/C-c/C-v Cut and Paste (CUA)"
                           "Use C-z/C-x/C-c/C-v keys for undo/cut/copy/paste"))
  
  (define-key menu-bar-options-menu [case-fold-search]