aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2016-04-20 00:06:01 -0700
committerPaul Eggert2016-04-20 00:06:52 -0700
commit65150493f7e3f0768fccd6097c6dafc9ae18770b (patch)
tree72c2be7145ad91389b0b4942b85516c33f34885c
parent5c511ff597b4b541beb9ec4ce31cbb5363a0233e (diff)
downloademacs-65150493f7e3f0768fccd6097c6dafc9ae18770b.tar.gz
emacs-65150493f7e3f0768fccd6097c6dafc9ae18770b.zip
Fix org-timestamp-change typo
Problem reported by Peter Münster (Bug#23299). * lisp/org/org.el (org-timestamp-change): Fix typo that relied on undocumented behavior in ‘encode-time’. In practice the old code used local time, so use that.
-rw-r--r--lisp/org/org.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 3abf62704bb..b0e1e2047da 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -17459,8 +17459,7 @@ When SUPPRESS-TMP-DELAY is non-nil, suppress delays like \"--2d\"."
17459 (+ (if (eq org-ts-what 'hour) n 0) (nth 2 time0)) 17459 (+ (if (eq org-ts-what 'hour) n 0) (nth 2 time0))
17460 (+ (if (eq org-ts-what 'day) n 0) (nth 3 time0)) 17460 (+ (if (eq org-ts-what 'day) n 0) (nth 3 time0))
17461 (+ (if (eq org-ts-what 'month) n 0) (nth 4 time0)) 17461 (+ (if (eq org-ts-what 'month) n 0) (nth 4 time0))
17462 (+ (if (eq org-ts-what 'year) n 0) (nth 5 time0)) 17462 (+ (if (eq org-ts-what 'year) n 0) (nth 5 time0))))
17463 (nthcdr 6 time0)))
17464 (when (and (member org-ts-what '(hour minute)) 17463 (when (and (member org-ts-what '(hour minute))
17465 extra 17464 extra
17466 (string-match "-\\([012][0-9]\\):\\([0-5][0-9]\\)" extra)) 17465 (string-match "-\\([012][0-9]\\):\\([0-5][0-9]\\)" extra))