Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-03-14 09:59:38 +01:00
commit 07347025ee

View file

@ -737,10 +737,8 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
(unless (or single preserve-indentation (= total-nindent 0))
(setq indent (make-string total-nindent ?\ ))
(goto-char (point-min))
(while (and (not (eobp)) (re-search-forward "^" nil t))
(if (not (looking-at "$"))
(replace-match indent)
(forward-char 1))))
(while (re-search-forward "\\(^\\).+" nil t)
(replace-match indent nil nil nil 1)))
(if (org-bound-and-true-p org-edit-src-picture)
(setq total-nindent (+ total-nindent 2)))
(setq code (buffer-string))