[elpa] master 7142d2f 3/3: Merge commit '1f8935e117918fab8c6ad700b627a67ac4a4f10c'

[Ian Dunn]

branch: master
commit 7142d2f0c117c9fc38bd792021ea5d1289b079fc
Merge: bd64a1d 1f8935e
Author: Ian Dunn <du...@gnu.org>
Commit: Ian Dunn <du...@gnu.org>

    Merge commit '1f8935e117918fab8c6ad700b627a67ac4a4f10c'
---
 packages/org-edna/org-edna.el | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/org-edna/org-edna.el b/packages/org-edna/org-edna.el
index d460543..f14bcc7 100644
--- a/packages/org-edna/org-edna.el
+++ b/packages/org-edna/org-edna.el
@@ -7,7 +7,7 @@
 ;; Keywords: convenience, text, org
 ;; URL: https://savannah.nongnu.org/projects/org-edna-el/
 ;; Package-Requires: ((emacs "25.1") (seq "2.19") (org "9.0.5"))
-;; Version: 1.0beta1
+;; Version: 1.0beta2
 
 ;; This file is part of GNU Emacs.
 
@@ -242,7 +242,7 @@ is changing from a TODO state to a DONE state, run BODY."
           ;; And only from a TODO state to a DONE state
           (member from (cons 'todo org-not-done-keywords))
           (member to (cons 'done org-done-keywords)))
-         (condition-case err
+         (condition-case-unless-debug err
              ,@body
            (error
             (if (eq (car err) 'invalid-read-syntax)
@@ -1195,6 +1195,9 @@ forward) or the last day of MONTH (backward)."
       (pcase-let* ((`(,n ,what-string ,def) (org-edna--read-date-get-relative 
arg this-time current))
                    (ts (if def current-ts this-ts))
                    (what (cdr (assoc-string what-string type-map))))
+        ;; Ensure that the source timestamp exists
+        (unless ts
+          (error "Tried to increment a non-existent timestamp"))
         (org--deadline-or-schedule nil type (org-edna--mod-timestamp ts n 
what))))
      (t
       ;; For everything else, assume `org-read-date-analyze' can handle it
@@ -1203,7 +1206,8 @@ forward) or the last day of MONTH (backward)."
       ;; use if that time component isn't specified.  Since there's no way to
       ;; tell if a time was specified, tell `org-read-date-analyze' to use nil
       ;; if no time is found.
-      (let* ((parsed-time (org-read-date-analyze arg this-time '(nil nil nil 
nil nil nil)))
+      (let* ((case-fold-search t)
+             (parsed-time (org-read-date-analyze arg this-time '(nil nil nil 
nil nil nil)))
              (have-time (nth 2 parsed-time))
              (final-time (apply 'encode-time (mapcar (lambda (e) (or e 0)) 
parsed-time)))
              (new-ts (format-time-string (if have-time "%F %R" "%F") 
final-time)))