[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole 6434f56c0e 21/28: hui:link-possible-types - F
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/hyperbole 6434f56c0e 21/28: hui:link-possible-types - Fix CI/CD build error |
|
Date: |
Tue, 21 Nov 2023 12:58:18 -0500 (EST) |
branch: externals/hyperbole
commit 6434f56c0e88897765e77e86a2bee5944383e06a
Author: bw <rsw@gnu.org>
Commit: bw <rsw@gnu.org>
hui:link-possible-types - Fix CI/CD build error
Also, remove debugging 'message' call.
hui--ibut-link-directly-to-dired - Handle non-readable input
such as <ilink:...>.
---
ChangeLog | 10 ++++++++++
hui.el | 7 ++++---
test/hui-tests.el | 5 +++--
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d0cfbbb115..1f1db7fe62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-11-06 Bob Weiner <rsw@gnu.org>
+
+* hui.el (hui:link-possible-types): Fix CI/CD build error where
+ ilink was inserted when pathname was expected due to batch
+ diff when referent is in dired-mode. Fix to skip button type
+ clauses it this case.
+ test/hui-tests.el (hui--ibut-link-directly-to-dired): Check that
+ looking at a string before trying to (read (current-buffer));
+ otherwise, 'read' will fail.
+
2023-11-05 Bob Weiner <rsw@gnu.org>
* test/hyrolo-tests.el (hyrolo-demo-show-overview): Fix by adding
diff --git a/hui.el b/hui.el
index 6b2db81887..b3c6de3316 100644
--- a/hui.el
+++ b/hui.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 19-Sep-91 at 21:42:03
-;; Last-Mod: 6-Nov-23 at 19:16:42 by Bob Weiner
+;; Last-Mod: 6-Nov-23 at 19:36:33 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -1852,7 +1852,8 @@ Buffer without File link-to-buffer-tmp"
;; Next clause forces use of any ibut name in the
link
;; and sets hbut:current button attributes.
- (t (cond ((and (prog1 (setq hbut-sym (hbut:at-p))
+ (t (cond ((and (not (derived-mode-p 'dired-mode))
+ (prog1 (setq hbut-sym (hbut:at-p))
(save-excursion
(ibut:at-to-name-p hbut-sym)))
(setq lbl-key (hattr:get hbut-sym
'lbl-key))
(eq (current-buffer)
(get-file-buffer (gbut:file))))
@@ -1861,7 +1862,7 @@ Buffer without File link-to-buffer-tmp"
(list 'link-to-ebut lbl-key))
((and hbut-sym lbl-key)
;; On an implicit button, so link to it
- (message "%S" (hattr:list hbut-sym))
+ ;; (message "%S" (hattr:list hbut-sym))
(list 'link-to-ibut lbl-key (or
buffer-file-name (buffer-name))))
((and (require 'bookmark)
(derived-mode-p
'bookmark-bmenu-mode)
diff --git a/test/hui-tests.el b/test/hui-tests.el
index ab45c752c6..7eafa8eace 100644
--- a/test/hui-tests.el
+++ b/test/hui-tests.el
@@ -3,7 +3,7 @@
;; Author: Mats Lidell <matsl@gnu.org>
;;
;; Orig-Date: 30-Jan-21 at 12:00:00
-;; Last-Mod: 5-Nov-23 at 17:16:45 by Bob Weiner
+;; Last-Mod: 6-Nov-23 at 19:39:45 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -806,7 +806,8 @@ With point on label suggest that ibut for rename."
;; Implicit link should be the `dir' dired directory,
;; possibly minus the final directory '/'.
(goto-char (point-min))
- (should (string-prefix-p (read (current-buffer)) dir)))
+ (should (and (looking-at "\"")
+ (string-prefix-p (read (current-buffer)) dir))))
(hy-delete-file-and-buffer file))))
(ert-deftest hui--ibut-link-directly-with-label ()
- [elpa] externals/hyperbole d1c803d25e 24/28: Fix hyrolo-tests.el sorting tests and hyrolo-outline-level handling, (continued)
- [elpa] externals/hyperbole d1c803d25e 24/28: Fix hyrolo-tests.el sorting tests and hyrolo-outline-level handling, ELPA Syncer, 2023/11/21
- [elpa] externals/hyperbole c371a2dae9 28/28: Merge pull request #405 from rswgnu/rsw, ELPA Syncer, 2023/11/21
- [elpa] externals/hyperbole c1d69b06bc 05/28: Remove leading blank lines inserted by viewer function, ELPA Syncer, 2023/11/21
- [elpa] externals/hyperbole cd451895ae 09/28: Fix smart-tag not finding some vars and markdown link handling, ELPA Syncer, 2023/11/21
- [elpa] externals/hyperbole 082b273f8b 11/28: hui:link-possible-types - fix to not default when on dirs or files, ELPA Syncer, 2023/11/21
- [elpa] externals/hyperbole ee170207f6 19/28: Merge remote branch 'rsw' into rsw, ELPA Syncer, 2023/11/21
- [elpa] externals/hyperbole 9418ab1112 17/28: Merge branch 'master' into rsw, ELPA Syncer, 2023/11/21
- [elpa] externals/hyperbole 69fcfc23b7 25/28: Many small fixes and doc updates prior to V9 release, ELPA Syncer, 2023/11/21
- [elpa] externals/hyperbole 2e50a83011 01/28: Fixes for direct link creation, path handling and org-id buttons, ELPA Syncer, 2023/11/21
- [elpa] externals/hyperbole 1d2f6cdf76 13/28: Klinks update to new format <file#cell-ref|viewspec>, ELPA Syncer, 2023/11/21
- [elpa] externals/hyperbole 6434f56c0e 21/28: hui:link-possible-types - Fix CI/CD build error,
ELPA Syncer <=
- [elpa] externals/hyperbole 815638155a 22/28: HyRolo - add hyrolo-file-list support for directories and wildcards, ELPA Syncer, 2023/11/21
- [elpa] externals/hyperbole 16f13e350d 27/28: Merge branch 'master' into rsw, ELPA Syncer, 2023/11/21