From: Paul Eggert <eggert@penguin.cs.ucla.edu>
Date: Wed, 20 Apr 2016 07:06:01 +0000 (-0700)
Subject: Fix org-timestamp-change typo
X-Git-Tag: emacs-26.0.90~2196
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65150493f7e3f0768fccd6097c6dafc9ae18770b;p=emacs.git

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.
---

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\"."
 			 (+ (if (eq org-ts-what 'hour) n 0)   (nth 2 time0))
 			 (+ (if (eq org-ts-what 'day) n 0)    (nth 3 time0))
 			 (+ (if (eq org-ts-what 'month) n 0)  (nth 4 time0))
-			 (+ (if (eq org-ts-what 'year) n 0)   (nth 5 time0))
-			 (nthcdr 6 time0)))
+			 (+ (if (eq org-ts-what 'year) n 0)   (nth 5 time0))))
       (when (and (member org-ts-what '(hour minute))
 		 extra
 		 (string-match "-\\([012][0-9]\\):\\([0-5][0-9]\\)" extra))