X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/03b63ba9aa4b6d210d2b3f5d827682b5464ec773..24deb97dd68cd102ba6698b2bd1d5a3dd70998ec:/lisp/bindings.el diff --git a/lisp/bindings.el b/lisp/bindings.el index d1045002a0..c09e56ae9a 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -8,10 +8,10 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,9 +19,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -287,7 +285,9 @@ Menu of mode operations in the mode line.") (defvar mode-line-major-mode-keymap (let ((map (make-sparse-keymap))) - (define-key map [mode-line down-mouse-1] 'mouse-major-mode-menu) + (define-key map [mode-line down-mouse-1] + '(menu-item "Menu Bar" ignore + :filter (lambda (_) (mouse-menu-major-mode-map)))) (define-key map [mode-line mouse-2] 'describe-mode) (define-key map [mode-line down-mouse-3] mode-line-mode-menu) map) "\ @@ -565,12 +565,11 @@ Actually, STRING need not be a string; any possible mode-line element is okay. See `mode-line-format'.") ;; Don't use purecopy here--some people want to change these strings. (setq minor-mode-alist - (list - (list 'abbrev-mode " Abbrev") - '(overwrite-mode overwrite-mode) - (list 'auto-fill-function " Fill") - ;; not really a minor mode... - '(defining-kbd-macro " Def"))) + '((abbrev-mode " Abbrev") + (overwrite-mode overwrite-mode) + (auto-fill-function " Fill") + ;; not really a minor mode... + (defining-kbd-macro " Def"))) ;; These variables are used by autoloadable packages. ;; They are defined here so that they do not get overridden @@ -603,6 +602,7 @@ is okay. See `mode-line-format'.") ".x86f" ".sparcf" ;; Other CL implementations (Allegro, LispWorks, OpenMCL) ".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl" ".dfsl" + ".p64fsl" ".d64fsl" ".dx64fsl" ;; Libtool ".lo" ".la" ;; Gettext @@ -700,10 +700,13 @@ language you are using." ;These commands are defined in editfns.c ;but they are not assigned to keys there. (put 'narrow-to-region 'disabled t) -(define-key ctl-x-map "nn" 'narrow-to-region) -(define-key ctl-x-map "nw" 'widen) -;; (define-key ctl-x-map "n" 'narrow-to-region) -;; (define-key ctl-x-map "w" 'widen) + +(defvar narrow-map (make-sparse-keymap) + "Keymap for narrowing commands.") +(define-key ctl-x-map "n" narrow-map) + +(define-key narrow-map "n" 'narrow-to-region) +(define-key narrow-map "w" 'widen) ;; Quitting (define-key global-map "\e\e\e" 'keyboard-escape-quit) @@ -744,10 +747,10 @@ language you are using." (define-key esc-map "!" 'shell-command) (define-key esc-map "|" 'shell-command-on-region) -(define-key global-map [?\C-x right] 'next-buffer) -(define-key global-map [?\C-x C-right] 'next-buffer) -(define-key global-map [?\C-x left] 'previous-buffer) -(define-key global-map [?\C-x C-left] 'previous-buffer) +(define-key ctl-x-map [right] 'next-buffer) +(define-key ctl-x-map [C-right] 'next-buffer) +(define-key ctl-x-map [left] 'previous-buffer) +(define-key ctl-x-map [C-left] 'previous-buffer) (let ((map minibuffer-local-map)) (define-key map "\en" 'next-history-element) @@ -804,16 +807,31 @@ language you are using." (define-key ctl-x-map "\C-n" 'set-goal-column) (define-key global-map "\C-a" 'move-beginning-of-line) (define-key global-map "\C-e" 'move-end-of-line) -(define-key esc-map "g" (make-sparse-keymap)) -(define-key esc-map "g\M-g" 'goto-line) -(define-key esc-map "gg" 'goto-line) -(define-key esc-map "gn" 'next-error) -(define-key esc-map "g\M-n" 'next-error) (define-key ctl-x-map "`" 'next-error) -(define-key esc-map "gp" 'previous-error) -(define-key esc-map "g\M-p" 'previous-error) +(defvar goto-map (make-sparse-keymap) + "Keymap for navigation commands.") +(define-key esc-map "g" goto-map) + +(define-key goto-map "g" 'goto-line) +(define-key goto-map "\M-g" 'goto-line) +(define-key goto-map "n" 'next-error) +(define-key goto-map "\M-n" 'next-error) +(define-key goto-map "p" 'previous-error) +(define-key goto-map "\M-p" 'previous-error) + +(defvar search-map (make-sparse-keymap) + "Keymap for search related commands.") +(define-key esc-map "s" search-map) + +(define-key search-map "o" 'occur) +(define-key search-map "hr" 'highlight-regexp) +(define-key search-map "hp" 'highlight-phrase) +(define-key search-map "hl" 'highlight-lines-matching-regexp) +(define-key search-map "hu" 'unhighlight-regexp) +(define-key search-map "hf" 'hi-lock-find-patterns) +(define-key search-map "hw" 'hi-lock-write-interactive-patterns) ;;(defun function-key-error () ;; (interactive) @@ -1074,25 +1092,10 @@ language you are using." (define-key ctl-x-4-map "m" 'compose-mail-other-window) (define-key ctl-x-5-map "m" 'compose-mail-other-frame) -(define-key ctl-x-map "r\C-@" 'point-to-register) -(define-key ctl-x-map [?r ?\C-\ ] 'point-to-register) -(define-key ctl-x-map "r " 'point-to-register) -(define-key ctl-x-map "rj" 'jump-to-register) -(define-key ctl-x-map "rs" 'copy-to-register) -(define-key ctl-x-map "rx" 'copy-to-register) -(define-key ctl-x-map "ri" 'insert-register) -(define-key ctl-x-map "rg" 'insert-register) -(define-key ctl-x-map "rr" 'copy-rectangle-to-register) -(define-key ctl-x-map "rn" 'number-to-register) -(define-key ctl-x-map "r+" 'increment-register) -(define-key ctl-x-map "rc" 'clear-rectangle) -(define-key ctl-x-map "rk" 'kill-rectangle) -(define-key ctl-x-map "rd" 'delete-rectangle) -(define-key ctl-x-map "ry" 'yank-rectangle) -(define-key ctl-x-map "ro" 'open-rectangle) -(define-key ctl-x-map "rt" 'string-rectangle) -(define-key ctl-x-map "rw" 'window-configuration-to-register) -(define-key ctl-x-map "rf" 'frame-configuration-to-register) + +(defvar ctl-x-r-map (make-sparse-keymap) + "Keymap for subcommands of C-x r.") +(define-key ctl-x-map "r" ctl-x-r-map) (define-key esc-map "q" 'fill-paragraph) (define-key ctl-x-map "." 'set-fill-prefix) @@ -1112,16 +1115,20 @@ language you are using." (define-key ctl-x-map "np" 'narrow-to-page) ;; (define-key ctl-x-map "p" 'narrow-to-page) -(define-key ctl-x-map "al" 'add-mode-abbrev) -(define-key ctl-x-map "a\C-a" 'add-mode-abbrev) -(define-key ctl-x-map "ag" 'add-global-abbrev) -(define-key ctl-x-map "a+" 'add-mode-abbrev) -(define-key ctl-x-map "aig" 'inverse-add-global-abbrev) -(define-key ctl-x-map "ail" 'inverse-add-mode-abbrev) -;; (define-key ctl-x-map "a\C-h" 'inverse-add-global-abbrev) -(define-key ctl-x-map "a-" 'inverse-add-global-abbrev) -(define-key ctl-x-map "ae" 'expand-abbrev) -(define-key ctl-x-map "a'" 'expand-abbrev) +(defvar abbrev-map (make-sparse-keymap) + "Keymap for abbrev commands.") +(define-key ctl-x-map "a" abbrev-map) + +(define-key abbrev-map "l" 'add-mode-abbrev) +(define-key abbrev-map "\C-a" 'add-mode-abbrev) +(define-key abbrev-map "g" 'add-global-abbrev) +(define-key abbrev-map "+" 'add-mode-abbrev) +(define-key abbrev-map "ig" 'inverse-add-global-abbrev) +(define-key abbrev-map "il" 'inverse-add-mode-abbrev) +;; (define-key abbrev-map "\C-h" 'inverse-add-global-abbrev) +(define-key abbrev-map "-" 'inverse-add-global-abbrev) +(define-key abbrev-map "e" 'expand-abbrev) +(define-key abbrev-map "'" 'expand-abbrev) ;; (define-key ctl-x-map "\C-a" 'add-mode-abbrev) ;; (define-key ctl-x-map "\+" 'add-global-abbrev) ;; (define-key ctl-x-map "\C-h" 'inverse-add-mode-abbrev)