|
@@ -4486,7 +4486,14 @@ is active."
|
|
|
(when (eq (car org-agenda-text-search-extra-files) 'agenda-archives)
|
|
|
(pop org-agenda-text-search-extra-files)
|
|
|
(setq files (org-add-archive-files files))))
|
|
|
- (setq files (append files org-agenda-text-search-extra-files)
|
|
|
+ ;; Uniquify files. However, let `org-check-agenda-file' handle
|
|
|
+ ;; non-existent ones.
|
|
|
+ (setq files (cl-remove-duplicates
|
|
|
+ (append files org-agenda-text-search-extra-files)
|
|
|
+ (lambda (a b)
|
|
|
+ (and (file-exists-p a)
|
|
|
+ (file-exists-p b)
|
|
|
+ (file-equal-p a b))))
|
|
|
rtnall nil)
|
|
|
(while (setq file (pop files))
|
|
|
(setq ee nil)
|
|
@@ -4541,12 +4548,12 @@ is active."
|
|
|
(point-at-bol)
|
|
|
(if hdl-only (point-at-eol) end)))
|
|
|
(mapc (lambda (wr) (when (string-match wr str)
|
|
|
- (goto-char (1- end))
|
|
|
- (throw :skip t)))
|
|
|
+ (goto-char (1- end))
|
|
|
+ (throw :skip t)))
|
|
|
regexps-)
|
|
|
(mapc (lambda (wr) (unless (string-match wr str)
|
|
|
- (goto-char (1- end))
|
|
|
- (throw :skip t)))
|
|
|
+ (goto-char (1- end))
|
|
|
+ (throw :skip t)))
|
|
|
(if todo-only
|
|
|
(cons (concat "^\\*+[ \t]+"
|
|
|
org-not-done-regexp)
|