From 52fd74798394ecc136464192b231ff62d538ed57 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 18 Jul 2011 08:45:41 +0200 Subject: [PATCH] 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'. --- contrib/lisp/org-export-generic.el | 2 +- contrib/lisp/org-lparse.el | 2 +- contrib/lisp/org-toc.el | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/lisp/org-export-generic.el b/contrib/lisp/org-export-generic.el index 93755d7b4..4be0a20d2 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 668772600..7665591ce 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 2c5eb9c67..67e408e62 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