1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-11 09:20:32 +00:00

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-04-17 09:18:19 +02:00
commit 06bbbee67a

View File

@ -12039,8 +12039,9 @@ blocks in the buffer."
This means to empty the block, parse for parameters and then call This means to empty the block, parse for parameters and then call
the correct writing function." the correct writing function."
(interactive) (interactive)
(save-window-excursion (save-excursion
(let* ((pos (point)) (let* ((win (selected-window))
(pos (point))
(line (org-current-line)) (line (org-current-line))
(params (org-prepare-dblock)) (params (org-prepare-dblock))
(name (plist-get params :name)) (name (plist-get params :name))
@ -12053,6 +12054,7 @@ the correct writing function."
(when (and indent (> indent 0)) (when (and indent (> indent 0))
(setq indent (make-string indent ?\ )) (setq indent (make-string indent ?\ ))
(save-excursion (save-excursion
(select-window win)
(org-beginning-of-dblock) (org-beginning-of-dblock)
(forward-line 1) (forward-line 1)
(while (not (looking-at org-dblock-end-re)) (while (not (looking-at org-dblock-end-re))