diff options
author | Bastien Guerry <bzg@altern.org> | 2012-12-29 11:47:46 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-12-29 11:47:46 +0100 |
commit | 271bbb0a6d038fb295b7ab0ff8d0b3b3275c2e99 (patch) | |
tree | 48bc15d5b1f0c3b70b937beb2db280554f708265 | |
parent | 42df907d483d36f70e74ab340bd8ffa2319182e5 (diff) | |
parent | e4ca9f44e3e05576df83b91ec88c525903a83ace (diff) | |
download | org-mode-271bbb0a6d038fb295b7ab0ff8d0b3b3275c2e99.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-src.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org-src.el b/lisp/org-src.el index 5f66a0a..960ffcd 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -633,7 +633,8 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"." (unless (org-bound-and-true-p org-edit-src-from-org-mode) (error "This is not a sub-editing buffer, something is wrong")) (widen) - (let* ((beg org-edit-src-beg-marker) + (let* ((fixed-width-p (string-match "Fixed Width" (buffer-name))) + (beg org-edit-src-beg-marker) (end org-edit-src-end-marker) (ovl org-edit-src-overlay) (bufstr (buffer-string)) @@ -670,7 +671,8 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"." (goto-char (point-max)) (insert "\\n"))) (goto-char (point-min)) (if (looking-at "\\s-*") (replace-match " "))) - (when (org-bound-and-true-p org-edit-src-from-org-mode) + (when (and (org-bound-and-true-p org-edit-src-from-org-mode) + (not fixed-width-p)) (org-escape-code-in-region (point-min) (point-max)) (setq delta (+ delta (save-excursion |