* [PATCH] Miscellaneous fixes
@ 2010-03-29 2:16 Bernt Hansen
2010-03-29 2:16 ` [PATCH] Reveal after goto Bernt Hansen
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Bernt Hansen @ 2010-03-29 2:16 UTC (permalink / raw)
To: emacs-orgmode; +Cc: Bernt Hansen
Hi Carsten,
I've been running org-mode with the following 4 patches applied on top
of master.
These are available at git://git.norang.ca/org-mode for-carsten.
Regards,
Bernt
Bernt Hansen (4):
Reveal after goto
Add completions for checkbox targets
Typo: left-over -> leftover
Refactor refiling code
contrib/lisp/org-checklist.el | 2 ++
lisp/ChangeLog | 2 +-
lisp/org-agenda.el | 11 ++++-------
lisp/org-clock.el | 17 +++++++++--------
4 files changed, 16 insertions(+), 16 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] Reveal after goto
2010-03-29 2:16 [PATCH] Miscellaneous fixes Bernt Hansen
@ 2010-03-29 2:16 ` Bernt Hansen
2010-03-29 2:16 ` [PATCH] Add completions for checkbox targets Bernt Hansen
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Bernt Hansen @ 2010-03-29 2:16 UTC (permalink / raw)
To: emacs-orgmode; +Cc: Bernt Hansen
Occasionally when jumping to the last task we end up inside
a folded region. This just reveals the headline to make
editing easier.
---
lisp/org-clock.el | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 1dbb08e..d8d1fe0 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1305,6 +1305,7 @@ With prefix arg SELECT, offer recently clocked tasks for selection."
(org-back-to-heading t)
(org-cycle-hide-drawers 'children)
(recenter)
+ (org-reveal)
(if recent
(message "No running clock, this is the most recently clocked task"))
(run-hooks 'org-clock-goto-hook)))
--
1.7.0.2.279.gf1ba1c
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] Add completions for checkbox targets
2010-03-29 2:16 [PATCH] Miscellaneous fixes Bernt Hansen
2010-03-29 2:16 ` [PATCH] Reveal after goto Bernt Hansen
@ 2010-03-29 2:16 ` Bernt Hansen
2010-03-29 2:16 ` [PATCH] Typo: left-over -> leftover Bernt Hansen
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Bernt Hansen @ 2010-03-29 2:16 UTC (permalink / raw)
To: emacs-orgmode; +Cc: Bernt Hansen
Add the new property values to the completion list.
---
contrib/lisp/org-checklist.el | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/contrib/lisp/org-checklist.el b/contrib/lisp/org-checklist.el
index 657c6e1..50df757 100644
--- a/contrib/lisp/org-checklist.el
+++ b/contrib/lisp/org-checklist.el
@@ -44,6 +44,8 @@
(require 'org)
(load "a2ps-print" 'no-error)
+(setq org-default-properties (cons "RESET_CHECK_BOXES" (cons "LIST_EXPORT_BASENAME" org-default-properties)))
+
(defgroup org-checklist nil
"Extended checklist handling for org"
:tag "Org-checklist"
--
1.7.0.2.279.gf1ba1c
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] Typo: left-over -> leftover
2010-03-29 2:16 [PATCH] Miscellaneous fixes Bernt Hansen
2010-03-29 2:16 ` [PATCH] Reveal after goto Bernt Hansen
2010-03-29 2:16 ` [PATCH] Add completions for checkbox targets Bernt Hansen
@ 2010-03-29 2:16 ` Bernt Hansen
2010-03-29 2:16 ` [PATCH] Refactor refiling code Bernt Hansen
2010-03-29 3:53 ` [PATCH] Miscellaneous fixes Carsten Dominik
4 siblings, 0 replies; 8+ messages in thread
From: Bernt Hansen @ 2010-03-29 2:16 UTC (permalink / raw)
To: emacs-orgmode; +Cc: Bernt Hansen
Since this is not an exposed variable we can rename it so that it is spelled
correctly.
---
lisp/ChangeLog | 2 +-
lisp/org-clock.el | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a027996..c787f1b 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -773,7 +773,7 @@
* org.el (org-offer-links-in-entry): Make RET open all links.
- * org-html.el (org-export-as-html): Remove any left-over display
+ * org-html.el (org-export-as-html): Remove any leftover display
properties in the html file.
* org-wl.el (org-wl-store-link): Work-around for format bug with
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index d8d1fe0..42ff593 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -273,7 +273,7 @@ to add an effort property.")
(defvar org-clock-heading-for-remember "")
(defvar org-clock-start-time "")
-(defvar org-clock-left-over-time nil
+(defvar org-clock-leftover-time nil
"If non-nil, user cancelled a clock; this is when leftover time started.")
(defvar org-clock-effort ""
@@ -713,7 +713,7 @@ This routine can do one of many things:
(org-clock-clock-out clock fail-quietly resolve-to)
(unless org-clock-clocking-in
(if close-p
- (setq org-clock-left-over-time resolve-to)
+ (setq org-clock-leftover-time resolve-to)
(org-clock-clock-in clock)))))))
(defun org-clock-resolve (clock &optional prompt-fn last-valid fail-quietly)
@@ -896,14 +896,14 @@ the clocking selection, associated with the letter `d'."
(let ((interrupting (and (not org-clock-resolving-clocks-due-to-idleness)
(org-clocking-p)))
ts selected-task target-pos (msg-extra "")
- (left-over (and (not org-clock-resolving-clocks)
- org-clock-left-over-time)))
+ (leftover (and (not org-clock-resolving-clocks)
+ org-clock-leftover-time)))
(when (and org-clock-auto-clock-resolution
(or (not interrupting)
(eq t org-clock-auto-clock-resolution))
(not org-clock-clocking-in)
(not org-clock-resolving-clocks))
- (setq org-clock-left-over-time nil)
+ (setq org-clock-leftover-time nil)
(let ((org-clock-clocking-in t))
(org-resolve-clocks))) ; check if any clocks are dangling
(when (equal select '(4))
@@ -1021,13 +1021,13 @@ the clocking selection, associated with the letter `d'."
(setq org-clock-total-time (org-clock-sum-current-item
(org-clock-get-sum-start)))
(setq org-clock-start-time
- (or (and left-over
+ (or (and leftover
(y-or-n-p
(format
"You stopped another clock %d mins ago; start this one from then? "
(/ (- (org-float-time (current-time))
- (org-float-time left-over)) 60)))
- left-over)
+ (org-float-time leftover)) 60)))
+ leftover)
(current-time)))
(setq ts (org-insert-time-stamp org-clock-start-time
'with-hm 'inactive))))
--
1.7.0.2.279.gf1ba1c
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] Refactor refiling code
2010-03-29 2:16 [PATCH] Miscellaneous fixes Bernt Hansen
` (2 preceding siblings ...)
2010-03-29 2:16 ` [PATCH] Typo: left-over -> leftover Bernt Hansen
@ 2010-03-29 2:16 ` Bernt Hansen
2010-03-29 3:53 ` [PATCH] Miscellaneous fixes Carsten Dominik
4 siblings, 0 replies; 8+ messages in thread
From: Bernt Hansen @ 2010-03-29 2:16 UTC (permalink / raw)
To: emacs-orgmode; +Cc: Bernt Hansen
Allow C-2 C-c C-w to work in the agenda.
Update agenda after refiling
This rebuilds the agenda buffer after the refile operation completes.
It was removing the to-be-refiled task before prompting for the location
which felt a little strange. While on the prompt you can't see
the task you are refiling anymore since it was just removed from the
agenda list and if you aborted from the refile operation
with C-g then the task to be refiled has already been removed.
---
lisp/org-agenda.el | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 797728b..adcefad 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6207,18 +6207,15 @@ If this information is not given, the function uses the tree at point."
(let* ((marker (or (org-get-at-bol 'org-hd-marker)
(org-agenda-error)))
(buffer (marker-buffer marker))
- (pos (marker-position marker))
- (rfloc (or rfloc
- (org-refile-get-location
- (if goto "Goto: " "Refile to: ") buffer
- org-refile-allow-creating-parent-nodes))))
+ (pos (marker-position marker)))
(with-current-buffer buffer
(save-excursion
(save-restriction
(widen)
(goto-char marker)
- (org-remove-subtree-entries-from-agenda)
- (org-refile goto buffer rfloc)))))))
+ (org-refile goto buffer rfloc)
+ (with-current-buffer "*Org Agenda*"
+ (org-agenda-redo))))))))
(defun org-agenda-open-link (&optional arg)
"Follow the link in the current line, if any.
--
1.7.0.2.279.gf1ba1c
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] Miscellaneous fixes
2010-03-29 2:16 [PATCH] Miscellaneous fixes Bernt Hansen
` (3 preceding siblings ...)
2010-03-29 2:16 ` [PATCH] Refactor refiling code Bernt Hansen
@ 2010-03-29 3:53 ` Carsten Dominik
2010-03-29 11:51 ` Bernt Hansen
4 siblings, 1 reply; 8+ messages in thread
From: Carsten Dominik @ 2010-03-29 3:53 UTC (permalink / raw)
To: Bernt Hansen; +Cc: emacs-orgmode
Applied, thanks.
- Carsten
On Mar 29, 2010, at 4:16 AM, Bernt Hansen wrote:
> Hi Carsten,
>
> I've been running org-mode with the following 4 patches applied on top
> of master.
>
> These are available at git://git.norang.ca/org-mode for-carsten.
>
> Regards,
> Bernt
>
>
> Bernt Hansen (4):
> Reveal after goto
> Add completions for checkbox targets
> Typo: left-over -> leftover
> Refactor refiling code
>
> contrib/lisp/org-checklist.el | 2 ++
> lisp/ChangeLog | 2 +-
> lisp/org-agenda.el | 11 ++++-------
> lisp/org-clock.el | 17 +++++++++--------
> 4 files changed, 16 insertions(+), 16 deletions(-)
>
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
- Carsten
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Miscellaneous fixes
2010-03-29 3:53 ` [PATCH] Miscellaneous fixes Carsten Dominik
@ 2010-03-29 11:51 ` Bernt Hansen
2010-03-29 12:24 ` Carsten Dominik
0 siblings, 1 reply; 8+ messages in thread
From: Bernt Hansen @ 2010-03-29 11:51 UTC (permalink / raw)
To: Carsten Dominik; +Cc: emacs-orgmode
Hi Carsten,
It seems I didn't cook 84e8434337ea86cd242bac6227232fa6e1f5fb6f long
enough - it breaks batch refiling operations from the agenda.
Please revert this and I'll send a fix when I have one.
Apologies,
Bernt
Carsten Dominik <carsten.dominik@gmail.com> writes:
> Applied, thanks.
>
> - Carsten
>
> On Mar 29, 2010, at 4:16 AM, Bernt Hansen wrote:
>
>> Hi Carsten,
>>
>> I've been running org-mode with the following 4 patches applied on top
>> of master.
>>
>> These are available at git://git.norang.ca/org-mode for-carsten.
>>
>> Regards,
>> Bernt
>>
>>
>> Bernt Hansen (4):
>> Reveal after goto
>> Add completions for checkbox targets
>> Typo: left-over -> leftover
>> Refactor refiling code
>>
>> contrib/lisp/org-checklist.el | 2 ++
>> lisp/ChangeLog | 2 +-
>> lisp/org-agenda.el | 11 ++++-------
>> lisp/org-clock.el | 17 +++++++++--------
>> 4 files changed, 16 insertions(+), 16 deletions(-)
>>
>>
>>
>> _______________________________________________
>> Emacs-orgmode mailing list
>> Please use `Reply All' to send replies to the list.
>> Emacs-orgmode@gnu.org
>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
>
> - Carsten
>
>
>
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Miscellaneous fixes
2010-03-29 11:51 ` Bernt Hansen
@ 2010-03-29 12:24 ` Carsten Dominik
0 siblings, 0 replies; 8+ messages in thread
From: Carsten Dominik @ 2010-03-29 12:24 UTC (permalink / raw)
To: Bernt Hansen; +Cc: emacs-orgmode
On Mar 29, 2010, at 1:51 PM, Bernt Hansen wrote:
> Hi Carsten,
>
> It seems I didn't cook 84e8434337ea86cd242bac6227232fa6e1f5fb6f long
> enough - it breaks batch refiling operations from the agenda.
>
> Please revert this and I'll send a fix when I have one.
Done.
>
> Apologies,
No reason - I am so glad a few people do contribute patches.
And with git, taking such a change back is so easy.
- Carsten
> Bernt
>
>
> Carsten Dominik <carsten.dominik@gmail.com> writes:
>
>> Applied, thanks.
>>
>> - Carsten
>>
>> On Mar 29, 2010, at 4:16 AM, Bernt Hansen wrote:
>>
>>> Hi Carsten,
>>>
>>> I've been running org-mode with the following 4 patches applied on
>>> top
>>> of master.
>>>
>>> These are available at git://git.norang.ca/org-mode for-carsten.
>>>
>>> Regards,
>>> Bernt
>>>
>>>
>>> Bernt Hansen (4):
>>> Reveal after goto
>>> Add completions for checkbox targets
>>> Typo: left-over -> leftover
>>> Refactor refiling code
>>>
>>> contrib/lisp/org-checklist.el | 2 ++
>>> lisp/ChangeLog | 2 +-
>>> lisp/org-agenda.el | 11 ++++-------
>>> lisp/org-clock.el | 17 +++++++++--------
>>> 4 files changed, 16 insertions(+), 16 deletions(-)
>>>
>>>
>>>
>>> _______________________________________________
>>> Emacs-orgmode mailing list
>>> Please use `Reply All' to send replies to the list.
>>> Emacs-orgmode@gnu.org
>>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
>>
>> - Carsten
>>
>>
>>
>>
>>
>> _______________________________________________
>> Emacs-orgmode mailing list
>> Please use `Reply All' to send replies to the list.
>> Emacs-orgmode@gnu.org
>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
- Carsten
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-03-29 12:24 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-29 2:16 [PATCH] Miscellaneous fixes Bernt Hansen
2010-03-29 2:16 ` [PATCH] Reveal after goto Bernt Hansen
2010-03-29 2:16 ` [PATCH] Add completions for checkbox targets Bernt Hansen
2010-03-29 2:16 ` [PATCH] Typo: left-over -> leftover Bernt Hansen
2010-03-29 2:16 ` [PATCH] Refactor refiling code Bernt Hansen
2010-03-29 3:53 ` [PATCH] Miscellaneous fixes Carsten Dominik
2010-03-29 11:51 ` Bernt Hansen
2010-03-29 12:24 ` Carsten Dominik
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).