(texinfo-chapter-level-regexp)

(texinfo-filter): Removed (moved to texinfo.el).

2 files changed, 16 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34d63e4b520..1db6c2539eb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2000-12-08  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * textmodes/texnfo-upd.el (texinfo-chapter-level-regexp)
+        (texinfo-filter): Removed (moved to texinfo.el).
+
+        * textmodes/texinfo.el: Move the (require 'cl) to the front of the
+        file where it's more visible.
+        (texinfo-filter, texinfo-chapter-level-regexp): New variables
+        moved from texnfo-upd.el (for AUCTeX's compatibility, originally).
+        (texinfo-mode): Use texinfo-chapter-level-regexp for page-delimiter.
+        (texinfo-inside-macro-p): Only catch `scan-error's.
+        (texinfo-inside-env-p): Make better use of the match info.
+        (texinfo-insert-quote): Collapse calls to `texinfo-inside-macro-p'.
+        (texinfo-insert-@end): Slight re-organization.
+        Also remove useless `looking-at' call.
+
 2000-12-08  Andrew Innes  <andrewi@gnu.org>
 
         * w32-fns.el: Add clipboard support from term/w32-win.el, so it is
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index 0c59eadfcc7..f964e411aa6 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -1122,15 +1122,6 @@ end of that region; it limits the search."
   "^@\\(chapter \\|sect\\|subs\\|subh\\|unnum\\|major\\|chapheading \\|heading \\|appendix\\)"
   "Regexp matching chapter, section, other headings (but not the top node).")
 
-(defun texinfo-filter (section list)
-  (let (res)
-    (dolist (x list) (if (eq section (cadr x)) (push (car x) res)))
-    res))
-
-(defvar texinfo-chapter-level-regexp
-  (regexp-opt (texinfo-filter 2 texinfo-section-list))
-  "Regular expression matching just the Texinfo chapter level headings.")
-
 (defvar texinfo-section-level-regexp
   (regexp-opt (texinfo-filter 3 texinfo-section-list))
   "Regular expression matching just the Texinfo section level headings.")