From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.devel Subject: Re: bug#23365 and Org-mode for 25.1 Date: Sat, 30 Apr 2016 08:48:45 +0100 Message-ID: <87pot7o7tu.fsf@russet.org.uk> References: <87wpnlq1xu.fsf@gmail.com> <83lh40287l.fsf@gnu.org> <83eg9rzh3q.fsf@gnu.org> <871t5ovgya.fsf_-_@russet.org.uk> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1462002577 11781 80.91.229.3 (30 Apr 2016 07:49:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 30 Apr 2016 07:49:37 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 30 09:49:24 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1awPeU-0003Jf-JP for ged-emacs-devel@m.gmane.org; Sat, 30 Apr 2016 09:49:22 +0200 Original-Received: from localhost ([::1]:57740 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awPeQ-0001O1-EO for ged-emacs-devel@m.gmane.org; Sat, 30 Apr 2016 03:49:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awPeH-00019K-PW for emacs-devel@gnu.org; Sat, 30 Apr 2016 03:49:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1awPe5-0005YG-UK for emacs-devel@gnu.org; Sat, 30 Apr 2016 03:49:04 -0400 Original-Received: from cloud103.planethippo.com ([31.216.48.48]:39206) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awPe4-0005Ui-C7 for emacs-devel@gnu.org; Sat, 30 Apr 2016 03:48:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:To:From; bh=hVTsZfAVrOZLpELPwCX/+TiZiO83SNMi4Reqf76k02c=; b=oIHwOsZogqnOLcPLFfbFrP62cs csRBu1Ojg/3Vk0mr5pk9vCPvdYh0sWpF6X4aERd2r7Lgl/FMpyyQVpWZLcEfri2vAFqiX2eqJfd2O B0MuRBahORlAQccmTFRRnT2oaBG1C8wrvGMmrH/zESIBluwAo1SQOmsd3XwRCMiSMGE7Thr2L4yYQ /0Avdgm/6BH+ft3hPuNKj8+vXZ6HZfLofIsVnunTMXiaYIm6Ch0Z1qao5D+KxOfovRVnIAXSqZ8o/ uT3BqvrbbsmrcEKwstHlruz5Emu3pIjuFtFVVnddI7OnooEzqDU9LVMuz0z0dsD4QuakiIuw0i1Oj XazGXm1w==; Original-Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:58272 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1awPdu-002kja-OU for emacs-devel@gnu.org; Sat, 30 Apr 2016 08:48:46 +0100 In-Reply-To: (John Wiegley's message of "Fri, 29 Apr 2016 14:23:50 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.93 (gnu/linux) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 31.216.48.48 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:203439 Archived-At: --=-=-= Content-Type: text/plain John Wiegley writes: >>>>>> Phillip Lord writes: > >> I've submitted a bug recently on org-mode (#23365) which is present in >> Emacs-25 head, but has been fixed in the org-mode on ELPA. > >> Is org-mode in core going to be sync'd before 25.1? > > No, I've spoken to the Org-mode maintainer about this, and it's too late in > the game for such a large upgrade. Org 8.3 has some rather major changes, and > we haven't had it in enough pretests to know what the impact will be now. > However, it's welcome in 25.2. Okay, no worries. I've made a patch based on this commit: http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=44c8cd7136e3fcd1e6bfa08895cac437b7a691fa identifed by Kaushal Modi on the org-mode mailing list. Is it okay to apply this backport to emacs-25 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-org-map-entries-Fix-org-agenda-prepare-buffers-call.patch >From 51d927a6479fdfca1ef58086d4fd70f394238f7d Mon Sep 17 00:00:00 2001 From: Phillip Lord Date: Sat, 30 Apr 2016 08:43:39 +0100 Subject: [PATCH] org-map-entries: Fix org-agenda-prepare-buffers call * lisp/org.el (org-map-entries): Check that buffer-file-name is non-nil before passing to org-agenda-prepare-buffers. This is a backport of commit 44c8cd7136e3fcd1e6bfa08895cac437b7a691fa from upstream org-mode. Addresses bug #23365. --- lisp/org/org.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org/org.el b/lisp/org/org.el index 231daa9..61bcb45 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -15069,7 +15069,7 @@ org-map-entries (if (not scope) (progn (org-agenda-prepare-buffers - (list (buffer-file-name (current-buffer)))) + (and buffer-file-name (list buffer-file-name))) (setq res (org-scan-tags func matcher todo-only start-level))) ;; Get the right scope (cond @@ -15081,7 +15081,7 @@ org-map-entries (setq scope (org-agenda-files t)) (setq scope (org-add-archive-files scope))) ((eq scope 'file) - (setq scope (list (buffer-file-name)))) + (setq scope (and buffer-file-name (list buffer-file-name)))) ((eq scope 'file-with-archives) (setq scope (org-add-archive-files (list (buffer-file-name)))))) (org-agenda-prepare-buffers scope) -- 2.8.1 --=-=-=--