branch: externals/polymode
commit 14b3abc1e2467707398b6e7e5852b56f1463994b
Author: vitalie <vitalie.sp...@adyen.com>
Commit: vitalie <vitalie.sp...@adyen.com>
[Fix 344] Unobsolete polymode-prefix-key and document programatic re-binding
---
polymode.el | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/polymode.el b/polymode.el
index 6845ebdca1..3c5d734b77 100644
--- a/polymode.el
+++ b/polymode.el
@@ -46,10 +46,17 @@
(require 'easymenu)
(require 'derived)
-(defvar polymode-prefix-key nil
- "[Obsoleted] Prefix key for the polymode mode keymap.
-Not effective after loading the polymode library.")
-(make-obsolete-variable 'polymode-prefix-key "Unbind in `polymode-mode-map'"
"v0.1.6")
+(defvar polymode-prefix-key "\M-n"
+ "Default prefix key in `polymode-minor-mode-map'.
+Not effective after loading the polymode library.
+
+Instead of setting this key you can programatically bind it directly
+in `polymode-minor-mode-map` keymap:
+
+ (define-key polymode-minor-mode-map (kbd \"M-n\") nil) ;unbind the default
M-n prefix
+ (define-key polymode-minor-mode-map (kbd \"C-c n\") polymode-map)
+")
+
(defvar polymode-map
(let ((map (define-prefix-command 'polymode-map)))
@@ -74,12 +81,13 @@ Not effective after loading the polymode library.")
(define-key map "$" #'polymode-show-process-buffer)
map)
"Polymode prefix map.
-Lives on `polymode-prefix-key' in polymode buffers.")
+By default, lives on `polymode-prefix-key' in polymode buffers.")
(defvaralias 'polymode-mode-map 'polymode-minor-mode-map)
(defvar polymode-minor-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map (or polymode-prefix-key "\M-n") 'polymode-map)
+ (when polymode-prefix-key
+ (define-key map polymode-prefix-key 'polymode-map))
map)
"The minor mode keymap which is inherited by all polymodes.")
