Browse Source

`org-planning-or-clock-line-re' is not buffer-local anymore

* lisp/org.el (org-planning-or-clock-line-re): Make it a defconst.
  It's no use to make it a buffer-local variable since variables on
  which it depends are not buffer-local anyway.
Nicolas Goaziou 12 years ago
parent
commit
07eaea26dd
1 changed files with 7 additions and 9 deletions
  1. 7 9
      lisp/org.el

+ 7 - 9
lisp/org.el

@@ -666,6 +666,13 @@ Changes become only effective after restarting Emacs."
   :group 'org-keywords
   :group 'org-keywords
   :type 'string)
   :type 'string)
 
 
+(defconst org-planning-or-clock-line-re (concat "^[ \t]*\\("
+						org-scheduled-string "\\|"
+						org-deadline-string "\\|"
+						org-closed-string "\\|"
+						org-clock-string "\\)")
+  "Matches a line with planning or clock info.")
+
 (defcustom org-comment-string "COMMENT"
 (defcustom org-comment-string "COMMENT"
   "Entries starting with this keyword will never be exported.
   "Entries starting with this keyword will never be exported.
 An entry can be toggled between COMMENT and normal with
 An entry can be toggled between COMMENT and normal with
@@ -4397,9 +4404,6 @@ Also put tags into group 4 if tags are present.")
 (defvar org-maybe-keyword-time-regexp nil
 (defvar org-maybe-keyword-time-regexp nil
   "Matches a timestamp, possibly preceded by a keyword.")
   "Matches a timestamp, possibly preceded by a keyword.")
 (make-variable-buffer-local 'org-maybe-keyword-time-regexp)
 (make-variable-buffer-local 'org-maybe-keyword-time-regexp)
-(defvar org-planning-or-clock-line-re nil
-  "Matches a line with planning or clock info.")
-(make-variable-buffer-local 'org-planning-or-clock-line-re)
 (defvar org-all-time-keywords nil
 (defvar org-all-time-keywords nil
   "List of time keywords.")
   "List of time keywords.")
 (make-variable-buffer-local 'org-all-time-keywords)
 (make-variable-buffer-local 'org-all-time-keywords)
@@ -4818,12 +4822,6 @@ but the stars and the body are.")
 		    "\\|" org-closed-string
 		    "\\|" org-closed-string
 		    "\\|" org-clock-string "\\)\\)?"
 		    "\\|" org-clock-string "\\)\\)?"
 		    " *\\([[<][0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^]\r\n>]*?[]>]\\|<%%([^\r\n>]*>\\)")
 		    " *\\([[<][0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^]\r\n>]*?[]>]\\|<%%([^\r\n>]*>\\)")
-	    org-planning-or-clock-line-re
-	    (concat "^[ \t]*\\("
-		    org-scheduled-string "\\|"
-		    org-deadline-string "\\|"
-		    org-closed-string "\\|"
-		    org-clock-string "\\)")
 	    org-all-time-keywords
 	    org-all-time-keywords
 	    (mapcar (lambda (w) (substring w 0 -1))
 	    (mapcar (lambda (w) (substring w 0 -1))
 		    (list org-scheduled-string org-deadline-string
 		    (list org-scheduled-string org-deadline-string