浏览代码

Merge branch 'maint'

Nicolas Goaziou 7 年之前
父节点
当前提交
1bb9cf1597
共有 2 个文件被更改,包括 4 次插入5 次删除
  1. 2 4
      doc/org.texi
  2. 2 1
      lisp/org-gnus.el

+ 2 - 4
doc/org.texi

@@ -5848,8 +5848,7 @@ The following commands insert or update the dynamic block:
 Insert a dynamic block capturing a column view.  You will be prompted
 Insert a dynamic block capturing a column view.  You will be prompted
 for the scope or ID of the view.
 for the scope or ID of the view.
 @orgcmdkkc{C-c C-c,C-c C-x C-u,org-dblock-update}
 @orgcmdkkc{C-c C-c,C-c C-x C-u,org-dblock-update}
-Update dynamic block at point.  The cursor needs to be in the
-@code{#+BEGIN} line of the dynamic block.
+Update dynamic block at point.
 @orgcmd{C-u C-c C-x C-u,org-update-all-dblocks}
 @orgcmd{C-u C-c C-x C-u,org-update-all-dblocks}
 Update all dynamic blocks (@pxref{Dynamic blocks}).  This is useful if
 Update all dynamic blocks (@pxref{Dynamic blocks}).  This is useful if
 you have several clock table blocks, column-capturing blocks or other dynamic
 you have several clock table blocks, column-capturing blocks or other dynamic
@@ -6634,8 +6633,7 @@ argument, jump to the first clock report in the current document and
 update it.  The clock table always includes also trees with
 update it.  The clock table always includes also trees with
 @code{:ARCHIVE:} tag.
 @code{:ARCHIVE:} tag.
 @orgcmdkkc{C-c C-c,C-c C-x C-u,org-dblock-update}
 @orgcmdkkc{C-c C-c,C-c C-x C-u,org-dblock-update}
-Update dynamic block at point.  The cursor needs to be in the
-@code{#+BEGIN} line of the dynamic block.
+Update dynamic block at point.
 @orgkey{C-u C-c C-x C-u}
 @orgkey{C-u C-c C-x C-u}
 Update all dynamic blocks (@pxref{Dynamic blocks}).  This is useful if
 Update all dynamic blocks (@pxref{Dynamic blocks}).  This is useful if
 you have several clock table blocks in a buffer.
 you have several clock table blocks in a buffer.

+ 2 - 1
lisp/org-gnus.el

@@ -123,7 +123,8 @@ If `org-store-link' was called with a prefix arg the meaning of
 		(save-excursion
 		(save-excursion
 		  (car (nnvirtual-map-article (gnus-summary-article-number)))))
 		  (car (nnvirtual-map-article (gnus-summary-article-number)))))
 	       (`(nnir . ,_)
 	       (`(nnir . ,_)
-		(nnir-article-group (gnus-summary-article-number)))
+		(save-excursion
+		  (nnir-article-group (gnus-summary-article-number))))
 	       (_ gnus-newsgroup-name)))
 	       (_ gnus-newsgroup-name)))
 	    (header (with-current-buffer gnus-summary-buffer
 	    (header (with-current-buffer gnus-summary-buffer
 		      (gnus-summary-article-header)))
 		      (gnus-summary-article-header)))