[Emacs-diffs] [emacs] 01/01: Fix error preloading bindings.el.

[Eli Zaretskii]

eliz pushed a commit to branch master
in repository emacs.

commit 3e517d349bffb8cd2c2b6ae718097d1a04bae929
Author: Eli Zaretskii <address@hidden>
Date:   Fri Nov 14 08:14:06 2014 +0200

    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.
---
 lisp/ChangeLog   |    6 ++++++
 lisp/bindings.el |   18 +++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c673c8..c3ff8b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-14  Eli Zaretskii  <address@hidden>
+
+       * 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.
+
 2014-11-14  Fabián Ezequiel Gallina  <address@hidden>
 
        * progmodes/python.el (python-shell-completion-get-completions):
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 5864581..46ff522 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -925,15 +925,15 @@ if `inhibit-field-text-motion' is non-nil."
   "Keymap for search related commands.")
 (define-key esc-map "s" search-map)
 
-(define-key search-map "o"  'occur)
-(define-key search-map (kbd "M-s")  'eww-search-words)
-(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 "h." 'highlight-symbol-at-point)
-(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)
+(define-key search-map "o"    'occur)
+(define-key search-map "\M-s" 'eww-search-words)
+(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 "h."   'highlight-symbol-at-point)
+(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)