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

[Miles Bader]

Index: emacs/lisp/menu-bar.el
diff -c emacs/lisp/menu-bar.el:1.221.2.1 emacs/lisp/menu-bar.el:1.221.2.2
*** emacs/lisp/menu-bar.el:1.221.2.1    Fri Apr  4 01:20:10 2003
--- emacs/lisp/menu-bar.el      Tue Oct 14 19:51:17 2003
***************
*** 1,6 ****
  ;;; menu-bar.el --- define a default menu bar
  
! ;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002 Free Software Foundation, 
Inc.
  
  ;; Author: RMS
  ;; Maintainer: FSF
--- 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
***************
*** 484,491 ****
        (message "Selecting a region with the mouse does `copy' automatically")
      (kill-ring-save beg end)))
  
- (autoload 'ispell-menu-map "ispell" nil t 'keymap)
- 
  ;; These are alternative definitions for the cut, paste and copy
  ;; menu items.  Use them if your system expects these to use the clipboard.
  
--- 484,489 ----
***************
*** 528,537 ****
      (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))
***************
*** 656,673 ****
  (define-key menu-bar-options-menu [custom-separator]
    '("--"))
  
  ;; The "Show/Hide" submenu of menu "Options"
  
  (defvar menu-bar-showhide-menu (make-sparse-keymap "Show/Hide"))
  
  (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]
--- 656,678 ----
  (define-key menu-bar-options-menu [custom-separator]
    '("--"))
  
+ (define-key menu-bar-options-menu [mouse-set-font]
+   '(menu-item "Set Font/Fontset" mouse-set-font
+              :visible (display-multi-font-p)
+              :help "Select a font from list of known fonts/fontsets"))
+ 
  ;; The "Show/Hide" submenu of menu "Options"
  
  (defvar menu-bar-showhide-menu (make-sparse-keymap "Show/Hide"))
  
  (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]
***************
*** 682,689 ****
    (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]
***************
*** 867,873 ****
    (menu-bar-make-toggle toggle-save-place-globally save-place
                        "Save Place in Files between Sessions"
                        "Saving place in files %s"
!                       "Visit files of previous session when restarting 
Emacs"))
  
  (define-key menu-bar-options-menu [uniquify]
    (menu-bar-make-toggle toggle-uniquify-buffer-names 
uniquify-buffer-name-style
--- 872,883 ----
    (menu-bar-make-toggle toggle-save-place-globally save-place
                        "Save Place in Files between Sessions"
                        "Saving place in files %s"
!                       "Visit files of previous session when restarting Emacs"
!                         (require 'saveplace)
!                         ;; Do it by name, to avoid a free-variable
!                         ;; warning during byte compilation.
!                         (set-default
!                          'save-place (not (symbol-value 'save-place)))))
  
  (define-key menu-bar-options-menu [uniquify]
    (menu-bar-make-toggle toggle-uniquify-buffer-names 
uniquify-buffer-name-style
***************
*** 882,903 ****
  (define-key menu-bar-options-menu [edit-options-separator]
    '("--"))
  (define-key menu-bar-options-menu [cua-mode]
!   '(menu-item "CUA-style cut and paste"
!             menu-bar-toggle-cua-mode
!             :help "Use C-z/C-x/C-c/C-v keys for undo/cut/copy/paste"
!             :button (:toggle . cua-mode)))
! 
! (defun menu-bar-toggle-cua-mode ()
!   "Toggle CUA key-binding mode.
! When enabled, using shifted movement keys will activate the region (and
! highlight the region using `transient-mark-mode'), and typed text replaces
! the active selection.  C-z, C-x, C-c, and C-v will undo, cut, copy, and
! paste (in addition to the normal Emacs bindings)."
!   (interactive)
!   (cua-mode nil)
!   (customize-mark-as-set 'cua-mode)
!   (message "CUA-style cut and paste %s"
!          (if cua-mode "enabled" "disabled")))
  
  (define-key menu-bar-options-menu [case-fold-search]
    (menu-bar-make-toggle toggle-case-fold-search case-fold-search
--- 892,900 ----
  (define-key menu-bar-options-menu [edit-options-separator]
    '("--"))
  (define-key menu-bar-options-menu [cua-mode]
!   (menu-bar-make-mm-toggle cua-mode
!                          "CUA-style cut and paste"
!                          "Use C-z/C-x/C-c/C-v keys for undo/cut/copy/paste"))
  
  (define-key menu-bar-options-menu [case-fold-search]
    (menu-bar-make-toggle toggle-case-fold-search case-fold-search
***************
*** 1050,1057 ****
  
  (defvar vc-menu-map (make-sparse-keymap "Version Control"))
  (define-key menu-bar-tools-menu [pcl-cvs]
!   `(menu-item "PCL-CVS" ,cvs-global-menu
!             :help "Module-level interface to CVS"))
  (define-key menu-bar-tools-menu [vc]
    (list 'menu-item "Version Control" vc-menu-map
        :help "Interface to RCS, CVS, SCCS"))
--- 1047,1054 ----
  
  (defvar vc-menu-map (make-sparse-keymap "Version Control"))
  (define-key menu-bar-tools-menu [pcl-cvs]
!   '(menu-item "PCL-CVS" cvs-global-menu
!     :help "Module-level interface to CVS"))
  (define-key menu-bar-tools-menu [vc]
    (list 'menu-item "Version Control" vc-menu-map
        :help "Interface to RCS, CVS, SCCS"))
***************
*** 1095,1102 ****
    '(menu-item "Compile..." compile
              :help "Invoke compiler or Make, view compilation errors"))
  (define-key menu-bar-tools-menu [grep]
!   '(menu-item "Search Files (Grep)..." grep
!             :help "Search files for strings or regexps (with Grep)"))
  
  
  ;; The "Help" menu items
--- 1092,1099 ----
    '(menu-item "Compile..." compile
              :help "Invoke compiler or Make, view compilation errors"))
  (define-key menu-bar-tools-menu [grep]
!   '(menu-item "Search Files (with grep)..." grep
!             :help "Search files for strings or regexps (with grep)"))
  
  
  ;; The "Help" menu items
***************
*** 1653,1656 ****
--- 1650,1654 ----
  
  (provide 'menu-bar)
  
+ ;;; arch-tag: 6e6a3c22-4ec4-4d3d-8190-583f8ef94ced
  ;;; menu-bar.el ends here