mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 21:07:54 +00:00
Merge branch 'maint'
This commit is contained in:
commit
d4aa7692bd
|
@ -106,6 +106,8 @@ Return an alist containing all macro templates found."
|
||||||
(org-remove-double-quotes val))))
|
(org-remove-double-quotes val))))
|
||||||
(unless (member file files)
|
(unless (member file files)
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
|
(setq default-directory
|
||||||
|
(file-name-directory file))
|
||||||
(org-mode)
|
(org-mode)
|
||||||
(insert (org-file-contents file 'noerror))
|
(insert (org-file-contents file 'noerror))
|
||||||
(setq templates
|
(setq templates
|
||||||
|
|
|
@ -5203,6 +5203,7 @@ Return value contains the following keys: `archive', `category',
|
||||||
(org-remove-double-quotes value)))))
|
(org-remove-double-quotes value)))))
|
||||||
(when (and f (file-readable-p f) (not (member f files)))
|
(when (and f (file-readable-p f) (not (member f files)))
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
|
(setq default-directory (file-name-directory f))
|
||||||
(insert-file-contents f)
|
(insert-file-contents f)
|
||||||
(setq alist
|
(setq alist
|
||||||
;; Fake Org mode to benefit from cache
|
;; Fake Org mode to benefit from cache
|
||||||
|
|
|
@ -1454,6 +1454,8 @@ Assume buffer is in Org mode. Narrowing, if any, is ignored."
|
||||||
;; Avoid circular dependencies.
|
;; Avoid circular dependencies.
|
||||||
(unless (member file files)
|
(unless (member file files)
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
|
(setq default-directory
|
||||||
|
(file-name-directory file))
|
||||||
(insert (org-file-contents file 'noerror))
|
(insert (org-file-contents file 'noerror))
|
||||||
(let ((org-inhibit-startup t)) (org-mode))
|
(let ((org-inhibit-startup t)) (org-mode))
|
||||||
(funcall get-options (cons file files))))))
|
(funcall get-options (cons file files))))))
|
||||||
|
@ -1584,6 +1586,8 @@ an alist where associations are (VARIABLE-NAME VALUE)."
|
||||||
(org-remove-double-quotes val))))
|
(org-remove-double-quotes val))))
|
||||||
(unless (member file files)
|
(unless (member file files)
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
|
(setq default-directory
|
||||||
|
(file-name-directory file))
|
||||||
(let ((org-inhibit-startup t)) (org-mode))
|
(let ((org-inhibit-startup t)) (org-mode))
|
||||||
(insert (org-file-contents file 'noerror))
|
(insert (org-file-contents file 'noerror))
|
||||||
(setq alist
|
(setq alist
|
||||||
|
|
|
@ -1,6 +1 @@
|
||||||
#+BIND: variable value
|
#+SETUPFILE: subdir/setupfile2.org
|
||||||
#+DESCRIPTION: l2
|
|
||||||
#+LANGUAGE: en
|
|
||||||
#+SELECT_TAGS: b
|
|
||||||
#+TITLE: b
|
|
||||||
#+PROPERTY: a 1
|
|
||||||
|
|
6
testing/examples/setupfile3.org
Normal file
6
testing/examples/setupfile3.org
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
#+BIND: variable value
|
||||||
|
#+DESCRIPTION: l2
|
||||||
|
#+LANGUAGE: en
|
||||||
|
#+SELECT_TAGS: b
|
||||||
|
#+TITLE: b
|
||||||
|
#+PROPERTY: a 1
|
1
testing/examples/subdir/setupfile2.org
Normal file
1
testing/examples/subdir/setupfile2.org
Normal file
|
@ -0,0 +1 @@
|
||||||
|
#+SETUPFILE: ../setupfile3.org
|
Loading…
Reference in a new issue