[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole b430d10 36/51: hpath:find: Was called with po
From: |
Stefan Monnier |
Subject: |
[elpa] externals/hyperbole b430d10 36/51: hpath:find: Was called with point in the source, not referent buffer |
Date: |
Sun, 12 Jul 2020 18:10:16 -0400 (EDT) |
branch: externals/hyperbole
commit b430d108d1ae5002ca7b5d7c71db63aa94a115ca
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>
hpath:find: Was called with point in the source, not referent buffer
---
hpath.el | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hpath.el b/hpath.el
index 4d62e6d..1f63811 100644
--- a/hpath.el
+++ b/hpath.el
@@ -920,8 +920,10 @@ buffer but don't display it."
(setq path (hpath:substitute-value path)
filename (hpath:absolute-to path default-directory))
(if noselect
- (prog1 (find-file-noselect filename)
- (if (or hash anchor) (hpath:to-markup-anchor hash anchor)))
+ (let ((buf (find-file-noselect filename)))
+ (with-current-buffer buf
+ (when (or hash anchor) (hpath:to-markup-anchor hash anchor))
+ buf))
(let ((remote-filename (hpath:remote-p path)))
(or modifier remote-filename
(file-exists-p filename)
@@ -989,7 +991,8 @@ buffer but don't display it."
(goto-char (point-min))
(if (re-search-forward (format hpath:html-anchor-id-pattern
(regexp-quote anchor)) nil t)
(progn (forward-line 0)
- (recenter 0))
+ (when (eq (current-buffer) (window-buffer))
+ (recenter 0)))
(goto-char opoint)
(error "(hpath:to-markup-anchor): %s - Anchor `%s' not
found in the visible buffer portion"
(buffer-name)
@@ -1016,7 +1019,8 @@ buffer but don't display it."
(t
hpath:outline-section-pattern))
(regexp-quote anchor-name)) nil t)
(progn (forward-line 0)
- (recenter 0))
+ (when (eq (current-buffer) (window-buffer))
+ (recenter 0)))
(goto-char opoint)
(error "(hpath:to-markup-anchor): %s - Section `%s' not
found in the visible buffer portion"
(buffer-name)
- [elpa] externals/hyperbole 9e2b4ba 08/51: hui-select.el - remove require of kotl-mode; caused cyclical loads, (continued)
- [elpa] externals/hyperbole 9e2b4ba 08/51: hui-select.el - remove require of kotl-mode; caused cyclical loads, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 8e6ea41 12/51: Fix ibut handling in programming modes; add button links to glossary, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole ad4dc9f 09/51: Makefile - add missing gzipped tar file dependency to 'ftp' target, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 0e1203c 32/51: Publish 7.1.0 test release, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole c565349 33/51: Fix entry addition which was failing due to level handling change, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole db4dd6c 13/51: Use float for delay instead of looping (#21), Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 5119a4c 17/51: hui-em-but.el: Properly highlight explicit buttons when loading, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 9a94a8f 19/51: Fix hproperty:item-highlight-color init error; add regional 'throw', Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 45fff9a 23/51: Many bug fixes and improvements, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 6e55a34 34/51: Fix ebut:get calls to send file as 3rd arg, not 2nd, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole b430d10 36/51: hpath:find: Was called with point in the source, not referent buffer,
Stefan Monnier <=
- [elpa] externals/hyperbole 3d26ccb 40/51: Fix require of 'help-mode' instead of 'help' to remedy 'make bin', Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 56e88ca 47/51: Merge branch 'master' of hyperbole, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 2f52190 44/51: Koutliner: Add support for Emacs visual-line commands, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 2253ac2 50/51: V7.1.2 release, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 7184b30 51/51: Fix ibut:delete, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 07c0664 21/51: Org-mode local binding of M-RET activates Hyperbole implicit buttons, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole f2a5c27 22/51: Fixed errors in using hyrolo-logic operators, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole ecc8f36 24/51: Smart Key live window resizing and frame dragging; auto-autoload gen, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole cb7827c 26/51: Swapping buffer improvements; handle grep lines with null separators, Stefan Monnier, 2020/07/12
- [elpa] externals/hyperbole 73fed44 28/51: Fix in-buffer text as ebut label; allow line/col in link-to-file, Stefan Monnier, 2020/07/12