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

[Dave Love]

Index: emacs/lisp/menu-bar.el
diff -c emacs/lisp/menu-bar.el:1.243 emacs/lisp/menu-bar.el:1.244
*** emacs/lisp/menu-bar.el:1.243        Mon Sep  1 11:45:13 2003
--- emacs/lisp/menu-bar.el      Mon Sep  1 14:48:10 2003
***************
*** 526,535 ****
      (cons "Cut" (cons "Delete text in region and copy it to the clipboard"
                      'clipboard-kill-region)))
  
    (define-key global-map [f20] 'clipboard-kill-region)
    (define-key global-map [f16] 'clipboard-kill-ring-save)
    (define-key global-map [f18] 'clipboard-yank)
!   ;; X11R6 versions
    (define-key global-map [cut] 'clipboard-kill-region)
    (define-key global-map [copy] 'clipboard-kill-ring-save)
    (define-key global-map [paste] 'clipboard-yank))
--- 526,537 ----
      (cons "Cut" (cons "Delete text in region and copy it to the clipboard"
                      'clipboard-kill-region)))
  
+   ;; These are Sun server keysyms for the Cut, Copy and Paste keys
+   ;; (also for XFree86 on Sun keyboard):
    (define-key global-map [f20] 'clipboard-kill-region)
    (define-key global-map [f16] 'clipboard-kill-ring-save)
    (define-key global-map [f18] 'clipboard-yank)
!   ;; X11R6 versions:
    (define-key global-map [cut] 'clipboard-kill-region)
    (define-key global-map [copy] 'clipboard-kill-ring-save)
    (define-key global-map [paste] 'clipboard-yank))
***************
*** 665,676 ****
  
  (define-key menu-bar-showhide-menu [column-number-mode]
    (menu-bar-make-mm-toggle column-number-mode
!                          "Show Column Numbers"
                           "Show the current column number in the mode line"))
  
  (define-key menu-bar-showhide-menu [line-number-mode]
    (menu-bar-make-mm-toggle line-number-mode
!                          "Show Line Numbers"
                           "Show the current line number in the mode line"))
  
  (define-key menu-bar-showhide-menu [linecolumn-separator]
--- 667,678 ----
  
  (define-key menu-bar-showhide-menu [column-number-mode]
    (menu-bar-make-mm-toggle column-number-mode
!                          "Column Numbers"
                           "Show the current column number in the mode line"))
  
  (define-key menu-bar-showhide-menu [line-number-mode]
    (menu-bar-make-mm-toggle line-number-mode
!                          "Line Numbers"
                           "Show the current line number in the mode line"))
  
  (define-key menu-bar-showhide-menu [linecolumn-separator]
***************
*** 685,692 ****
    (customize-mark-as-set 'display-time-mode))
  
  (define-key menu-bar-showhide-menu [showhide-date-time]
!   '(menu-item "Date and Time" showhide-date-time
!             :help "Display date and time in the mode line"
              :button (:toggle . display-time-mode)))
  
  (define-key menu-bar-showhide-menu [datetime-separator]
--- 687,694 ----
    (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]