ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-01-30 11:59:57 +01:00
parent 9368d317fb 3c71ab34dd
commit cf2c7e9f18
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lisp/org-agenda.el
View File

@ -3720,12 +3720,7 @@ generating a new one."
(org-agenda-fontify-priorities)) (org-agenda-fontify-priorities))
(when (and org-agenda-dim-blocked-tasks org-blocker-hook) (when (and org-agenda-dim-blocked-tasks org-blocker-hook)
(org-agenda-dim-blocked-tasks)) (org-agenda-dim-blocked-tasks))
;; We need to widen when `org-agenda-finalize' is called from (org-agenda-mark-clocking-task)
;; `org-agenda-change-all-lines' (e.g. in `org-agenda-clock-in')
(when org-clock-current-task
(save-restriction
(widen)
(org-agenda-mark-clocking-task)))
(when org-agenda-entry-text-mode (when org-agenda-entry-text-mode
(org-agenda-entry-text-hide) (org-agenda-entry-text-hide)
(org-agenda-entry-text-show)) (org-agenda-entry-text-show))
@ -3762,20 +3757,25 @@ generating a new one."
(defun org-agenda-mark-clocking-task () (defun org-agenda-mark-clocking-task ()
"Mark the current clock entry in the agenda if it is present." "Mark the current clock entry in the agenda if it is present."
(org-agenda-unmark-clocking-task) ;; We need to widen when `org-agenda-finalize' is called from
(when (marker-buffer org-clock-hd-marker) ;; `org-agenda-change-all-lines' (e.g. in `org-agenda-clock-in')
(save-excursion (when org-clock-current-task
(goto-char (point-min)) (save-restriction
(let (s ov) (widen)
(while (setq s (next-single-property-change (point) 'org-hd-marker)) (org-agenda-unmark-clocking-task)
(goto-char s) (when (marker-buffer org-clock-hd-marker)
(when (equal (org-get-at-bol 'org-hd-marker) (save-excursion
org-clock-hd-marker) (goto-char (point-min))
(setq ov (make-overlay (point-at-bol) (1+ (point-at-eol)))) (let (s ov)
(overlay-put ov 'type 'org-agenda-clocking) (while (setq s (next-single-property-change (point) 'org-hd-marker))
(overlay-put ov 'face 'org-agenda-clocking) (goto-char s)
(overlay-put ov 'help-echo (when (equal (org-get-at-bol 'org-hd-marker)
"The clock is running in this item"))))))) org-clock-hd-marker)
(setq ov (make-overlay (point-at-bol) (1+ (point-at-eol))))
(overlay-put ov 'type 'org-agenda-clocking)
(overlay-put ov 'face 'org-agenda-clocking)
(overlay-put ov 'help-echo
"The clock is running in this item")))))))))
(defun org-agenda-unmark-clocking-task () (defun org-agenda-unmark-clocking-task ()
"Unmark the current clocking task." "Unmark the current clocking task."
@ -9949,6 +9949,7 @@ When the optional argument `backward' is non-nil, move backward."
(move-beginning-of-line (funcall (if backward '1- '1+) arg)) (move-beginning-of-line (funcall (if backward '1- '1+) arg))
(insert line) (insert line)
(org-agenda-reapply-filters) (org-agenda-reapply-filters)
(org-agenda-mark-clocking-task)
(move-beginning-of-line 0))))) (move-beginning-of-line 0)))))
(defun org-agenda-drag-line-backward (arg) (defun org-agenda-drag-line-backward (arg)

1
lisp/org-table.el
View File

@ -1247,6 +1247,7 @@ is always the old value."
(defun org-table-field-info (arg) (defun org-table-field-info (arg)
"Show info about the current field, and highlight any reference at point." "Show info about the current field, and highlight any reference at point."
(interactive "P") (interactive "P")
(unless (org-at-table-p) (user-error "Not at a table"))
(org-table-get-specials) (org-table-get-specials)
(save-excursion (save-excursion
(let* ((pos (point)) (let* ((pos (point))

2
lisp/org.el
View File

@ -8716,7 +8716,7 @@ When sorting is done, call `org-after-sorting-entries-or-items-hook'."
(show-all))) (show-all)))
(setq beg (point)) (setq beg (point))
(if (>= beg end) (user-error "Nothing to sort")) (when (>= beg end) (goto-char start) (user-error "Nothing to sort"))
(looking-at "\\(\\*+\\)") (looking-at "\\(\\*+\\)")
(setq stars (match-string 1) (setq stars (match-string 1)