From: Eli Zaretskii Date: Fri, 14 Nov 2014 06:14:06 +0000 (+0200) Subject: Fix error preloading bindings.el. X-Git-Tag: emacs-25.0.90~2635^2~476 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e517d349bffb8cd2c2b6ae718097d1a04bae929;p=emacs.git 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. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9c673c861d9..c3ff8b6d0f6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-11-14 Eli Zaretskii + + * 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 * 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." "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)