summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2021-02-21 01:19:08 -0500
committerKyle Meyer <kyle@kyleam.com>2021-02-21 01:19:08 -0500
commitd21d200bc0611615624a5624c2e19285545d8e48 (patch)
treec7c4d922a6dc5826fc187a865f39a9b00b2a9025
parenta1cdbbfc85981db68984198a81f18a96dcb47a1a (diff)
parent3a522ad5393d464f088729c0b9ca8711473e401f (diff)
downloadorg-mode-d21d200bc0611615624a5624c2e19285545d8e48.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el12
-rw-r--r--testing/lisp/test-org-agenda.el12
2 files changed, 18 insertions, 6 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 9b2009f..aef6420 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -8238,13 +8238,13 @@ Negative selection means regexp must not match for selection of an entry."
(defun org-add-to-string (var string)
(set var (concat (symbol-value var) string)))
-(defun org-agenda-goto-date (span)
+(defun org-agenda-goto-date (date)
"Jump to DATE in agenda."
- (interactive "P")
- (let* ((org-read-date-prefer-future
- (eval org-agenda-jump-prefer-future))
- (date (org-read-date))
- (day (time-to-days (org-time-string-to-time date)))
+ (interactive
+ (list
+ (let ((org-read-date-prefer-future org-agenda-jump-prefer-future))
+ (org-read-date))))
+ (let* ((day (time-to-days (org-time-string-to-time date)))
(org-agenda-sticky-orig org-agenda-sticky)
(org-agenda-buffer-tmp-name (buffer-name))
(args (get-text-property (min (1- (point-max)) (point)) 'org-last-args))
diff --git a/testing/lisp/test-org-agenda.el b/testing/lisp/test-org-agenda.el
index 7c1bfb2..e1c64d8 100644
--- a/testing/lisp/test-org-agenda.el
+++ b/testing/lisp/test-org-agenda.el
@@ -141,6 +141,18 @@
(org-toggle-sticky-agenda)
(org-test-agenda--kill-all-agendas))
+(ert-deftest test-org-agenda/goto-date ()
+ "Test `org-agenda-goto-date'."
+ (unwind-protect
+ (should
+ (equal
+ (time-to-days (org-time-string-to-time "2019-12-30"))
+ (let ((org-agenda-files nil))
+ (org-agenda-list nil nil 'day)
+ (org-agenda-goto-date "2019-12-30")
+ (get-text-property (point) 'day))))
+ (org-test-agenda--kill-all-agendas)))
+
;; agenda redo