emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/hyperbole 845119a 24/25: hib-social.el - Rename to hibt


From: Stefan Monnier
Subject: [elpa] externals/hyperbole 845119a 24/25: hib-social.el - Rename to hibtypes-git-use-magit-flag; make first ebut in file work without saving
Date: Tue, 22 Sep 2020 10:29:30 -0400 (EDT)

branch: externals/hyperbole
commit 845119a62b1aa54569263add36b8ea92f398a5bf
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    hib-social.el - Rename to hibtypes-git-use-magit-flag; make first ebut in 
file work without saving
---
 Changes          | 14 +++++++++-----
 HY-NEWS          |  8 ++++++++
 TALK/HY-TALK.org |  4 +++-
 hbdata.el        |  7 -------
 hbut.el          |  5 +++++
 hib-social.el    |  6 +++---
 6 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/Changes b/Changes
index 9c1e89a..10c2c50 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,12 @@
+2020-08-02  Bob Weiner  <rsw@gnu.org>
+
+* hbut.el (hbut:key-src-set-buffer): Fixed explicit button creation in a new
+    file that has not yet been saved.
+
+* hib-social.el (git-reference, hibtypes-git-use-magit-flag): Added this flag.
+    If Magit is available, when activating a git directory button, use Magit
+    rather than Dired.
+
 2020-08-01  Bob Weiner  <rsw@gnu.org>
 
 * hui-mini.el (hui:menu-get-keys): Cleared hui:menu-keys to prevent multiple
@@ -75,11 +84,6 @@
 
 * hyperbole.el (hkey-global-set-key): Documented.
 
-2020-07-20  Bob Weiner  <rsw@gnu.org>
-
-* hbdata.el (hbdata:write): Fixed so first explicit button created in a 
directory
-    works before saving its source buffer (by saving the directory .hypb file).
-
 2020-07-19  Bob Weiner  <rsw@gnu.org>
 
 * hyperbole.el (hyperb:init): Remove WSL abbrev of /mnt/c as /c since may not 
exist.
diff --git a/HY-NEWS b/HY-NEWS
index a20f8ca..0d8b16b 100644
--- a/HY-NEWS
+++ b/HY-NEWS
@@ -37,6 +37,14 @@
     - Markdown In-file Links: With point on the link title, in-file links are
       now activated properly (previously point had to be on the link itself).
 
+    - Git#directory Buttons: New flag, hibtypes-git-use-magit-flag, which if
+      set to t and Magit is available, then when activating a git directory
+      button, such as git#/hyperbole, use Magit rather than Dired.
+
+    - Explicit Buttons Work Immdiately: Previously you had to save the buffer
+      in which you created an explicit button before it would work.  Now they
+      work immediately after creation.
+
   DOCUMENTATION
 
     - Helm Mode: Added Hyperbole Manual section, "Smart Key - Helm Mode"
diff --git a/TALK/HY-TALK.org b/TALK/HY-TALK.org
index af1487d..e430cfd 100644
--- a/TALK/HY-TALK.org
+++ b/TALK/HY-TALK.org
@@ -1,4 +1,6 @@
-* [[file:hyperbole-banner.png]]
+* [[file:../hyperbole-banner.png]]
+
+                            GNU Hyperbole
 
                        Make Your Text Come Alive
 
diff --git a/hbdata.el b/hbdata.el
index a2d4481..511c1b1 100644
--- a/hbdata.el
+++ b/hbdata.el
@@ -425,15 +425,8 @@ On failure, return nil."
       (setq entry (car cons) lbl-instance (cdr cons))
       (prin1 entry (current-buffer))
       (terpri (current-buffer))
-      (when buffer-file-name (not (file-exists-p buffer-file-name))
-       ;; This is the first explicit button created in this
-       ;; directory, so .hypb does not yet exist and unless it is saved
-       ;; here, the first explicit button won't work until its source
-       ;; buffer is saved.
-       (save-buffer))
       (or lbl-instance t))))
 
-
 ;;; ************************************************************************
 ;;; Private variables
 ;;; ************************************************************************
diff --git a/hbut.el b/hbut.el
index 4a5fab6..7907827 100644
--- a/hbut.el
+++ b/hbut.el
@@ -995,6 +995,11 @@ represent the output of particular document formatters."
         src)
        ((file-readable-p (setq src (hpath:symlink-referent src)))
         (set-buffer (find-file-noselect src))
+        src)
+       ;; Buffer may be newly created with an attached file that has
+       ;; not yet been saved, so it can't be read.
+       ((get-file-buffer src)
+        (set-buffer (get-file-buffer src))
         src)))
 
 (defun    hbut:key-to-label (lbl-key)
diff --git a/hib-social.el b/hib-social.el
index 6760b1e..f3fca08 100644
--- a/hib-social.el
+++ b/hib-social.el
@@ -198,8 +198,8 @@
   :type 'string
   :group 'hyperbole-button)
 
-(defcustom hibtypes-git-use-magit-status nil
-  "If magit is available then use git social button to display magit status 
buffer."
+(defcustom hibtypes-git-use-magit-flag nil
+  "If magit is available, when activating a git directory button, use Magit 
rather than Dired."
   :type 'boolean
   :group 'hyperbole-button)
 
@@ -808,7 +808,7 @@ PROJECT value is provided, it defaults to the value of
                                  (princ (format "Command: %s\n\n" cmd))
                                  (princ (shell-command-to-string cmd)))))
                          ;; Project-only reference, run dired on the project 
home directory
-                         (if (and hibtypes-git-use-magit-status (featurep 
'magit))
+                         (if (and hibtypes-git-use-magit-flag (fboundp 
#'magit-status-setup-buffer))
                              (hpath:display-buffer (save-window-excursion
                                                      (magit-status-setup-buffer
                                                       (file-name-as-directory 
project-dir))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]