emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* bug#23299: 25.1.50; org-timestamp-change: Invalid time zone specification: (nil nil nil)
       [not found] <5715cebb.58811c0a.26051.3c6b@mx.google.com>
@ 2016-04-20  7:11 ` Paul Eggert
  2016-05-01  7:04   ` Fwd: " Marcin Borkowski
  0 siblings, 1 reply; 4+ messages in thread
From: Paul Eggert @ 2016-04-20  7:11 UTC (permalink / raw)
  To: Peter Münster; +Cc: 23299-done, Cédric Chépied

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

Thanks for reporting the problem. As Eli suggested, it was a typo in org.el that 
was exposed by recent changes to encode-time. I installed into master the 
attached patch, which I think fixes the bug.

[-- Attachment #2: 0001-Fix-org-timestamp-change-typo.txt --]
[-- Type: text/plain, Size: 1201 bytes --]

From 313ebbbb98ceb078468498998305749b2790b7ba Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@penguin.cs.ucla.edu>
Date: Wed, 20 Apr 2016 00:06:01 -0700
Subject: [PATCH] Fix org-timestamp-change typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 lisp/org/org.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lisp/org/org.el b/lisp/org/org.el
index 3abf627..b0e1e20 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -17459,8 +17459,7 @@ org-timestamp-change
 			 (+ (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))
-- 
2.5.5


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Fwd:  bug#23299: 25.1.50; org-timestamp-change: Invalid time zone specification: (nil nil nil)
  2016-04-20  7:11 ` bug#23299: 25.1.50; org-timestamp-change: Invalid time zone specification: (nil nil nil) Paul Eggert
@ 2016-05-01  7:04   ` Marcin Borkowski
  2016-05-01  7:56     ` Nicolas Goaziou
  0 siblings, 1 reply; 4+ messages in thread
From: Marcin Borkowski @ 2016-05-01  7:04 UTC (permalink / raw)
  To: Org-Mode mailing list

[-- Attachment #1: Type: text/plain, Size: 571 bytes --]

Hi,

it seems that this is not yet applied to master (or am I mistaken?).
If I'm correct, could someone apply this patch in the Org-mode
repository?

On 2016-04-20, at 09:11, Paul Eggert <eggert@cs.ucla.edu> wrote:

> Thanks for reporting the problem. As Eli suggested, it was a typo in org.el that 
> was exposed by recent changes to encode-time. I installed into master the 
> attached patch, which I think fixes the bug.

Best,

-- 
Marcin Borkowski
http://octd.wmi.amu.edu.pl/en/Marcin_Borkowski
Faculty of Mathematics and Computer Science
Adam Mickiewicz University

[-- Attachment #2: 0001-Fix-org-timestamp-change-typo.txt --]
[-- Type: text/plain, Size: 1234 bytes --]

From 313ebbbb98ceb078468498998305749b2790b7ba Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@penguin.cs.ucla.edu>
Date: Wed, 20 Apr 2016 00:06:01 -0700
Subject: [PATCH] Fix org-timestamp-change typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 lisp/org/org.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lisp/org/org.el b/lisp/org/org.el
index 3abf627..b0e1e20 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -17459,8 +17459,7 @@ org-timestamp-change
 			 (+ (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))
-- 
2.5.5


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: Fwd:  bug#23299: 25.1.50; org-timestamp-change: Invalid time zone specification: (nil nil nil)
  2016-05-01  7:04   ` Fwd: " Marcin Borkowski
@ 2016-05-01  7:56     ` Nicolas Goaziou
  2016-05-01  9:06       ` Marcin Borkowski
  0 siblings, 1 reply; 4+ messages in thread
From: Nicolas Goaziou @ 2016-05-01  7:56 UTC (permalink / raw)
  To: Marcin Borkowski; +Cc: Org-Mode mailing list

Hello,

Marcin Borkowski <mbork@mbork.pl> writes:

> it seems that this is not yet applied to master (or am I mistaken?).
> If I'm correct, could someone apply this patch in the Org-mode
> repository?

Isn't e0acd8a15a40cb15bd5c5c26c5a345900762c2f1 equivalent?

Regards,

-- 
Nicolas Goaziou

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Fwd:  bug#23299: 25.1.50; org-timestamp-change: Invalid time zone specification: (nil nil nil)
  2016-05-01  7:56     ` Nicolas Goaziou
@ 2016-05-01  9:06       ` Marcin Borkowski
  0 siblings, 0 replies; 4+ messages in thread
From: Marcin Borkowski @ 2016-05-01  9:06 UTC (permalink / raw)
  To: Nicolas Goaziou; +Cc: Org-Mode mailing list


On 2016-05-01, at 09:56, Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:

> Hello,
>
> Marcin Borkowski <mbork@mbork.pl> writes:
>
>> it seems that this is not yet applied to master (or am I mistaken?).
>> If I'm correct, could someone apply this patch in the Org-mode
>> repository?
>
> Isn't e0acd8a15a40cb15bd5c5c26c5a345900762c2f1 equivalent?

True - sorry for the noise (I downloaded fresh Org, but forgot to `make'
- stupid me...)

> Regards,

Best,

-- 
Marcin Borkowski
http://octd.wmi.amu.edu.pl/en/Marcin_Borkowski
Faculty of Mathematics and Computer Science
Adam Mickiewicz University

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-05-01  9:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <5715cebb.58811c0a.26051.3c6b@mx.google.com>
2016-04-20  7:11 ` bug#23299: 25.1.50; org-timestamp-change: Invalid time zone specification: (nil nil nil) Paul Eggert
2016-05-01  7:04   ` Fwd: " Marcin Borkowski
2016-05-01  7:56     ` Nicolas Goaziou
2016-05-01  9:06       ` Marcin Borkowski

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).