branch: externals/objed
commit fa06574884800beed1c6df245d961e66180da52f
Author: Clemens Radermacher <clem...@posteo.net>
Commit: Clemens Radermacher <clem...@posteo.net>
Don't init when other modes have set overriding-terminal-local-map
---
objed.el | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/objed.el b/objed.el
index afd15d6..2cd2517 100644
--- a/objed.el
+++ b/objed.el
@@ -1254,6 +1254,9 @@ See `objed-cmd-alist'."
"Default for `objed-init-p-function'."
(and (not (minibufferp))
(not (bobp))
+ ;; don't interfere with other special modes
+ ;; like hydra
+ (not overriding-terminal-local-map)
;; TODO: add variables for those
(or (memq major-mode '(messages-buffer-mode help-mode))
(not (derived-mode-p 'comint-mode 'special-mode 'dired-mode)))))
@@ -3908,13 +3911,13 @@ If DO-NOT-SAVE is non-nil don't store ALIST entries in
(advice-add (car cmd2obj) :before 'objed--save-start-position)))
(defun objed--remove-advices (alist)
- "Remove advices accroding to ALIST.
+ "Remove advices accroding to ALIST.
See `objed-cmd-alist'."
- (dolist (cmd2obj alist)
- (advice-remove (car cmd2obj)
- (apply-partially #'objed--activate (car cmd2obj)))
- (advice-remove (car cmd2obj) 'objed--save-start-position)))
+ (dolist (cmd2obj alist)
+ (advice-remove (car cmd2obj)
+ (apply-partially #'objed--activate (car cmd2obj)))
+ (advice-remove (car cmd2obj) 'objed--save-start-position)))
(provide 'objed)
