summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2011-07-18 08:45:41 +0200
committerBastien Guerry <bzg@altern.org>2011-07-18 09:42:16 +0200
commit52fd74798394ecc136464192b231ff62d538ed57 (patch)
tree88745fed843acbb616a62d60ae54746cc7e892a3
parentc3748fcd80ec53dc9b0db6e2ad17be6b14dd3bb9 (diff)
downloadorg-mode-52fd74798394ecc136464192b231ff62d538ed57.tar.gz
contrib/lisp: don't use `outline-regexp'.
Use `org-outline-regexp' or `org-outline-regexp-bol' instead. * org-toc.el (org-toc-before-first-heading-p, org-toc-show) (org-toc-get-headlines-status): Use `org-outline-regexp-bol'. * org-lparse.el (org-do-lparse): Use `org-outline-regexp-bol'. * org-export-generic.el (org-export-generic): Use `org-outline-regexp'.
-rw-r--r--contrib/lisp/org-export-generic.el2
-rwxr-xr-xcontrib/lisp/org-lparse.el2
-rw-r--r--contrib/lisp/org-toc.el6
3 files changed, 5 insertions, 5 deletions
diff --git a/contrib/lisp/org-export-generic.el b/contrib/lisp/org-export-generic.el
index 93755d7..4be0a20 100644
--- a/contrib/lisp/org-export-generic.el
+++ b/contrib/lisp/org-export-generic.el
@@ -846,7 +846,7 @@ underlined headlines. The default is 3."
(org-init-section-numbers)
(org-export-generic-check-section "top")
(while (setq line (pop lines))
- (when (and link-buffer (string-match "^\\*+ " line))
+ (when (and link-buffer (string-match org-outline-regexp-bol line))
(org-export-generic-push-links (nreverse link-buffer))
(setq link-buffer nil))
(setq wrap nil)
diff --git a/contrib/lisp/org-lparse.el b/contrib/lisp/org-lparse.el
index 6687726..7665591 100755
--- a/contrib/lisp/org-lparse.el
+++ b/contrib/lisp/org-lparse.el
@@ -791,7 +791,7 @@ version."
(while (setq line (pop lines) origline line)
(catch 'nextline
(when (and (org-lparse-current-environment-p 'quote)
- (string-match "^\\*+ " line))
+ (string-match org-outline-regexp-bol line))
(org-lparse-end-environment 'quote))
(when (org-lparse-current-environment-p 'quote)
diff --git a/contrib/lisp/org-toc.el b/contrib/lisp/org-toc.el
index 2c5eb9c..67e408e 100644
--- a/contrib/lisp/org-toc.el
+++ b/contrib/lisp/org-toc.el
@@ -210,7 +210,7 @@ specified, then make `org-toc-recenter' use this value."
(defun org-toc-before-first-heading-p ()
"Before first heading?"
(save-excursion
- (null (re-search-backward "^\\*+ " nil t))))
+ (null (re-search-backward org-outline-regexp-bol nil t))))
;;;###autoload
(defun org-toc-show (&optional depth position)
@@ -226,7 +226,7 @@ specified, then make `org-toc-recenter' use this value."
(let ((pos (or position
(save-excursion
(if (org-toc-before-first-heading-p)
- (progn (re-search-forward "^\\*+ " nil t)
+ (progn (re-search-forward org-outline-regexp-bol nil t)
(match-beginning 0))
(point))))))
(setq org-toc-cycle-global-status org-cycle-global-status)
@@ -441,7 +441,7 @@ status."
(goto-char (point-min))
(while (and (not (eobp))
(goto-char (next-overlay-change (point))))
- (when (looking-at "^\\*+ ")
+ (when (looking-at org-outline-regexp-bol)
(add-to-list
'output
(cons (buffer-substring-no-properties