On Sat, Dec 30, 2017 at 4:10 AM, Bastien <b...@gnu.org> wrote:
> Hi Allen,
>
> thanks for the patch, it looks good.
>
> Can you provide it with a changelog?  Like for those two:
>
> https://code.orgmode.org/bzg/org-mode/commit/b9b921716ba1d2a564bb9443427dfb21bb609e05
> https://code.orgmode.org/bzg/org-mode/commit/da83e7d583895976a2398becbb995bcce1f729be

Oops, done.  Attached new patch.

> I assume the email address darkfeline AT felesatra DOT moe belongs
> to you, in which case you don't need to add "TINYCHANGE" at the end
> of the changelog message since your FSF papers are signed.

Yes, that's under a domain that I own so I don't rely on Gmail to
receive email (although I often send with Gmail to avoid spam filter
issues, alas).

You can find my public key/identity on, e.g. the MIT key servers.

>
> Thanks!
>
> --
>  Bastien
From 21d8d507474ac3faa5b1ea9dfa7aa3647cddd8af Mon Sep 17 00:00:00 2001
From: Allen Li <darkfel...@felesatra.moe>
Date: Sat, 30 Dec 2017 03:41:51 -0800
Subject: [PATCH] Remove agenda-archives even with buffer restriction

* lisp/org-agenda.el (org-search-view): Remove agenda-archives even
  with buffer restriction
---
 lisp/org-agenda.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 888818630..7f3b9d0ca 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4482,9 +4482,9 @@ is active."
       (setq files (org-agenda-files nil 'ifmode))
       ;; Add `org-agenda-text-search-extra-files' unless there is some
       ;; restriction.
-      (unless (get 'org-agenda-files 'org-restrict)
-	(when (eq (car org-agenda-text-search-extra-files) 'agenda-archives)
-	  (pop org-agenda-text-search-extra-files)
+      (when (eq (car org-agenda-text-search-extra-files) 'agenda-archives)
+	(pop org-agenda-text-search-extra-files)
+	(unless (get 'org-agenda-files 'org-restrict)
 	  (setq files (org-add-archive-files files))))
       ;; Uniquify files.  However, let `org-check-agenda-file' handle
       ;; non-existent ones.
-- 
2.15.1

Reply via email to