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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-12-29 11:47:46 +01:00
parent 42df907d48 e4ca9f44e3
commit 271bbb0a6d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org-src.el
View File

@ -633,7 +633,8 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
(unless (org-bound-and-true-p org-edit-src-from-org-mode) (unless (org-bound-and-true-p org-edit-src-from-org-mode)
(error "This is not a sub-editing buffer, something is wrong")) (error "This is not a sub-editing buffer, something is wrong"))
(widen) (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) (end org-edit-src-end-marker)
(ovl org-edit-src-overlay) (ovl org-edit-src-overlay)
(bufstr (buffer-string)) (bufstr (buffer-string))
@ -670,7 +671,8 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
(goto-char (point-max)) (insert "\\n"))) (goto-char (point-max)) (insert "\\n")))
(goto-char (point-min)) (goto-char (point-min))
(if (looking-at "\\s-*") (replace-match " "))) (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)) (org-escape-code-in-region (point-min) (point-max))
(setq delta (+ delta (setq delta (+ delta
(save-excursion (save-excursion