forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
116a66c5be
|
@ -23577,6 +23577,8 @@ To get rid of the restriction, use \\[org-agenda-remove-restriction-lock]."
|
|||
(setq current-prefix-arg nil)
|
||||
(org-agenda-maybe-redo)))
|
||||
|
||||
(defvar speedbar-file-key-map)
|
||||
(declare-function speedbar-add-supported-extension "speedbar" (extension))
|
||||
(eval-after-load "speedbar"
|
||||
'(progn
|
||||
(speedbar-add-supported-extension ".org")
|
||||
|
@ -23650,6 +23652,7 @@ To get rid of the restriction, use \\[org-agenda-remove-restriction-lock]."
|
|||
(org-show-context 'bookmark-jump)))
|
||||
|
||||
;; Make session.el ignore our circular variable
|
||||
(defvar session-globals-exclude)
|
||||
(eval-after-load "session"
|
||||
'(add-to-list 'session-globals-exclude 'org-mark-ring))
|
||||
|
||||
|
|
|
@ -366,6 +366,7 @@ visually."
|
|||
|
||||
;;;; Document schema
|
||||
|
||||
(require 'rng-loc)
|
||||
(defcustom org-odt-schema-dir
|
||||
(let* ((schema-dir
|
||||
(catch 'schema-dir
|
||||
|
|
Loading…
Reference in New Issue