diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-09-17 19:02:35 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-09-17 19:02:35 +0200 |
| commit | 7cf6bbeeac9747cf839b81d3b4d1747780858403 (patch) | |
| tree | 835ff7a1ec8e6812b23a4d95fe421cba042fcc32 | |
| parent | 660913986e126f73e048e4fbe6ef09689e5fae8c (diff) | |
| parent | a67676809c042805dfeeb9d677d4dafc0df7c369 (diff) | |
| download | org-mode-7cf6bbeeac9747cf839b81d3b4d1747780858403.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | contrib/lisp/org-e-beamer.el | 4 | ||||
| -rw-r--r-- | lisp/org-agenda.el | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/contrib/lisp/org-e-beamer.el b/contrib/lisp/org-e-beamer.el index fba3c43..94336d7 100644 --- a/contrib/lisp/org-e-beamer.el +++ b/contrib/lisp/org-e-beamer.el @@ -1130,8 +1130,8 @@ aid, but the tag does not have any semantic meaning." (progn (org-back-to-heading t) (org-reveal) - (org-entry-put nil "LaTeX_CLASS" "beamer") - (org-entry-put nil "LaTeX_CLASS_OPTIONS" "[presentation]") + (org-entry-put nil "EXPORT_LaTeX_CLASS" "beamer") + (org-entry-put nil "EXPORT_LaTeX_CLASS_OPTIONS" "[presentation]") (org-entry-put nil "EXPORT_FILE_NAME" "presentation.pdf") (when org-e-beamer-column-view-format (org-entry-put nil "COLUMNS" org-e-beamer-column-view-format)) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 478dd24..4ba4233 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -90,7 +90,7 @@ (defvar org-mobile-force-id-on-agenda-items) ; defined in org-mobile.el (defvar org-habit-show-habits) ; defined in org-habit.el (defvar org-habit-show-habits-only-for-today) -(defvar org-habit-show-all-today nil) +(defvar org-habit-show-all-today) ;; Defined somewhere in this file, but used before definition. (defvar org-agenda-buffer-name "*Org Agenda*") @@ -5717,6 +5717,7 @@ FRACTION is what fraction of the head-warning time has passed." ;; org-is-habit-p uses org-entry-get, which is expansive ;; so we go extra mile to only call it once (and todayp + (boundp 'org-habit-show-all-today) org-habit-show-all-today (setq did-habit-check-p t) (setq habitp (and (functionp 'org-is-habit-p) @@ -5741,6 +5742,7 @@ FRACTION is what fraction of the head-warning time has passed." (if habitp (if (or (not org-habit-show-habits) (and (not todayp) + (boundp 'org-habit-show-habits-only-for-today) org-habit-show-habits-only-for-today)) (throw :skip nil)) (if (and |