From: Sašo Živanović Date: Fri, 30 Dec 2016 10:12:42 +0000 (+0100) Subject: Fix RefTeX to show table of contents for dtx files (tiny change) X-Git-Tag: emacs-26.0.90~950 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1e8bb313eaa98928dc258f4b903bb10c33c21642;p=emacs.git Fix RefTeX to show table of contents for dtx files (tiny change) * lisp/textmodes/reftex.el (reftex-compile-variables): Change the section regexp so that it accepts lines starting with the comment character. (tiny change) * lisp/textmodes/reftex-parse.el (reftex-parse-from-file): Filter gathered toc entries, accepting a commented entry if and only if the source file is a ".dtx" file. (tiny change) --- diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index a2de4166d24..af2810d72e8 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -270,7 +270,10 @@ of master file." (when (eq (char-before) ?\\) (backward-char)) ;; Insert in List (setq toc-entry (funcall reftex-section-info-function file)) - (when toc-entry + (when (and toc-entry + (eq ;; Either both are t or both are nil. + (= (char-after bound) ?%) + (string-suffix-p ".dtx" file))) ;; It can happen that section info returns nil (setq level (nth 5 toc-entry)) (setq highest-level (min highest-level level)) diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index 2de83a8e336..18b35981f82 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -1015,8 +1015,8 @@ This enforces rescanning the buffer on next use." ;; Calculate the regular expressions (let* ( ; (wbol "\\(\\`\\|[\n\r]\\)[ \t]*") - (wbol "\\(^\\)[ \t]*") ; Need to keep the empty group because - ; match numbers are hard coded + (wbol "\\(^\\)%?[ \t]*") ; Need to keep the empty group because + ; match numbers are hard coded (label-re (concat "\\(?:" (mapconcat 'identity reftex-label-regexps "\\|") "\\)"))