From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Subject: [PATCH] Check marker is valid before use Date: Fri, 21 Oct 2011 03:56:31 +0800 Message-ID: Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([140.186.70.92]:52316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGyjT-0002CA-KB for emacs-orgmode@gnu.org; Thu, 20 Oct 2011 15:56:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RGyjN-0000mz-9E for emacs-orgmode@gnu.org; Thu, 20 Oct 2011 15:56:46 -0400 Received: from lo.gmane.org ([80.91.229.12]:46376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGyjM-0000ml-V0 for emacs-orgmode@gnu.org; Thu, 20 Oct 2011 15:56:45 -0400 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1RGyjK-0000Mi-Rc for emacs-orgmode@gnu.org; Thu, 20 Oct 2011 21:56:42 +0200 Received: from 222.130.138.253 ([222.130.138.253]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 20 Oct 2011 21:56:42 +0200 Received: from sdl.web by 222.130.138.253 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 20 Oct 2011 21:56:42 +0200 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-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org 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. -- 1.7.7