mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-20 12:18:31 +00:00
Merge branch 'maint'
This commit is contained in:
commit
7cf6bbeeac
|
@ -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))
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue