What on earth had a I wrote :-)

bastibe · Feb 18, 2024 · f7ef0cb · f7ef0cb
1 parent 9dca91d
commit f7ef0cb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ clean:
 	git clean -Xf
 
 compile:
-	$(BATCH) -f batch-byte-compile tests/org-journal-test.el org-journal.el
+	$(BATCH) -f batch-byte-compile org-journal.el
 
 gen-autoloads:
 	$(BATCH) \

diff --git a/org-journal.el b/org-journal.el
@@ -1449,6 +1449,7 @@ is nil or avoid switching when NOSELECT is non-nil."
                      (setq point (org-journal--search-forward-created
                                   (list (nth 4 time) (nth 3 time) (nth 5 time))
                                   nil t))))))
+
         (progn
           ;; Use `find-file-noselect' instead of `view-file' as it does not respect `auto-mode-alist'
           (with-current-buffer buf

diff --git a/tests/org-journal-test.el b/tests/org-journal-test.el
@@ -197,7 +197,9 @@
   "Org journal delete empty journal test"
   (org-journal-test-macro
       (let ((buffer "20181231")
-            (org-journal-carryover-delete-empty-journal 'always))
+            (org-journal-carryover-delete-empty-journal 'always)
+            (inhibit-message t))
+
         ;; Test that journal file gets dumped, after carryover
         (with-temp-buffer
           (org-journal-mode)
@@ -226,12 +228,8 @@
         (org-journal-new-entry nil)
         (save-buffer)
         (kill-buffer)
-        (let ((message-marker nil))
-          (cl-letf (((symbol-function 'message)
-                     #'(lambda (x &rest _y) (setq message-marker x))))
-            (org-journal-read-or-display-entry (encode-time 0 0 0 2 1 2019) 'noselect)
-            (should (equal "No journal entry for this date." message-marker))
-            )))))
+        (should (equal "No journal entry for this date."
+                       (org-journal-read-or-display-entry (encode-time 0 0 0 2 1 2019) 'noselect))))))
 
 (ert-deftest org-journal-search-build-file-list-test ()
   "Test for `org-journal--search-build-file-list'."
@@ -325,6 +323,7 @@
   (org-journal-test-macro
    (let ((org-journal-file-type 'weekly)
          (org-journal-start-on-weekday 7) ;; sunday
+         (org-indent-mode nil)
          org-journal-encrypt-journal
          org-journal-enable-encryption
          org-journal-enable-cache