Commits

Anonymous committed 68cfb9d

texinfo.el: Synch with FSF 20.5.
(texinfo-environment-revexp): Add more regexp.
My patch <87so0s7qo2.fsf@dp50.ecc.u-tokyo.ac.jp>,
[texinfo] texinfo.el sync

Comments (0)

Files changed (2)

+1999-12-24  Yoshiki Hayashi  <t90553@mail.ecc.u-tokyo.ac.jp>
+
+	* texinfo.el: Synch with FSF 20.5.
+	Change TexInfo to Texinfo.
+	(texinfo-environment-revexp): Add more regexp.
+
 1999-11-25  Yoshiki Hayashi  <t90553@mail.ecc.u-tokyo.ac.jp>
 
 	* texinfmt.el: Handle @ifnottex.
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;;; Synched up with: FSF 20.2.
+;;; Synched up with: FSF 20.5.
 
 ;;; Code:
 
   '((nil "^@node[ \t]+\\([^,\n]*\\)" 1)
     ("Chapters" "^@chapter[ \t]+\\(.*\\)$" 1))
 
-  "Imenu generic expression for TexInfo mode.  See `imenu-generic-expression'.")
+  "Imenu generic expression for Texinfo mode.  See `imenu-generic-expression'.")
 
 (defvar texinfo-font-lock-keywords
   '(;; All but the first 2 had an OVERRIDE of t.
     ("@\\(file\\|kbd\\|key\\|url\\|email\\){\\([^}]+\\)" 2 font-lock-string-face)
     ("@\\(samp\\|code\\|var\\|math\\){\\([^}]+\\)"
      2 font-lock-variable-name-face)
-    ("@\\(cite\\|xref\\|pxref\\){\\([^}]+\\)" 2 font-lock-reference-face)
+    ("@\\(cite\\|x?ref\\|pxref\\){\\([^}]+\\)" 2 font-lock-reference-face)
     ("@\\(end\\|itemx?\\) +\\(.+\\)" 2 font-lock-function-name-face keep)
     )
   "Additional expressions to highlight in TeXinfo mode.")
    "^@"
    "\\("
    "cartouche\\|"
+   "defcv\\|"
+   "deffn\\|"
+   "defivar\\|"
+   "defmac\\|"
+   "defmethod\\|"
+   "defopt?\\|"
+   "defspec\\|"
+   "deftp\\|"
+   "deftypefu?n\\|"
+   "deftypei?var\\|"
+   "deftypemethod\\|"
+   "deftypeop\\|"
+   "defun\\|"
+   "defva?r\\|"
+   "detailmenu\\|"
+   "direntry\\|"
    "display\\|"
    "end\\|"
    "enumerate\\|"
    "flushright\\|"
    "format\\|"
    "group\\|"
+   "ifclear\\|"
    "ifhtml\\|"
    "ifinfo\\|"
+   "ifnottex\\|"
+   "ifset\\|"
    "iftex\\|"
    "ignore\\|"
    "itemize\\|"
    "lisp\\|"
    "macro\\|"
+   "menu\\|"
    "multitable\\|"
    "quotation\\|"
    "smallexample\\|"
    "smalllisp\\|"
-   "tex"
+   "tex\\|"
+   "titlepage"
    "\\)")
-  "Regexp for environment-like TexInfo list commands.
+  "Regexp for environment-like Texinfo list commands.
    Subexpression 1 is what goes into the corresponding `@end' statement.")
 
 ;; The following texinfo-insert-@end command not only inserts a SPC
   (interactive "r")
   (require 'tex-mode)
   (let ((tex-command texinfo-tex-command)
-	(tex-trailer "@bye\n"))
+	(tex-trailer texinfo-tex-trailer))
     (tex-region beg end)))
 
 (defun texinfo-tex-buffer ()
   "Run TeX on visited file, once or twice, to make a correct `.dvi' file."
   (interactive)
   (require 'tex-mode)
-  (let ((tex-command texinfo-texi2dvi-command))
+  (let ((tex-command texinfo-texi2dvi-command)
+	;; Disable tex-start-options-string.  texi2dvi would not
+	;; understand anything specified here.
+	(tex-start-options-string ""))
     (tex-buffer)))
 
 (defun texinfo-texindex ()