From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan =?iso-8859-1?Q?Reich=F6r?= Subject: [PATCH]: New Add defun org-mode-or-derived-mode-p Date: Fri, 02 Sep 2011 13:09:09 +0200 Message-ID: Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([140.186.70.92]:55053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzRcm-0005P1-5U for emacs-orgmode@gnu.org; Fri, 02 Sep 2011 07:09:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzRcl-0000ta-5G for emacs-orgmode@gnu.org; Fri, 02 Sep 2011 07:09:28 -0400 Received: from lo.gmane.org ([80.91.229.12]:53654) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzRck-0000tQ-PE for emacs-orgmode@gnu.org; Fri, 02 Sep 2011 07:09:27 -0400 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1QzRcj-0007d2-6o for emacs-orgmode@gnu.org; Fri, 02 Sep 2011 13:09:25 +0200 Received: from 193.186.169.68 ([193.186.169.68]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 02 Sep 2011 13:09:25 +0200 Received: from stefan by 193.186.169.68 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 02 Sep 2011 13:09:25 +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 2011-09-02 Stefan Reichoer Add org-mode-or-derived-mode-p to support org-mode derived modes * org-macs.el (org-mode-or-derived-mode-p): New defun * org-src.el (org-edit-src-code): Use org-mode-or-derived-mode-p * org.el (org-entry-properties): Use org-mode-or-derived-mode-p instead of org-mode-p git diff -M HEAD M lisp/org-macs.el M lisp/org-src.el M lisp/org.el diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 13aff02..7603b42 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -276,6 +276,10 @@ we turn off invisibility temporarily. Use this in a `let' form." "Check if the current buffer is in Org-mode." (eq major-mode 'org-mode)) +(defun org-mode-or-derived-mode-p () + "Check if the current buffer is in Org-mode or a derived mode." + (if (derived-mode-p 'org-mode) t nil)) + (defsubst org-last (list) "Return the last element of LIST." (car (last list))) diff --git a/lisp/org-src.el b/lisp/org-src.el index 0e8b1b1..a62f8da 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -215,7 +215,7 @@ buffer." (case-fold-search t) (info (org-edit-src-find-region-and-lang)) (full-info (org-babel-get-src-block-info)) - (org-mode-p (or (org-mode-p) (derived-mode-p 'org-mode))) + (org-mode-p (org-mode-or-derived-mode-p)) (beg (make-marker)) (end (make-marker)) (allow-write-back-p (null code)) diff --git a/lisp/org.el b/lisp/org.el index d63b854..d82425c 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -13828,7 +13828,7 @@ things up because then unnecessary parsing is avoided." beg end range props sum-props key key1 value string clocksum) (save-excursion (when (condition-case nil - (and (org-mode-p) (org-back-to-heading t)) + (and (org-mode-or-derived-mode-p) (org-back-to-heading t)) (error nil)) (setq beg (point)) (setq sum-props (get-text-property (point) 'org-summaries))