Merge branch 'master' of orgmode.org:org-mode
This commit is contained in:
commit
b2e1d6d2bf
|
@ -291,8 +291,8 @@ When optional argument BELL is non-nil, inform the user with
|
||||||
a message if the file was modified. With optional argument
|
a message if the file was modified. With optional argument
|
||||||
H-MARKERS non-nil, it is a list of markers for the headlines
|
H-MARKERS non-nil, it is a list of markers for the headlines
|
||||||
which will be updated."
|
which will be updated."
|
||||||
(let (modified-flag pt)
|
(let ((pt (if h-markers (goto-char (car h-markers)) (point-min)))
|
||||||
(when h-markers (setq pt (goto-char (car h-markers))))
|
modified-flag)
|
||||||
(org-map-entries
|
(org-map-entries
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(let ((entry (org-element-at-point)))
|
(let ((entry (org-element-at-point)))
|
||||||
|
@ -300,8 +300,7 @@ which will be updated."
|
||||||
(org-id-get-create)
|
(org-id-get-create)
|
||||||
(setq modified-flag t)
|
(setq modified-flag t)
|
||||||
(forward-line))
|
(forward-line))
|
||||||
(setq org-map-continue-from
|
(when h-markers (setq org-map-continue-from (pop h-markers)))))
|
||||||
(if h-markers (pop h-markers) (point-max)))))
|
|
||||||
nil nil 'comment)
|
nil nil 'comment)
|
||||||
(when (and bell modified-flag)
|
(when (and bell modified-flag)
|
||||||
(message "ID properties created in file \"%s\"" file)
|
(message "ID properties created in file \"%s\"" file)
|
||||||
|
|
Loading…
Reference in New Issue