forked from mirrors/org-mode
Merge branch 'master' of orgmode.org:org-mode
This commit is contained in:
commit
52ba37b8c8
16
lisp/ox.el
16
lisp/ox.el
|
@ -1623,7 +1623,7 @@ Assume buffer is in Org mode. Narrowing, if any, is ignored."
|
||||||
(unless (member file files)
|
(unless (member file files)
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
(insert (org-file-contents file 'noerror))
|
(insert (org-file-contents file 'noerror))
|
||||||
(org-mode)
|
(let ((org-inhibit-startup t)) (org-mode))
|
||||||
(setq plist (funcall get-options
|
(setq plist (funcall get-options
|
||||||
(cons file files) plist))))))
|
(cons file files) plist))))))
|
||||||
((equal key "OPTIONS")
|
((equal key "OPTIONS")
|
||||||
|
@ -1754,7 +1754,7 @@ 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
|
||||||
(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
|
||||||
(funcall collect-bind
|
(funcall collect-bind
|
||||||
|
@ -2811,7 +2811,7 @@ The function assumes BUFFER's major mode is `org-mode'."
|
||||||
(let ((inhibit-modification-hooks t))
|
(let ((inhibit-modification-hooks t))
|
||||||
;; Set major mode. Ignore `org-mode-hook' as it has been run
|
;; Set major mode. Ignore `org-mode-hook' as it has been run
|
||||||
;; already in BUFFER.
|
;; already in BUFFER.
|
||||||
(let ((org-mode-hook nil)) (org-mode))
|
(let ((org-mode-hook nil) (org-inhibit-startup t)) (org-mode))
|
||||||
;; Copy specific buffer local variables and variables set
|
;; Copy specific buffer local variables and variables set
|
||||||
;; through BIND keywords.
|
;; through BIND keywords.
|
||||||
,@(let ((bound-variables (org-export--list-bound-variables))
|
,@(let ((bound-variables (org-export--list-bound-variables))
|
||||||
|
@ -3053,7 +3053,7 @@ still inferior to file-local settings.
|
||||||
Return code as a string."
|
Return code as a string."
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
(insert string)
|
(insert string)
|
||||||
(org-mode)
|
(let ((org-inhibit-startup t)) (org-mode))
|
||||||
(org-export-as backend nil nil body-only ext-plist)))
|
(org-export-as backend nil nil body-only ext-plist)))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
|
@ -3290,7 +3290,7 @@ paths."
|
||||||
(t
|
(t
|
||||||
(insert
|
(insert
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
(org-mode)
|
(let ((org-inhibit-startup t)) (org-mode))
|
||||||
(insert
|
(insert
|
||||||
(org-export--prepare-file-contents file lines ind minlevel))
|
(org-export--prepare-file-contents file lines ind minlevel))
|
||||||
(org-export-expand-include-keyword
|
(org-export-expand-include-keyword
|
||||||
|
@ -3342,7 +3342,8 @@ file should have."
|
||||||
;; If IND is set, preserve indentation of include keyword until
|
;; If IND is set, preserve indentation of include keyword until
|
||||||
;; the first headline encountered.
|
;; the first headline encountered.
|
||||||
(when ind
|
(when ind
|
||||||
(unless (eq major-mode 'org-mode) (org-mode))
|
(unless (eq major-mode 'org-mode)
|
||||||
|
(let ((org-inhibit-startup t)) (org-mode)))
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
(let ((ind-str (make-string ind ? )))
|
(let ((ind-str (make-string ind ? )))
|
||||||
(while (not (or (eobp) (looking-at org-outline-regexp-bol)))
|
(while (not (or (eobp) (looking-at org-outline-regexp-bol)))
|
||||||
|
@ -3356,7 +3357,8 @@ file should have."
|
||||||
;; in the file (CUR-MIN), and remove stars to each headline so
|
;; in the file (CUR-MIN), and remove stars to each headline so
|
||||||
;; that headlines with minimal level have a level of MINLEVEL.
|
;; that headlines with minimal level have a level of MINLEVEL.
|
||||||
(when minlevel
|
(when minlevel
|
||||||
(unless (eq major-mode 'org-mode) (org-mode))
|
(unless (eq major-mode 'org-mode)
|
||||||
|
(let ((org-inhibit-startup t)) (org-mode)))
|
||||||
(org-with-limited-levels
|
(org-with-limited-levels
|
||||||
(let ((levels (org-map-entries
|
(let ((levels (org-map-entries
|
||||||
(lambda () (org-reduced-level (org-current-level))))))
|
(lambda () (org-reduced-level (org-current-level))))))
|
||||||
|
|
Loading…
Reference in New Issue