From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <cdominik@newartisans.com>
Subject: [Accepted]  Check marker is valid before use
Date: Fri, 21 Oct 2011 10:09:51 +0200 (CEST)
Message-ID: <20111021080951.F06D65B30A2@u016822.science.uva.nl>
References: <m1ipnj8mj4.fsf@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:49942)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1RHAAu-0001yj-BX
	for emacs-orgmode@gnu.org; Fri, 21 Oct 2011 04:09:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1RHAAs-0003uR-1y
	for emacs-orgmode@gnu.org; Fri, 21 Oct 2011 04:09:56 -0400
Received: from u016822.science.uva.nl ([146.50.39.34]:61857)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1RHAAr-0003uN-Nq
	for emacs-orgmode@gnu.org; Fri, 21 Oct 2011 04:09:54 -0400
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

Patch 994 (http://patchwork.newartisans.com/patch/994/) is now "Accepted".

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3Cm1ipnj8mj4.fsf%40gmail.com%3E

Here is the original message containing the patch:

> Content-Type: text/plain; charset="utf-8"
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Subject: [O] Check marker is valid before use
> Date: Fri, 21 Oct 2011 00:56:31 -0000
> From: Leo <sdl.web@gmail.com>
> X-Patchwork-Id: 994
> Message-Id: <m1ipnj8mj4.fsf@gmail.com>
> To: emacs-orgmode@gnu.org
> 
> lisp/org-agenda.el |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
> 
> 
> diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
> index bf03b68c..f4b8bcbf 100644
> --- a/lisp/org-agenda.el
> +++ b/lisp/org-agenda.el
> @@ -6784,13 +6784,13 @@ (defun org-agenda-previous-line ()
>  (defun org-agenda-do-context-action ()
>    "Show outline path and, maybe, follow mode window."
>    (let ((m (org-get-at-bol 'org-marker)))
> -    (if (and org-agenda-follow-mode m)
> -	(if org-agenda-follow-indirect
> -	    (org-agenda-tree-to-indirect-buffer)
> -	  (org-agenda-show)))
> -    (if (and m org-agenda-show-outline-path)
> -	(org-with-point-at m
> -	  (org-display-outline-path t)))))
> +    (when (and (markerp m) (marker-buffer m))
> +      (and org-agenda-follow-mode
> +	   (if org-agenda-follow-indirect
> +	       (org-agenda-tree-to-indirect-buffer)
> +	     (org-agenda-show)))
> +      (and org-agenda-show-outline-path
> +	   (org-with-point-at m (org-display-outline-path t))))))
>  
>  (defun org-agenda-show-priority ()
>    "Show the priority of the current item.
>