From a86fd717196ffc73ecb201b2757a96483a810078 Mon Sep 17 00:00:00 2001 From: Suvayu Ali Date: Mon, 17 Sep 2012 17:28:03 +0200 Subject: [PATCH 1/2] Fix org-e-beamer subtree export options template Prepend "EXPORT_" to LaTeX_CLASS* properties in the beamer subtree export options template. --- contrib/lisp/org-e-beamer.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/lisp/org-e-beamer.el b/contrib/lisp/org-e-beamer.el index 85a04821c..0c3c430c5 100644 --- a/contrib/lisp/org-e-beamer.el +++ b/contrib/lisp/org-e-beamer.el @@ -1050,8 +1050,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)) From a67676809c042805dfeeb9d677d4dafc0df7c369 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 17 Sep 2012 18:57:58 +0200 Subject: [PATCH 2/2] org-agenda.el: Fix the declaration/check of org-habit variables * org-agenda.el (org-habit-show-all-today): Only use defvar to silent the byte-compiler. (org-agenda-get-scheduled): Check whether some org-habit.el options have been defined. Thanks to Robert Horn for reporting this. --- lisp/org-agenda.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 557562fb2..b24fd7bed 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*") @@ -5706,6 +5706,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) @@ -5730,6 +5731,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