Mercurial > emacs
changeset 53648:cb1748b5a52b
(outline-insert-heading): Tighten up match.
(outline-demote, outline-move-subtree-down): Don't assume anything
about outline-regexp.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 21 Jan 2004 03:25:37 +0000 |
| parents | 5e31be49b42d |
| children | 87277b14c615 |
| files | lisp/outline.el |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/outline.el Wed Jan 21 03:09:06 2004 +0000 +++ b/lisp/outline.el Wed Jan 21 03:25:37 2004 +0000 @@ -1,6 +1,6 @@ ;;; outline.el --- outline mode commands for Emacs -;; Copyright (C) 1986, 93, 94, 95, 97, 2000, 2001 +;; Copyright (C) 1986, 93, 94, 95, 97, 2000, 01, 2004 ;; Free Software Foundation, Inc. ;; Maintainer: FSF @@ -410,7 +410,8 @@ (or (caar outline-heading-alist) "") (match-string 0))))) (unless (or (string-match "[ \t]\\'" head) - (not (string-match outline-regexp (concat head " ")))) + (not (string-match (concat "\\`\\(?:" outline-regexp "\\)") + (concat head " ")))) (setq head (concat head " "))) (unless (bolp) (end-of-line) (newline)) (insert head) @@ -486,7 +487,8 @@ ;; Bummer!! There is no lower heading in the buffer. ;; Let's try to invent one by repeating the first char. (let ((new-head (concat (substring head 0 1) head))) - (if (string-match (concat "\\`" outline-regexp) new-head) + (if (string-match (concat "\\`\\(?:" outline-regexp "\\)") + new-head) ;; Why bother checking that it is indeed lower level ? new-head ;; Didn't work: keep it as is so it's still a heading. @@ -557,7 +559,7 @@ (defun outline-move-subtree-down (&optional arg) "Move the currrent subtree down past ARG headlines of the same level." (interactive "p") - (let ((re (concat "^" outline-regexp)) + (let ((re (concat "^\\(?:" outline-regexp "\\)")) (movfunc (if (> arg 0) 'outline-get-next-sibling 'outline-get-last-sibling)) (ins-point (make-marker))