[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole feb6fb1a75 43/47: Merge pull request #350 fro
From: |
ELPA Syncer |
Subject: |
[elpa] externals/hyperbole feb6fb1a75 43/47: Merge pull request #350 from rswgnu/rsw |
Date: |
Sun, 25 Jun 2023 15:58:39 -0400 (EDT) |
branch: externals/hyperbole
commit feb6fb1a756625781857750234d9f208add85512
Merge: 7bd5a86a4c 5bbc6da4e0
Author: Robert Weiner <rsw@gnu.org>
Commit: GitHub <noreply@github.com>
Merge pull request #350 from rswgnu/rsw
Fix annot-bib ibtype and actype; was not checking for [] delimiters
---
ChangeLog | 8 ++++++++
hactypes.el | 14 ++++++++++----
hibtypes.el | 14 +++++++++-----
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 69b41f4e3a..1d83422d87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2023-06-25 Bob Weiner <rsw@gnu.org>
+* hibtypes.el (annot-bib): Fix missing check that annot-bib is between square
+ brackets.
+ hactypes.el (annot-bib): Beep/fail if when search for citation, point ends up
+ within the ibut reference rather than the citation itself.
+
+* hibtypes.el (org-link-outside-org-mode): Revert to pre-Stefan changes since
not
+ yet integrating variable check instead of 'hyperb:stack-frame' calls.
+
* hactypes.el (rfc-toc): Fix wrong 'select-buffer' call by replacing with
'switch-to-buffer' for permanent return to original buffer.
diff --git a/hactypes.el b/hactypes.el
index e5d6465a20..bf7744d347 100644
--- a/hactypes.el
+++ b/hactypes.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 23-Sep-91 at 20:34:36
-;; Last-Mod: 25-Jun-23 at 09:38:34 by Bob Weiner
+;; Last-Mod: 25-Jun-23 at 13:48:01 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -36,9 +36,15 @@
"Follow internal ref KEY within an annotated bibliography, delimiters=[]."
(interactive "sReference key (no []): ")
(let* ((key-regexp (concat "^[*]*[ \t]*\\[" (ebut:key-to-label key) "\\]"))
- (citation (save-excursion
- (goto-char (point-max))
- (re-search-backward key-regexp nil t))))
+ (lbl-start (hattr:get 'hbut:current 'lbl-start))
+ (lbl-end (hattr:get 'hbut:current 'lbl-end))
+ (citation (when (and lbl-start lbl-end)
+ (save-excursion
+ (goto-char (point-max))
+ (and (re-search-backward key-regexp nil t)
+ (or (< (point) (1- lbl-start))
+ (> (point) (1+ lbl-end)))
+ (point))))))
(if citation
(progn (hpath:display-buffer (current-buffer))
(goto-char citation)
diff --git a/hibtypes.el b/hibtypes.el
index 7f581d1ddf..a7136ad5db 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 19-Sep-91 at 20:45:31
-;; Last-Mod: 21-Jun-23 at 23:33:28 by Bob Weiner
+;; Last-Mod: 25-Jun-23 at 13:27:34 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -368,12 +368,11 @@ handle any links they recognize first."
(not (funcall hsys-org-mode-function))
;; Prevent infinite recursion, e.g. if called via
;; `org-metareturn-hook' from `org-meta-return' invocation.
- (not hibtypes--within-org-link-outside-org-mode))
+ (not (hyperb:stack-frame '(ibtypes::debugger-source
org-meta-return))))
(require 'hsys-org)
(declare-function hsys-org-link-at-p "hsys-org" ())
(declare-function hsys-org-set-ibut-label "hsys-org" (start-end))
- (let* ((hibtypes--within-org-link-outside-org-mode t)
- (start-end (hsys-org-link-at-p)))
+ (let ((start-end (hsys-org-link-at-p)))
(when start-end
(hsys-org-set-ibut-label start-end)
(hact #'org-open-at-point-global)))))
@@ -394,9 +393,14 @@ must have an attached file."
(not (or (eq chr ?\ ) (eq chr ?*))))
(not (or (derived-mode-p 'prog-mode)
(apply #'derived-mode-p '(c-mode objc-mode c++-mode java-mode
markdown-mode org-mode))))
- (let ((ref (hattr:get 'hbut:current 'lbl-key)))
+ (let ((ref (hattr:get 'hbut:current 'lbl-key))
+ (lbl-start (hattr:get 'hbut:current 'lbl-start)))
(and ref (eq ?w (char-syntax (aref ref 0)))
(not (string-match "[#@]" ref))
+ lbl-start
+ (save-excursion
+ (goto-char lbl-start)
+ (ibut:label-p t "[" "]" t))
(hact 'annot-bib ref)))))
;;; ========================================================================
- [elpa] externals/hyperbole 4f2794d730 18/47: * hversion.el: Add FIXMEs., (continued)
- [elpa] externals/hyperbole 4f2794d730 18/47: * hversion.el: Add FIXMEs., ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 3a98d1b4e8 08/47: (kview:char-visible-p): Delete function, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 11411b78f3 28/47: Insert missing Changelog item, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 9752451675 25/47: Keep lisp-indent-function, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 9f4f3c82d7 29/47: Remove FIXME comments, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 3d67247f58 30/47: Remove odd code duplication, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 0872ab55c0 36/47: Merge branch 'stefan-scratch-hyperbole-20230621-without-questions-no-fixme' into rsw_stefan-scratch-hyperbole-20230621-without-questions-no-fixme, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole cbb15c43fe 38/47: Merge pull request #347 from rswgnu/stefan-scratch-hyperbole-20230621-without-questions-no-fixme, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole ac036b5f29 41/47: Merge branch 'master' into insert_missing_changelog_entry, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 5bbc6da4e0 42/47: Fix annot-bib ibtype and actype; was not checking for [] delimiters, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole feb6fb1a75 43/47: Merge pull request #350 from rswgnu/rsw,
ELPA Syncer <=
- [elpa] externals/hyperbole 66c9368c93 46/47: Merge branch 'master' into verify-expected-url-was-called, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 32f0d10126 47/47: Merge pull request #344 from rswgnu/verify-expected-url-was-called, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 9b067ab55f 16/47: * hyrolo.el: A few cosmetic tweaks, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 5cd4136599 06/47: Get rid of `hyperb:stack-frame`, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 575b8b321b 15/47: Fix a few minor miscompilations and warnings, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 84a0209c59 02/47: hui:ebut-link-directly, hui:ibut-link-directly now work from kbd, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 6e73c42284 07/47: Fix compilation of test file, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 32eca132c9 09/47: * hact.el: Fix broken lexical-binding cookie, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 96791538ce 22/47: Revert FIXME, keep for now because of issues with web modes, ELPA Syncer, 2023/06/25
- [elpa] externals/hyperbole 5d5914c197 12/47: * hycontrol.el (hycontrol-windows-mode-map): Don't autoload, ELPA Syncer, 2023/06/25