mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-23 07:18:53 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Bastien Guerry 2014-01-16 00:55:46 +01:00
commit a5a7231304
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lisp/org-agenda.el
View File

@ -9917,13 +9917,13 @@ current HH:MM time."
(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))))
(lambda(f) (when (car f) (org-agenda-filter-apply (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.
@ -9943,7 +9943,7 @@ When the optional argument `backward' is non-nil, move backward."
(delete-region (point) end)
(move-beginning-of-line (funcall (if backward '1- '1+) arg))
(insert line)
(org-agenda-apply-filters)
(org-agenda-reapply-filters)
(move-beginning-of-line 0)))))
(defun org-agenda-drag-line-backward (arg)

10
lisp/org.el
View File

@ -4491,14 +4491,6 @@ If yes, offer to stop it and to save the buffer with the changes."
(add-hook 'org-mode-hook 'org-clock-load)
(add-hook 'kill-emacs-hook 'org-clock-save))
;; Define the variable already here, to make sure we have it.
(defvar org-indent-mode nil
"Non-nil if Org-Indent mode is enabled.
Use the command `org-indent-mode' to change this variable.")
;; Autoload archiving code
;; The stuff that is needed for cycling and tags has to be defined here.
(defgroup org-archive nil
"Options concerning archiving in Org-mode."
:tag "Org Archive"
@ -8023,7 +8015,7 @@ in the region."
(t (replace-match up-head nil t)))
;; Fixup tag positioning
(unless (= level 1)
(and org-auto-align-tags (org-set-tags nil t))
(and org-auto-align-tags (org-set-tags nil 'ignore-column))
(if org-adapt-indentation (org-fixup-indentation (- diff))))
(run-hooks 'org-after-promote-entry-hook)))