[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 db479d6 4/5: Revert "Resolve missing button-region keymap bindi
From: |
ken manheimer |
Subject: |
emacs-27 db479d6 4/5: Revert "Resolve missing button-region keymap bindings." |
Date: |
Tue, 21 Jul 2020 10:58:26 -0400 (EDT) |
branch: emacs-27
commit db479d635411e352529cb9378f0455b2abb2637f
Author: Ken Manheimer <ken.manheimer@gmail.com>
Commit: Ken Manheimer <ken.manheimer@gmail.com>
Revert "Resolve missing button-region keymap bindings."
This reverts commit dd7c191291c8eb1afeac0f1512745491c5c7a317.
Backporting it to emacs-27 was not appropriate.
---
lisp/allout-widgets.el | 37 +++++++++++++++----------------------
1 file changed, 15 insertions(+), 22 deletions(-)
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 629f676..bdfcaa2 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -415,17 +415,15 @@ not altered with an escape sequence.")
;;;_ , Widget element formatting
;;;_ = allout-item-icon-keymap
(defvar allout-item-icon-keymap
- (let ((km (make-sparse-keymap))
- (as-parent (if (current-local-map)
- (make-composed-keymap (current-local-map)
- (current-global-map))
- (current-global-map))))
- ;; The keymap parent is reset on the each local var when mode starts.
- (set-keymap-parent km as-parent)
+ (let ((km (make-sparse-keymap)))
(dolist (digit '("0" "1" "2" "3"
"4" "5" "6" "7" "8" "9"))
(define-key km digit 'digit-argument))
(define-key km "-" 'negative-argument)
+;; (define-key km [(return)] 'allout-tree-expand-command)
+;; (define-key km [(meta return)] 'allout-toggle-torso-command)
+;; (define-key km [(down-mouse-1)] 'allout-item-button-click)
+;; (define-key km [(down-mouse-2)] 'allout-toggle-torso-event-command)
;; Override underlying mouse-1 and mouse-2 bindings in icon territory:
(define-key km [(mouse-1)] (lambda () (interactive) nil))
(define-key km [(mouse-2)] (lambda () (interactive) nil))
@@ -435,16 +433,17 @@ not altered with an escape sequence.")
km)
"General tree-node key bindings.")
-(make-variable-buffer-local 'allout-item-icon-keymap)
;;;_ = allout-item-body-keymap
(defvar allout-item-body-keymap
(let ((km (make-sparse-keymap))
- (as-parent (if (current-local-map)
- (make-composed-keymap (current-local-map)
- (current-global-map))
- (current-global-map))))
- ;; The keymap parent is reset on the each local var when mode starts.
- (set-keymap-parent km as-parent)
+ (local-map (current-local-map)))
+;; (define-key km [(control return)] 'allout-tree-expand-command)
+;; (define-key km [(meta return)] 'allout-toggle-torso-command)
+ ;; XXX We need to reset this per buffer's mode; we do so in
+ ;; allout-widgets-mode.
+ (if local-map
+ (set-keymap-parent km local-map))
+
km)
"General key bindings for the text content of outline items.")
(make-variable-buffer-local 'allout-item-body-keymap)
@@ -457,7 +456,6 @@ not altered with an escape sequence.")
(set-keymap-parent km allout-item-icon-keymap)
km)
"Keymap used in the item cue area - the space between the icon and
headline.")
-(make-variable-buffer-local 'allout-cue-span-keymap)
;;;_ = allout-escapes-category
(defvar allout-escapes-category nil
"Symbol for category of text property used to hide escapes of prefix-like
@@ -568,13 +566,8 @@ outline hot-spot navigation (see `allout-mode')."
(add-to-invisibility-spec '(allout-torso . t))
(add-to-invisibility-spec 'allout-escapes)
- (let ((as-parent (if (current-local-map)
- (make-composed-keymap (current-local-map)
- (current-global-map))
- (current-global-map))))
- (set-keymap-parent allout-item-body-keymap as-parent)
- ;; allout-cue-span-keymap uses allout-item-icon-keymap as parent.
- (set-keymap-parent allout-item-icon-keymap as-parent))
+ (if (current-local-map)
+ (set-keymap-parent allout-item-body-keymap (current-local-map)))
(add-hook 'allout-exposure-change-functions
'allout-widgets-exposure-change-recorder nil 'local)
- emacs-27 updated (4db3235 -> 8bc8565), ken manheimer, 2020/07/21
- emacs-27 8e4eae0 1/5: Revert "Fix allout-widgets-mode handling of edits to item cue, fixing (bug#11312)", ken manheimer, 2020/07/21
- emacs-27 56422a6 2/5: Revert "Don't let item decoration be disrupted by too-shallow items.", ken manheimer, 2020/07/21
- emacs-27 db479d6 4/5: Revert "Resolve missing button-region keymap bindings.",
ken manheimer <=
- emacs-27 8bc8565 5/5: Revert "Rectify allout-widgets region undecoration so item at start is not missed.", ken manheimer, 2020/07/21
- emacs-27 259dc75 3/5: Revert "Provide missing let definition to prevent background void-variable error.", ken manheimer, 2020/07/21