ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-02-17 22:33:16 +01:00
parent 542890cd3f bf601016dc
commit 120b565054
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org-src.el
View File

@ -646,7 +646,8 @@ See also `org-src-mode-hook'."
(setq buffer-offer-save t) (setq buffer-offer-save t)
(setq buffer-file-name (setq buffer-file-name
(concat (buffer-file-name (marker-buffer org-src--beg-marker)) (concat (buffer-file-name (marker-buffer org-src--beg-marker))
"[" (buffer-name) "]"))) "[" (buffer-name) "]"))
(setq-local write-contents-functions '(org-edit-src-save)))
(setq buffer-read-only t)))) (setq buffer-read-only t))))
(add-hook 'org-src-mode-hook #'org-src-mode-configure-edit-buffer) (add-hook 'org-src-mode-hook #'org-src-mode-configure-edit-buffer)
@ -1054,7 +1055,10 @@ Throw an error if there is no such buffer."
(insert edited-code) (insert edited-code)
(when (and expecting-bol (not (bolp))) (insert "\n"))) (when (and expecting-bol (not (bolp))) (insert "\n")))
(save-buffer) (save-buffer)
(move-overlay overlay beg (point))))) (move-overlay overlay beg (point))))
;; `write-contents-functions' require the function to return
;; a non-nil value so that other functions are not called.
t)
(defun org-edit-src-exit () (defun org-edit-src-exit ()
"Kill current sub-editing buffer and return to source buffer." "Kill current sub-editing buffer and return to source buffer."