From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: Bug: Agenda has no tasks in master [9.1.13 (release_9.1.13-738-g673165.dirty @ c:/D-Drive/bin/org-mode/lisp/)] Date: Fri, 11 May 2018 15:40:03 -0400 Message-ID: <87603urnfw.fsf@norang.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fHDtr-0007W3-LC for emacs-orgmode@gnu.org; Fri, 11 May 2018 15:40:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fHDtn-0000P9-Nr for emacs-orgmode@gnu.org; Fri, 11 May 2018 15:40:19 -0400 Received: from pmta2.delivery6.ore.mailhop.org ([54.200.129.228]:40319) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fHDtn-0000He-HR for emacs-orgmode@gnu.org; Fri, 11 May 2018 15:40:15 -0400 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: emacs-orgmode@gnu.org, Aaron Ecay Hi Aaron, I updated to the latest master this morning and my agenda no longer has any tasks in it. I think this commit breaks my agenda: commit c9dd7a6a9de34b8094ad6a419260fcc1214cc791 (HEAD) Author: Aaron Ecay Date: Thu May 10 01:35:08 2018 +0100 org-agenda: one-armed .if. -> .when. * lisp/org-agenda.el (org-agenda-mode): (org-agenda-undo, org-agenda): (org-agenda-get-restriction-and-command): (org-batch-agenda-csv, org-fix-agenda-info): (org-agenda-get-some-entry-text): (org-agenda-prepare, org-agenda-finalize): (org-agenda-fontify-priorities, org-agenda-entry-text-hide): (org-agenda-list, org-agenda-ndays-to-span): (org-search-view, org-todo-list): (org-tags-view, org-modify-diary-entry-string): (org-agenda-get-day-entries, org-agenda-get-progress): (org-agenda-get-deadlines, org-prefix-category-max-length): (org-agenda-format-item, org-agenda-fix-displayed-tags): (org-compile-prefix-format): (org-agenda-before-sorting-filter-function): (org-agenda-limit-interactively, org-cmp-time): (org-agenda-set-restriction-lock-from-agenda): (org-agenda-get-represented-tags, org-agenda-filter-apply): (org-agenda-filter-top-headline-apply): (org-agenda-remove-filter, org-agenda-compute-starting-span): (org-unhighlight, org-unhighlight-once): (org-agenda-show-tags, org-agenda-check-no-diary): (org-agenda-date-later-minutes, org-agenda-diary-entry-in-org-file): (org-agenda-add-entry-to-org-agenda-diary-file): (org-agenda-bulk-unmark, org-agenda-to-appt): Convert .if. without .else. to .when,. or .unless. in the case of .(if (not ...)). (org-batch-agenda-csv): Also convert while-catch to dolist. (org-agenda-prepare): Also simplify a quasiquoted structure. (org-agenda-entry-text-hide): Also convert a bogus .mapcar. to .mapc.. (org-compile-prefix-format): Also convert sequential .if.s to .cl-case.. The following hunk is NOT a one-armed if and you lost the else part (the last - line): diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index c5f0bbd29..2f93d4b0b 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -4750,13 +4750,13 @@ The prefix arg TODO-ONLY limits the search to TODO entries." (when (and (stringp match) (not (string-match "\\S-" match))) (setq match nil)) (catch 'exit - (if org-agenda-sticky - (setq org-agenda-buffer-name - (if (stringp match) - (format "*Org Agenda(%s:%s)*" - (or org-keys (or (and todo-only "M") "m")) match) - (format "*Org Agenda(%s)*" (or (and todo-only "M") "m"))))) - (setq matcher (org-make-tags-matcher match)) + ;; TODO: this code is repeated a lot... + (when org-agenda-sticky + (setq org-agenda-buffer-name + (if (stringp match) + (format "*Org Agenda(%s:%s)*" + (or org-keys (or (and todo-only "M") "m")) match) + (format "*Org Agenda(%s)*" (or (and todo-only "M") "m"))))) ;; Prepare agendas (and `org-tag-alist-for-agenda') before ;; expanding tags within `org-make-tags-matcher' (org-agenda-prepare (concat "TAGS " match)) When I revert this change my agenda works again. Please fix :) Thanks, Bernt Emacs : GNU Emacs 25.1.1 (x86_64-w64-mingw32) of 2016-09-17 Package: Org mode version 9.1.13 (release_9.1.13-738-g673165.dirty @ c:/D-Drive/bin/org-mode/lisp/)