From e31e89430aa9f1b5de545c3bfd1503acc848d527 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 1 Nov 2011 11:40:11 +0100 Subject: [PATCH] Globalize some variables to make them available in buffers not in Org mode * lisp/org.el (org-heading-regexp, org-heading-keyword-regexp-format, org-heading-keyword-maybe-regexp-format): Globalize variables so they are accessible even in buffers not in Org mode. --- lisp/org.el | 38 ++++++++++++++++---------------------- 1 files changed, 16 insertions(+), 22 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 318ccfd..c3c7bdf 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4246,10 +4246,6 @@ collapsed state." ;;; Variables for pre-computed regular expressions, all buffer local -(defvar org-heading-regexp nil - "Matches an headline. -Stars are put in group 1 and the trimmed body in group 2.") -(make-variable-buffer-local 'org-heading-regexp) (defvar org-drawer-regexp nil "Matches first line of a hidden block.") (make-variable-buffer-local 'org-drawer-regexp) @@ -4273,18 +4269,6 @@ group 3: Priority cookie group 4: True headline group 5: Tags") (make-variable-buffer-local 'org-complex-heading-regexp) -(defvar org-heading-keyword-regexp-format nil - "Printf format to make regexp to match an headline with some keyword. -This regexp will match the headline of any node which has the -exact keyword that is put into the format. The keyword isn't in -any group by default, but the stars and the body are.") -(make-variable-buffer-local 'org-heading-keyword-regexp-format) -(defvar org-heading-keyword-maybe-regexp-format nil - "Printf format to make regexp to match an headline with some keyword. -This regexp can match any headline with the specified keyword, or -a without a keyword. The keyword isn't in any group by default, -but the stars and the body are.") -(make-variable-buffer-local 'org-heading-keyword-maybe-regexp-format) (defvar org-complex-heading-regexp-format nil "Printf format to make regexp to match an exact headline. This regexp will match the headline of any node which has the @@ -4661,12 +4645,6 @@ means to push this value onto the list in the variable.") (concat "\\(" (mapconcat 'regexp-quote org-not-done-keywords "\\|") "\\)") - org-heading-regexp - "^\\(\\*+\\)\\(?: +\\(.*?\\)\\)?[ \t]*$" - org-heading-keyword-regexp-format - "^\\(\\*+\\)\\(?: +%s\\)\\(?: +\\(.*?\\)\\)?[ \t]*$" - org-heading-keyword-maybe-regexp-format - "^\\(\\*+\\)\\(?: +%s\\)?\\(?: +\\(.*?\\)\\)?[ \t]*$" org-not-done-heading-regexp (format org-heading-keyword-regexp-format org-not-done-regexp) org-todo-line-regexp @@ -4854,6 +4832,22 @@ This variable is set by `org-before-change-function'. This is similar to `org-outline-regexp' but additionally makes sure that we are at the beginning of the line.") +(defconst org-heading-regexp "^\\(\\*+\\)\\(?: +\\(.*?\\)\\)?[ \t]*$" + "Matches an headline, putting stars and text into groups. +Stars are put in group 1 and the trimmed body in group 2.") +(defconst org-heading-keyword-regexp-format + "^\\(\\*+\\)\\(?: +%s\\)\\(?: +\\(.*?\\)\\)?[ \t]*$" + "Printf format for a regexp matching an headline with some keyword. +This regexp will match the headline of any node which has the +exact keyword that is put into the format. The keyword isn't in +any group by default, but the stars and the body are.") +(defconst org-heading-keyword-maybe-regexp-format + "^\\(\\*+\\)\\(?: +%s\\)?\\(?: +\\(.*?\\)\\)?[ \t]*$" + "Printf format for a regexp matching an headline, possibly with some keyword. +This regexp can match any headline with the specified keyword, or +without a keyword. The keyword isn't in any group by default, +but the stars and the body are.") + ;;;###autoload (define-derived-mode org-mode outline-mode "Org" "Outline-based notes management and organizer, alias -- 1.7.7.1