[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole 734c6a8 11/25: Merge branch 'master' of githu
From: |
Stefan Monnier |
Subject: |
[elpa] externals/hyperbole 734c6a8 11/25: Merge branch 'master' of github.com:rswgnu/hyperbole |
Date: |
Tue, 22 Sep 2020 10:29:27 -0400 (EDT) |
branch: externals/hyperbole
commit 734c6a84fb802346cc24a9b0738faac6f2558277
Merge: 97a4d80 42487cb
Author: Bob Weiner <Bob.Weiner@DuffandPhelps.com>
Commit: Bob Weiner <Bob.Weiner@DuffandPhelps.com>
Merge branch 'master' of github.com:rswgnu/hyperbole
---
Changes | 3 ++-
hib-kbd.el | 30 ++++++++++++++++--------------
hsys-org.el | 12 ++++++------
3 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/Changes b/Changes
index fdef571..723976f 100644
--- a/Changes
+++ b/Changes
@@ -9,7 +9,8 @@
2020-07-25 Bob Weiner <rsw@gnu.org>
* hib-kbd.el (kbd-key:execute-special-series): Added and used in kbd-key:act
- to make key series work properly when helm-mode or counsel-mode are
enabled.
+ to make key series work properly when helm-mode is enabled. Counsel-mode
+ works without any change.
2020-07-23 Bob Weiner <rsw@gnu.org>
diff --git a/hib-kbd.el b/hib-kbd.el
index 074d5f8..4545a90 100644
--- a/hib-kbd.el
+++ b/hib-kbd.el
@@ -129,30 +129,32 @@ Returns t if KEY-SERIES has a binding, else nil."
(defun kbd-key:execute-special-series (key-series)
"Execute key series."
- (if (eq (key-binding [?\M-x]) #'execute-extended-command)
+ (if (memq (key-binding [?\M-x]) #'(execute-extended-command counsel-M-x))
(kbd-key:key-series-to-events key-series)
- ;; Disable helm or counsel while processing M-x commands; helm at
- ;; least gobbles final RET key,
+ ;; Disable helm while processing M-x commands; helm
+ ;; gobbles final RET key. Counsel works without modification.
(let ((orig-binding (global-key-binding [?\M-x]))
- (counsel-flag (and (boundp 'counsel-mode) counsel-mode))
(helm-flag (and (boundp 'helm-mode) helm-mode)))
(unwind-protect
(progn
- (when counsel-flag (counsel-mode -1))
- (when helm-flag (helm-mode -1))
+ (when helm-flag (helm-mode -1))
(global-set-key [?\M-x] 'execute-extended-command)
- (kbd-key:key-series-to-events key-series)
- (sit-for 0.001))
- (when counsel-flag (counsel-mode 1))
- (when helm-flag (helm-mode 1))
- (global-set-key [?\M-x] orig-binding)))))
+ (kbd-key:key-series-to-events key-series))
+ (kbd-key:key-series-to-events
+ (format "M-: SPC (kbd-key:maybe-enable-helm SPC %s SPC #'%S) RET"
+ helm-flag orig-binding))))))
+
+(defun kbd-key:maybe-enable-helm (helm-flag orig-M-x-binding)
+ "Enable helm-mode if HELM-FLAG is non-nil. Restore M-x binding to
ORIG-M-X-BINDING."
+ (when helm-flag (helm-mode 1))
+ (global-set-key [?\M-x] orig-M-x-binding))
(defun kbd-key:key-series-to-events (key-series)
- "Insert the key-series as a series of keyboard events into Emacs' unread
input stream."
+ "Insert the key-series as a series of keyboard events into Emacs' unread
input stream.
+Emacs then executes them when its command-loop regains control."
(setq unread-command-events (nconc unread-command-events
(listify-key-sequence
- (kbd-key:kbd
- key-series)))))
+ (kbd-key:kbd key-series)))))
(defun kbd-key:doc (key-series &optional full)
"Show first line of doc for binding of keyboard KEY-SERIES in minibuffer.
diff --git a/hsys-org.el b/hsys-org.el
index 3094cb7..89ae575 100644
--- a/hsys-org.el
+++ b/hsys-org.el
@@ -4,7 +4,7 @@
;;
;; Orig-Date: 2-Jul-16 at 14:54:14
;;
-;; Copyright (C) 2016-2019 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2020 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
@@ -15,11 +15,11 @@
;; triggered when the major mode is org-mode or is derived from
;; org-mode and point is anywhere other than at the end of a line.
;;
-;; When:
-;; on an Org mode link - displays the link referent
-;; on an Org mode heading - cycles through the available display
-;; views for that heading
-;; anywhere else - executes `org-meta-return'.
+;; See the doc for ibtypes::org-mode for details of what it does and
+;; its compatibility with org-mode.
+;;
+;; For a good tutorial on basic use of Org-mode, see:
+;; https://orgmode.org/worg/org-tutorials/orgtutorial_dto.html
;;; Code:
;;; ************************************************************************
- [elpa] externals/hyperbole 7eae539 05/25: (hui:ibut-label-create): Skip back past opening delimiter, (continued)
- [elpa] externals/hyperbole 7eae539 05/25: (hui:ibut-label-create): Skip back past opening delimiter, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 1cf5f3d 16/25: Allow Action Key to expand a tree when point is on the ellipsis, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 9e13b43 02/25: hui-select.el and hyperbole.el reformatting; no logic changes, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 42487cb 09/25: Temporarily disable helm-mode when executing a key series, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole f633365 17/25: Normalize committer email addresses, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 8ef773d 18/25: Add Action/Assist key support for magit modes, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 520ecae 19/25: Fix improper registering of a drag outside of Emacs when none, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 008182b 22/25: Fixes, Helm and Magit Smart Key support doc in prep. for 7.1.3, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 6f36320 08/25: Merge branch 'master' of github.com:rswgnu/hyperbole, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 97a4d80 10/25: Raise org-mode ibtype priority to near top; fix markdown # link activation, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 734c6a8 11/25: Merge branch 'master' of github.com:rswgnu/hyperbole,
Stefan Monnier <=
- [elpa] externals/hyperbole 335441d 15/25: Fix that Action Key did not expand collapsed Koutline trees, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 845119a 24/25: hib-social.el - Rename to hibtypes-git-use-magit-flag; make first ebut in file work without saving, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole d65920b 25/25: V7.1.3 - Improve key series, mouse handling and, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 3c0df00 12/25: Add support for dired-sidebar (#33), Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 21b2b1c 20/25: Use magit if available for git social button (#32), Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole b8fd1e8 23/25: Merge branch 'master' of github.com:rswgnu/hyperbole, Stefan Monnier, 2020/09/22
- [elpa] externals/hyperbole 55a73f9 21/25: Add TALK subdirectory for upcoming talk on Hyperbole, Stefan Monnier, 2020/09/22