Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-12-06 23:16:55 +01:00
commit 3695415199
1 changed files with 3 additions and 2 deletions

View File

@ -7115,11 +7115,12 @@ are at least `org-cycle-separator-lines' empty lines before the headline."
"Return `org-agenda-files' list, plus all open Org files.
This is useful for operations that need to scan all of a user's
open and agenda-wise Org files."
(let ((files (mapcar 'expand-file-name (org-agenda-files))))
(let ((files (mapcar #'expand-file-name (org-agenda-files))))
(dolist (buf (buffer-list))
(with-current-buffer buf
(when (and (derived-mode-p 'org-mode) (buffer-file-name))
(cl-pushnew (expand-file-name (buffer-file-name)) files))))
(cl-pushnew (expand-file-name (buffer-file-name)) files
:test #'equal))))
files))
(defsubst org-entry-beginning-position ()