branch: elpa/logview commit ac3ebed2046ace4d125aa6aaa8a0d9e8524da9b2 Merge: c67298a215 5cd1d37757 Author: Paul Pogonyshev <pogonys...@gmail.com> Commit: GitHub <nore...@github.com>
Merge pull request #37 from wiltshi/master Fix logview-go-to-difference-base-entry for submodes with no threads --- logview.el | 3 ++- test/logview.el | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/logview.el b/logview.el index f3484f99e0..355b9b33c7 100644 --- a/logview.el +++ b/logview.el @@ -1935,7 +1935,8 @@ it stays in effect for other threads." (logview--assert 'timestamp) (logview--std-temporarily-widening (logview--locate-current-entry entry start - (let* ((thread (logview--entry-group entry start logview--thread-group)) + (let* ((thread (when (memq 'thread logview--submode-features) + (logview--entry-group entry start logview--thread-group))) (difference-base (or (when logview--timestamp-difference-per-thread-bases (gethash thread logview--timestamp-difference-per-thread-bases)) logview--timestamp-difference-base))) diff --git a/test/logview.el b/test/logview.el index c8b064e3b0..12f4c61661 100644 --- a/test/logview.el +++ b/test/logview.el @@ -104,6 +104,14 @@ (logview--locate-current-entry entry start (should (and entry (equal start 1)))))) +(ert-deftest logview-test-go-to-difference-base-entry-no-thread () + (logview--test-with-file "custom/1.log" ((logview-additional-submodes + '(("custom" (format . "TIMESTAMP LEVEL [NAME] ") (levels . "SLF4J"))))) + (logview-difference-to-current-entry) + (logview-go-to-difference-base-entry))) + + + ;; RFC 5424 levels. ;; ;; The mock log file should have a list of log messages in the default