From: Marcin Borkowski <mbork@mbork.pl>
To: Org-Mode mailing list <emacs-orgmode@gnu.org>
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 [thread overview]
Message-ID: <8760uy1coc.fsf@mbork.pl> (raw)
In-Reply-To: 57172B93.2040402@cs.ucla.edu
[-- 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
next prev parent reply other threads:[~2016-05-01 7:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[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 ` Marcin Borkowski [this message]
2016-05-01 7:56 ` Fwd: " Nicolas Goaziou
2016-05-01 9:06 ` Marcin Borkowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8760uy1coc.fsf@mbork.pl \
--to=mbork@mbork.pl \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).