From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcin Borkowski Subject: Fwd: bug#23299: 25.1.50; org-timestamp-change: Invalid time zone specification: (nil nil nil) Date: Sun, 01 May 2016 09:04:51 +0200 Message-ID: <8760uy1coc.fsf@mbork.pl> References: <5715cebb.58811c0a.26051.3c6b@mx.google.com> <57172B93.2040402@cs.ucla.edu> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awlRT-0002xu-5P for emacs-orgmode@gnu.org; Sun, 01 May 2016 03:05:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1awlRH-0007N4-4Q for emacs-orgmode@gnu.org; Sun, 01 May 2016 03:05:17 -0400 Received: from mail.mojserwer.eu ([2a01:5e00:2:52::8]:40358) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awlRG-0007H6-TG for emacs-orgmode@gnu.org; Sun, 01 May 2016 03:05:11 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.mojserwer.eu (Postfix) with ESMTP id DC7D2B21F4A for ; Sun, 1 May 2016 09:04:57 +0200 (CEST) Received: from mail.mojserwer.eu ([127.0.0.1]) by localhost (mail.mojserwer.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c7u8RohCsPiJ for ; Sun, 1 May 2016 09:04:55 +0200 (CEST) Received: from localhost (98-171.echostar.pl [213.156.98.171]) by mail.mojserwer.eu (Postfix) with ESMTPSA id D3A06B21F46 for ; Sun, 1 May 2016 09:04:54 +0200 (CEST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: Org-Mode mailing list --=-=-= Content-Type: text/plain 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 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 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename=0001-Fix-org-timestamp-change-typo.txt Content-Transfer-Encoding: quoted-printable >From 313ebbbb98ceb078468498998305749b2790b7ba Mon Sep 17 00:00:00 2001 From: Paul Eggert 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=3DUTF-8 Content-Transfer-Encoding: 8bit Problem reported by Peter M=C3=BCnster (Bug#23299). * lisp/org/org.el (org-timestamp-change): Fix typo that relied on undocumented behavior in =E2=80=98encode-time=E2=80=99. In practice t= he 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)) --=20 2.5.5 --=-=-=--