diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-02-18 02:04:39 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2015-02-18 02:04:39 +0100 |
commit | 2dd548a4e03dc3b9aee9774b4e7c9a04d079beab (patch) | |
tree | 25a39bf4cfcecb8e1df41a2e2c85647fba729b43 | |
parent | 451c7b324735d4a750e1521b8bd67dc19ee138fc (diff) | |
parent | c41bbc577e81e9fa5bab2509a8141189e45fe6c7 (diff) | |
download | org-mode-2dd548a4e03dc3b9aee9774b4e7c9a04d079beab.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-src.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/org-src.el b/lisp/org-src.el index 67760a9..d0f242d 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -543,8 +543,11 @@ There is a mode hook, and keybindings for `org-edit-src-exit' and (defun org-src-mode-configure-edit-buffer () (when (org-bound-and-true-p org-src--from-org-mode) (org-add-hook 'kill-buffer-hook - (lambda () (delete-overlay org-src--overlay)) nil 'local) - (if (org-bound-and-true-p org-src--allow-write-back-p) + (lambda () + (when (overlayp org-edit-src-overlay) + (delete-overlay org-edit-src-overlay))) + nil 'local) + (if (org-bound-and-true-p org-edit-src-allow-write-back-p) (progn (setq buffer-offer-save t) (setq buffer-file-name |