diff options
author | Bastien Guerry <bzg@altern.org> | 2013-03-07 16:31:40 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-03-07 16:31:40 +0100 |
commit | b2e1d6d2bfb44f33b2fba613cda1329c4daaac96 (patch) | |
tree | c33e2f0e49fe796b00fc9f5ba021d0472c0417d9 | |
parent | 81d0b52f13376dff23db7522b049ed0f52d776b9 (diff) | |
parent | 3b0e662181c8494180c1cdaa9c2a1397562f7067 (diff) | |
download | org-mode-b2e1d6d2bfb44f33b2fba613cda1329c4daaac96.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | lisp/ox-icalendar.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el index 6f6d396..0f0e7b9 100644 --- a/lisp/ox-icalendar.el +++ b/lisp/ox-icalendar.el @@ -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 H-MARKERS non-nil, it is a list of markers for the headlines which will be updated." - (let (modified-flag pt) - (when h-markers (setq pt (goto-char (car h-markers)))) + (let ((pt (if h-markers (goto-char (car h-markers)) (point-min))) + modified-flag) (org-map-entries (lambda () (let ((entry (org-element-at-point))) @@ -300,8 +300,7 @@ which will be updated." (org-id-get-create) (setq modified-flag t) (forward-line)) - (setq org-map-continue-from - (if h-markers (pop h-markers) (point-max))))) + (when h-markers (setq org-map-continue-from (pop h-markers))))) nil nil 'comment) (when (and bell modified-flag) (message "ID properties created in file \"%s\"" file) |