diff options
| author | Eli Zaretskii | 2014-11-14 08:14:06 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2014-11-14 08:14:06 +0200 |
| commit | 3e517d349bffb8cd2c2b6ae718097d1a04bae929 (patch) | |
| tree | f994b58d4f091b4e98f839a0cfe769b634f9806f | |
| parent | 5d977b968c5d55470daa337df52ca2689d434e3c (diff) | |
| download | emacs-3e517d349bffb8cd2c2b6ae718097d1a04bae929.tar.gz emacs-3e517d349bffb8cd2c2b6ae718097d1a04bae929.zip | |
Fix error preloading bindings.el.
lisp/bindings.el (search-map): Fix last change: don't use 'kbd' in
bindings.el, since it is not yet loaded when bindings.el is preloaded.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/bindings.el | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9c673c861d9..c3ff8b6d0f6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-11-14 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * bindings.el (search-map): Fix last change: don't use 'kbd' in | ||
| 4 | bindings.el, since it is not yet loaded when bindings.el is | ||
| 5 | preloaded. | ||
| 6 | |||
| 1 | 2014-11-14 Fabián Ezequiel Gallina <fgallina@gnu.org> | 7 | 2014-11-14 Fabián Ezequiel Gallina <fgallina@gnu.org> |
| 2 | 8 | ||
| 3 | * progmodes/python.el (python-shell-completion-get-completions): | 9 | * progmodes/python.el (python-shell-completion-get-completions): |
diff --git a/lisp/bindings.el b/lisp/bindings.el index 5864581d3cc..46ff522c731 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el | |||
| @@ -925,15 +925,15 @@ if `inhibit-field-text-motion' is non-nil." | |||
| 925 | "Keymap for search related commands.") | 925 | "Keymap for search related commands.") |
| 926 | (define-key esc-map "s" search-map) | 926 | (define-key esc-map "s" search-map) |
| 927 | 927 | ||
| 928 | (define-key search-map "o" 'occur) | 928 | (define-key search-map "o" 'occur) |
| 929 | (define-key search-map (kbd "M-s") 'eww-search-words) | 929 | (define-key search-map "\M-s" 'eww-search-words) |
| 930 | (define-key search-map "hr" 'highlight-regexp) | 930 | (define-key search-map "hr" 'highlight-regexp) |
| 931 | (define-key search-map "hp" 'highlight-phrase) | 931 | (define-key search-map "hp" 'highlight-phrase) |
| 932 | (define-key search-map "hl" 'highlight-lines-matching-regexp) | 932 | (define-key search-map "hl" 'highlight-lines-matching-regexp) |
| 933 | (define-key search-map "h." 'highlight-symbol-at-point) | 933 | (define-key search-map "h." 'highlight-symbol-at-point) |
| 934 | (define-key search-map "hu" 'unhighlight-regexp) | 934 | (define-key search-map "hu" 'unhighlight-regexp) |
| 935 | (define-key search-map "hf" 'hi-lock-find-patterns) | 935 | (define-key search-map "hf" 'hi-lock-find-patterns) |
| 936 | (define-key search-map "hw" 'hi-lock-write-interactive-patterns) | 936 | (define-key search-map "hw" 'hi-lock-write-interactive-patterns) |
| 937 | 937 | ||
| 938 | ;;(defun function-key-error () | 938 | ;;(defun function-key-error () |
| 939 | ;; (interactive) | 939 | ;; (interactive) |