diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-09-21 00:42:47 +0200 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-09-21 00:42:47 +0200 |
| commit | 5d8e0d5d1444141bc4234232929f942d92c6d43b (patch) | |
| tree | 8ef78ad924da6f35af2724b1f3a74580677a79f5 /lisp/textmodes/reftex-parse.el | |
| parent | f5ea3ba7ccf9174cbb1c115cf185632cfe44f655 (diff) | |
| download | emacs-5d8e0d5d1444141bc4234232929f942d92c6d43b.tar.gz emacs-5d8e0d5d1444141bc4234232929f942d92c6d43b.tar.bz2 emacs-5d8e0d5d1444141bc4234232929f942d92c6d43b.zip | |
* lisp/textmodes/reftex-parse.el (reftex-what-macro)
(reftex-context-substring): Let-bind forward-sexp-function to nil
since we don't need/want to treat \begin...\end as a block.
Fixes: debbugs:7053
Diffstat (limited to 'lisp/textmodes/reftex-parse.el')
| -rw-r--r-- | lisp/textmodes/reftex-parse.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 4854ca7ba3b..fa0275b58be 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -385,7 +385,7 @@ of master file." (defun reftex-section-info (file) ;; Return a section entry for the current match. - ;; Carefull: This function expects the match-data to be still in place! + ;; Careful: This function expects the match-data to be still in place! (let* ((marker (set-marker (make-marker) (1- (match-beginning 3)))) (macro (reftex-match-string 3)) (prefix (save-match-data @@ -778,13 +778,15 @@ of master file." (narrow-to-region (max (point-min) bound) (point-max)) ;; move back out of the current parenthesis (while (condition-case nil - (progn (up-list -1) t) + (let ((forward-sexp-function nil)) + (up-list -1) t) (error nil)) (setq cnt 1 cnt-opt 0) ;; move back over any touching sexps (while (and (reftex-move-to-previous-arg bound) (condition-case nil - (progn (backward-sexp) t) + (let ((forward-sexp-function nil)) + (backward-sexp) t) (error nil))) (if (eq (following-char) ?\[) (incf cnt-opt)) (incf cnt)) @@ -965,15 +967,14 @@ of master file." (if (re-search-forward "\\\\end{" nil t) (match-beginning 0) (point-max)))))) - ((or (= (preceding-char) ?\{) - (= (preceding-char) ?\[)) + ((memq (preceding-char) '(?\{ ?\[)) ;; Inside a list - get only the list. (buffer-substring-no-properties (point) (min (+ (point) 150) (point-max) (condition-case nil - (progn + (let ((forward-sexp-function nil)) ;Unneeded fanciness. (up-list 1) (1- (point))) (error (point-max)))))) |