* lisp/progmodes/ruby-mode.el: Bump the version to 1.2.

[gnu-emacs] / lisp / textmodes / texinfo.el

diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 16b7d21b37447a88b035e1201148d55745269735..52b9ab092ae40aea803d83520eb371b2019d1331 100644 (file)
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -1,7 +1,6 @@
 ;;; texinfo.el --- major mode for editing Texinfo files -*- coding: utf-8 -*-
 
-;; Copyright (C) 1985, 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Copyright (C) 1985, 1988-1993, 1996-1997, 2000-2012
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Robert J. Chassell
@@ -33,7 +32,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'tex-mode) (require 'cl))
+(eval-when-compile (require 'tex-mode))
 (defvar outline-heading-alist)
 
 (defgroup texinfo nil
@@ -319,11 +318,12 @@ chapter."
 
 (defconst texinfo-environments
   '("cartouche" "copying" "defcv" "deffn" "defivar" "defmac"
-    "defmethod" "defop" "defopt" "defspec" "deftp" "deftypefn"
-    "deftypefun" "deftypevar" "deftypevr" "defun" "defvar"
+    "defmethod" "defop" "defopt" "defspec" "deftp" "deftypecv"
+    "deftypefn" "deftypefun" "deftypeivar" "deftypemethod"
+    "deftypeop" "deftypevar" "deftypevr" "defun" "defvar"
     "defvr" "description" "detailmenu" "direntry" "display"
     "documentdescription" "enumerate" "example" "flushleft"
-    "flushright" "format" "ftable" "group" "ifclear" "ifset"
+    "flushright" "format" "ftable" "group" "html" "ifclear" "ifset"
     "ifhtml" "ifinfo" "ifnothtml" "ifnotinfo" "ifnotplaintext"
     "ifnottex" "ifplaintext" "iftex" "ignore" "itemize" "lisp"
     "macro" "menu" "multitable" "quotation" "smalldisplay"
@@ -676,7 +676,8 @@ Puts point on a blank line between them."
         (not (match-end 1)))))
 
 (defvar texinfo-enable-quote-macros "@\\(code\\|samp\\|kbd\\)\\>")
-(defvar texinfo-enable-quote-envs '("example\\>" "lisp\\>"))
+(defvar texinfo-enable-quote-envs
+  '("example\\>" "smallexample\\>" "lisp\\>"))
 (defun texinfo-insert-quote (&optional arg)
   "Insert the appropriate quote mark for Texinfo.
 Usually inserts the value of `texinfo-open-quote' (normally ``) or
@@ -1024,5 +1025,4 @@ You are prompted for the job number (use a number shown by a previous
 
 (provide 'texinfo)
 
-;; arch-tag: 005d7c38-43b9-4b7d-aa1d-aea69bae73e1
 ;;; texinfo.el ends here