Merge branch 'maint'

2014-03-13 09:46:58 +01:00 · 2014-03-13 09:46:58 +01:00 · a6f8460487
parent 99f1ff33f0 f94ed64ffd
commit a6f8460487
1 changed files with 1 additions and 1 deletions
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@ -740,7 +740,7 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
        (while (re-search-forward "^" nil t)
          (if (not (looking-at "$"))
              (replace-match indent)
-	    (forward-char 1))))
+	    (or (eobp) (forward-char 1)))))
      (if (org-bound-and-true-p org-edit-src-picture)
 	  (setq total-nindent (+ total-nindent 2)))
      (setq code (buffer-string))