* [PATCH] Fixed bug in custom timestamps for date ranges.
@ 2017-07-06 9:09 Jan Seeger
2017-07-06 12:58 ` Kaushal Modi
0 siblings, 1 reply; 4+ messages in thread
From: Jan Seeger @ 2017-07-06 9:09 UTC (permalink / raw)
To: emacs-orgmode; +Cc: Jan Seeger
Changed org-activate-dates to activate custom timestamps for both
dates in date ranges. Formerly, only the second date would be
activated. The reason was a misplaced "if". Replaced it with "when".
---
lisp/org.el | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index ab0bde1ef..f000c8f24 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6105,9 +6105,11 @@ by a #."
'keymap org-mouse-map))
(org-rear-nonsticky-at (match-end 0))
(when org-display-custom-times
- (if (match-end 3)
- (org-display-custom-time (match-beginning 3) (match-end 3))
- (org-display-custom-time (match-beginning 1) (match-end 1))))
+ ;; If it's a date range, activate custom time for second date
+ (when (match-end 3)
+ (org-display-custom-time (match-beginning 3) (match-end 3)))
+ ;; Always activate custom time for first matched date
+ (org-display-custom-time (match-beginning 1) (match-end 1)))
t))
(defvar-local org-target-link-regexp nil
--
2.13.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Fixed bug in custom timestamps for date ranges.
2017-07-06 9:09 [PATCH] Fixed bug in custom timestamps for date ranges Jan Seeger
@ 2017-07-06 12:58 ` Kaushal Modi
2017-07-06 15:19 ` [PATCH] org.el: Fix " Jan Seeger
0 siblings, 1 reply; 4+ messages in thread
From: Kaushal Modi @ 2017-07-06 12:58 UTC (permalink / raw)
To: Jan Seeger, emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 1468 bytes --]
Hi Jan,
I haven't reviewed the patch functionality, but I see that it is missing a
commit message. Please review this to learn about the required format for
commit messages:
http://orgmode.org/worg/org-contribute.html#commit-messages
Thanks.
On Thu, Jul 6, 2017, 5:10 AM Jan Seeger <jan.seeger@thenybble.de> wrote:
> Changed org-activate-dates to activate custom timestamps for both
> dates in date ranges. Formerly, only the second date would be
> activated. The reason was a misplaced "if". Replaced it with "when".
> ---
> lisp/org.el | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/lisp/org.el b/lisp/org.el
> index ab0bde1ef..f000c8f24 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -6105,9 +6105,11 @@ by a #."
> 'keymap org-mouse-map))
> (org-rear-nonsticky-at (match-end 0))
> (when org-display-custom-times
> - (if (match-end 3)
> - (org-display-custom-time (match-beginning 3) (match-end 3))
> - (org-display-custom-time (match-beginning 1) (match-end 1))))
> + ;; If it's a date range, activate custom time for second date
> + (when (match-end 3)
> + (org-display-custom-time (match-beginning 3) (match-end 3)))
> + ;; Always activate custom time for first matched date
> + (org-display-custom-time (match-beginning 1) (match-end 1)))
> t))
>
> (defvar-local org-target-link-regexp nil
> --
> 2.13.0
>
--
Kaushal Modi
[-- Attachment #2: Type: text/html, Size: 2143 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] org.el: Fix custom timestamps for date ranges
2017-07-06 12:58 ` Kaushal Modi
@ 2017-07-06 15:19 ` Jan Seeger
2017-07-06 17:22 ` Nicolas Goaziou
0 siblings, 1 reply; 4+ messages in thread
From: Jan Seeger @ 2017-07-06 15:19 UTC (permalink / raw)
To: emacs-orgmode; +Cc: Jan Seeger
* org.el (org-activate-dates): Change `org-activate-dates' to activate
custom timestamps for both dates in date ranges. Formerly, only the
second date would be activated. The reason was a misplaced
`if'. Replaced it with `when'. Also added doc comments.
TINYCHANGE
---
lisp/org.el | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index ab0bde1ef..f000c8f24 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6105,9 +6105,11 @@ by a #."
'keymap org-mouse-map))
(org-rear-nonsticky-at (match-end 0))
(when org-display-custom-times
- (if (match-end 3)
- (org-display-custom-time (match-beginning 3) (match-end 3))
- (org-display-custom-time (match-beginning 1) (match-end 1))))
+ ;; If it's a date range, activate custom time for second date
+ (when (match-end 3)
+ (org-display-custom-time (match-beginning 3) (match-end 3)))
+ ;; Always activate custom time for first matched date
+ (org-display-custom-time (match-beginning 1) (match-end 1)))
t))
(defvar-local org-target-link-regexp nil
--
2.13.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] org.el: Fix custom timestamps for date ranges
2017-07-06 15:19 ` [PATCH] org.el: Fix " Jan Seeger
@ 2017-07-06 17:22 ` Nicolas Goaziou
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Goaziou @ 2017-07-06 17:22 UTC (permalink / raw)
To: Jan Seeger; +Cc: emacs-orgmode
Hello,
Jan Seeger <jan.seeger@thenybble.de> writes:
> * org.el (org-activate-dates): Change `org-activate-dates' to activate
> custom timestamps for both dates in date ranges. Formerly, only the
> second date would be activated. The reason was a misplaced
> `if'. Replaced it with `when'. Also added doc comments.
Applied. Thank you.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-07-06 17:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-06 9:09 [PATCH] Fixed bug in custom timestamps for date ranges Jan Seeger
2017-07-06 12:58 ` Kaushal Modi
2017-07-06 15:19 ` [PATCH] org.el: Fix " Jan Seeger
2017-07-06 17:22 ` Nicolas Goaziou
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).