[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole 17724ef 02/13: fixup! Fixed a few bugs
From: |
Stefan Monnier |
Subject: |
[elpa] externals/hyperbole 17724ef 02/13: fixup! Fixed a few bugs |
Date: |
Sun, 12 May 2019 11:11:46 -0400 (EDT) |
branch: externals/hyperbole
commit 17724eff30c08f287e9884fccb72533d179f065d
Author: Bob Weiner <address@hidden>
Commit: Bob Weiner <address@hidden>
fixup! Fixed a few bugs
---
Changes | 7 ++++++-
hibtypes.el | 10 ++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Changes b/Changes
index 5e557de..42983b1 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,8 @@
+2019-02-06 Bob Weiner <address@hidden>
+
+* hibtypes.el (ripgrep-msg): Tighted match to ignore empty potential filenames
+ that matched when they expanded to the current directory.
+
2019-02-05 Bob Weiner <address@hidden>
* hmouse-tag.el (smart-lisp-mode-p): Removed change-log-mode.
@@ -41,7 +46,7 @@
* hui-treemacs.el (treemacs-version): Require v2 or higher.
-* hsettings.el (hyperbole-default-web-search-term-max-lines):
+* hsettings.el (hyperbole-default-web-search-term-max-lines):
(hyperbole-default-web-search-term): Added.
* hpath.el (hpath:tramp-file-name-regexp): Added and used in hpath:remote-at-p.
diff --git a/hibtypes.el b/hibtypes.el
index 37a8107..56a53a0 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -657,12 +657,14 @@ buffer)."
(beginning-of-line)
(when (looking-at "\\([1-9][0-9]*\\)[-:]")
;; Ripgrep matches and context lines (-A<num> option)
- (let ((line-num (match-string-no-properties 1)))
+ (let ((line-num (match-string-no-properties 1))
+ file)
(while (and (= (forward-line -1) 0)
(looking-at "[1-9][0-9]*[-:]\\|--$")))
- (unless (looking-at "[1-9][0-9]*[-:]\\|--$")
- (let* ((file (buffer-substring-no-properties (point-at-bol)
(point-at-eol)))
- (but-label (concat file ":" line-num))
+ (unless (or (looking-at "[1-9][0-9]*[-:]\\|--$")
+ (and (setq file (buffer-substring-no-properties
(point-at-bol) (point-at-eol)))
+ (string-empty-p (string-trim file))))
+ (let* ((but-label (concat file ":" line-num))
(source-loc (if (file-name-absolute-p file) nil
(hbut:key-src t))))
(if (stringp source-loc)
- [elpa] externals/hyperbole updated (f5f5244 -> cc77f02), Stefan Monnier, 2019/05/12
- [elpa] externals/hyperbole da93767 04/13: Add 4x3 Window Grid screenshot showing large in-buffer window ids, Stefan Monnier, 2019/05/12
- [elpa] externals/hyperbole 343b2ca 08/13: Set face to default removes empty line in banner image, Stefan Monnier, 2019/05/12
- [elpa] externals/hyperbole 997803d 12/13: V7.0.3 Release, Stefan Monnier, 2019/05/12
- [elpa] externals/hyperbole 17724ef 02/13: fixup! Fixed a few bugs,
Stefan Monnier <=
- [elpa] externals/hyperbole 284a067 06/13: Merge pull request #7 from matsl/cherry-pick-elpa-changes, Stefan Monnier, 2019/05/12
- [elpa] externals/hyperbole 159082b 09/13: Use diary-view-entries, Stefan Monnier, 2019/05/12
- [elpa] externals/hyperbole 5140f17 01/13: Fixed a few bugs, Stefan Monnier, 2019/05/12
- [elpa] externals/hyperbole 9755e7e 11/13: Small fixes from Mats, Stefan Monnier, 2019/05/12
- [elpa] externals/hyperbole d5de7e3 05/13: Fix compilation: don't burp if hui-window is loaded before hui-mouse, Stefan Monnier, 2019/05/12
- [elpa] externals/hyperbole 414ef94 03/13: Update for treemacs compatibility; {M-o i} push button fixes, Stefan Monnier, 2019/05/12
- [elpa] externals/hyperbole 042842d 10/13: Small fixes and doc updates in preparation for next release, Stefan Monnier, 2019/05/12
- [elpa] externals/hyperbole fdce47a 07/13: Add Gitlab to DEMO; MSWindows path handling; company-mode Smart Keys, Stefan Monnier, 2019/05/12
- [elpa] externals/hyperbole cc77f02 13/13: Merge remote-tracking branch 'hyperbole/master' into externals/hyperbole, Stefan Monnier, 2019/05/12