branch: elpa/engine-mode
commit 65e9a37fd05b1082c64d80af419fdd21113de2a4
Author: Basil L. Contovounesios <conto...@tcd.ie>
Commit: Harry Schwartz <he...@harryrschwartz.com>
Minimise side-effects when loading
Simultaneously appease byte-compiler.
---
engine-mode.el | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/engine-mode.el b/engine-mode.el
index b727e6d005..96978ebd53 100644
--- a/engine-mode.el
+++ b/engine-mode.el
@@ -51,10 +51,20 @@
;;; Code:
(require 'cl-lib)
-(defvar engine-mode-map (make-sparse-keymap))
+(defcustom engine/keybinding-prefix "C-x /"
+ "The default engine-mode keybindings prefix."
+ :group 'engine-mode
+ :type 'string)
+
(define-prefix-command 'engine-mode-prefixed-map)
(defvar engine-mode-prefixed-map)
+(defvar engine-mode-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map (kbd engine/keybinding-prefix) engine-mode-prefixed-map)
+ map)
+ "Keymap for `engine-mode'.")
+
;;;###autoload
(define-minor-mode engine-mode
"Minor mode for defining and querying search engines through Emacs.
@@ -71,13 +81,6 @@ For example, to use \"C-c s\" instead of the default \"C-x
/\":
(define-key engine-mode-map (kbd engine/keybinding-prefix) nil)
(define-key engine-mode-map prefix-key engine-mode-prefixed-map))
-(defcustom engine/keybinding-prefix "C-x /"
- "The default engine-mode keybindings prefix."
- :group 'engine-mode
- :type 'string)
-
-(engine/set-keymap-prefix (kbd engine/keybinding-prefix))
-
(defcustom engine/browser-function browse-url-browser-function
"The default browser function used when opening a URL in an engine.
Defaults to `browse-url-browser-function'."
