diff options
authorBastien Guerry <>2014-01-12 22:57:08 (GMT)
committer Bastien Guerry <>2014-01-12 22:57:08 (GMT)
commitb9e1dd8ff8e3b398f9a37f16e3ef26d93411a52a (patch)
parent27b6b164efa2bbe71865de10e3f198bbf85f5a87 (diff)
parentbf0649c6fc2c059d32b3b36fcbd616447c32b4db (diff)
Merge branch 'maint'
1 files changed, 26 insertions, 15 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 5b1ff08..5055b5d 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3583,7 +3583,7 @@ the global options and expect it to be applied to the entire view.")
(defvar org-agenda-regexp-filter-preset nil
"A preset of the regexp filter used for secondary agenda filtering.
-This must be a list of strings, each string must be a single category
+This must be a list of strings, each string must be a single regexp
preceded by \"+\" or \"-\".
This variable should not be set directly, but agenda custom commands can
bind it in the options section. The preset filter is a global property of
@@ -9914,31 +9914,42 @@ current HH:MM time."
;;; Dragging agenda lines forward/backward
-(defun org-agenda-drag-line-forward (arg)
- "Drag an agenda line forward by ARG lines."
+(defun org-agenda-reapply-filters ()
+ "Re-apply all agenda filters."
+ (mapcar
+ (lambda(f) (when (car f) (org-agenda-apply-filter (car f) (cadr f))))
+ `((org-agenda-tag-filter 'tag)
+ (org-agenda-category-filter 'category)
+ (org-agenda-regexp-filter 'regexp)
+ (,(get 'org-agenda-tag-filter :preset-filter) 'tag)
+ (,(get 'org-agenda-category-filter :preset-filter) 'category)
+ (,(get 'org-agenda-regexp-filter :preset-filter) 'regexp))))
+(defun org-agenda-drag-line-forward (arg &optional backward)
+ "Drag an agenda line forward by ARG lines.
+When the optional argument `backward' is non-nil, move backward."
(interactive "p")
- (let ((inhibit-read-only t) lst)
+ (let ((inhibit-read-only t) lst line)
(if (or (not (get-text-property (point) 'txt))
(dotimes (n arg)
- (move-beginning-of-line 2)
+ (move-beginning-of-line (if backward 0 2))
(push (not (get-text-property (point) 'txt)) lst))
(delq nil lst)))
(message "Cannot move line forward")
- (org-drag-line-forward arg))))
+ (let ((end (save-excursion (move-beginning-of-line 2) (point))))
+ (move-beginning-of-line 1)
+ (setq line (buffer-substring (point) end))
+ (delete-region (point) end)
+ (move-beginning-of-line (funcall (if backward '1- '1+) arg))
+ (insert line)
+ (org-agenda-apply-filters)
+ (move-beginning-of-line 0)))))
(defun org-agenda-drag-line-backward (arg)
"Drag an agenda line backward by ARG lines."
(interactive "p")
- (let ((inhibit-read-only t) lst)
- (if (or (not (get-text-property (point) 'txt))
- (save-excursion
- (dotimes (n arg)
- (move-beginning-of-line 0)
- (push (not (get-text-property (point) 'txt)) lst))
- (delq nil lst)))
- (message "Cannot move line backward")
- (org-drag-line-backward arg))))
+ (org-agenda-drag-line-forward arg t))
;;; Flagging notes