Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-08-29 20:16:07 +02:00
commit aa476db48c

View file

@ -2788,10 +2788,10 @@ L Timeline for current buffer # List stuck projects (!=configure)
(floor (* (frame-height) (cdr org-agenda-window-frame-fractions))) (floor (* (frame-height) (cdr org-agenda-window-frame-fractions)))
(floor (* (frame-height) (car org-agenda-window-frame-fractions)))))) (floor (* (frame-height) (car org-agenda-window-frame-fractions))))))
(defvar org-cmd) ; Dynamically scoped (defvar org-cmd nil)
(defvar org-agenda-overriding-cmd) ; Ditto (defvar org-agenda-overriding-cmd nil)
(defvar org-agenda-overriding-arguments) ; Ditto (defvar org-agenda-overriding-arguments nil)
(defvar org-agenda-overriding-cmd-arguments) ; Ditto (defvar org-agenda-overriding-cmd-arguments nil)
(defun org-agenda-run-series (name series) (defun org-agenda-run-series (name series)
(org-let (nth 1 series) '(org-agenda-prepare name)) (org-let (nth 1 series) '(org-agenda-prepare name))
;; We need to reset agenda markers here, because when constructing a ;; We need to reset agenda markers here, because when constructing a