[AUCTeX-diffs] Changes to auctex/tex.el,v

[Ralf Angeli]

CVSROOT:        /cvsroot/auctex
Module name:    auctex
Changes by:     Ralf Angeli <angeli>    10/03/28 17:18:16

Index: tex.el
===================================================================
RCS file: /cvsroot/auctex/auctex/tex.el,v
retrieving revision 5.664
retrieving revision 5.665
diff -u -b -r5.664 -r5.665
--- tex.el      27 Mar 2010 18:41:13 -0000      5.664
+++ tex.el      28 Mar 2010 17:18:15 -0000      5.665
@@ -26,9 +26,7 @@
 
 ;;; Commentary:
 
-;; This file provides AUCTeX support for plain TeX as well as basic
-;; functions used by other AUCTeX modes (e.g. for LaTeX, Texinfo and
-;; ConTeXt).
+;; This file provides basic functions used by the AUCTeX modes.
 
 ;;; Code:
 
@@ -2358,18 +2356,6 @@
 (defvar TeX-grcl "}" "The TeX group closing character.")
  (make-variable-buffer-local 'TeX-grcl)
 
-(defcustom plain-TeX-enable-toolbar t
-  "Enable TeX tool bar in plain TeX mode."
-  :group 'TeX-tool-bar
-  :type 'boolean)
-
-(defun plain-TeX-maybe-install-toolbar ()
-  "Conditionally install tool bar buttons for plain TeX mode.
-Install tool bar if `plain-TeX-enable-toolbar' is non-nil."
-  (when plain-TeX-enable-toolbar
-    ;; Defined in `tex-bar.el':
-    (TeX-install-toolbar)))
-
 ;;; Symbols
 
 ;; Must be before keymaps.
@@ -2931,95 +2917,6 @@
                (TeX-master-file nil nil t))
              (TeX-update-style t)) nil t))
 
-;;; Plain TeX mode
-
-(defcustom plain-TeX-clean-intermediate-suffixes
-  TeX-clean-default-intermediate-suffixes
-  "List of regexps matching suffixes of intermediate files to be deleted.
-The regexps will be anchored at the end of the file name to be matched,
-i.e. you do _not_ have to cater for this yourself by adding \\\\' or $."
-  :type '(repeat regexp)
-  :group 'TeX-command)
-
-(defcustom plain-TeX-clean-output-suffixes TeX-clean-default-output-suffixes
-  "List of regexps matching suffixes of output files to be deleted.
-The regexps will be anchored at the end of the file name to be matched,
-i.e. you do _not_ have to cater for this yourself by adding \\\\' or $."
-  :type '(repeat regexp)
-  :group 'TeX-command)
-
-(defcustom plain-TeX-mode-hook nil
-  "A hook run in plain TeX mode buffers."
-  :type 'hook
-  :group 'TeX-misc)
-
-;;;###autoload
-(defun TeX-plain-tex-mode ()
-  "Major mode in AUCTeX for editing plain TeX files.
-See info under AUCTeX for documentation.
-
-Special commands:
-\\{plain-TeX-mode-map}
-
-Entering `plain-tex-mode' calls the value of `text-mode-hook',
-then the value of `TeX-mode-hook', and then the value
-of plain-TeX-mode-hook."
-  (interactive)
-  (plain-TeX-common-initialization)
-  (setq major-mode 'plain-tex-mode)
-  (use-local-map plain-TeX-mode-map)
-  (easy-menu-add plain-TeX-mode-menu plain-TeX-mode-map)
-  (easy-menu-add plain-TeX-mode-command-menu plain-TeX-mode-map)
-  (setq TeX-base-mode-name "TeX")
-  (setq TeX-command-default "TeX")
-  (setq TeX-sentinel-default-function 'TeX-TeX-sentinel)
-  (add-hook 'tool-bar-mode-on-hook 'plain-TeX-maybe-install-toolbar nil t)
-  (when (if (featurep 'xemacs)
-           (featurep 'toolbar)
-         (and (boundp 'tool-bar-mode) tool-bar-mode))
-    (plain-TeX-maybe-install-toolbar))
-  (TeX-run-mode-hooks 'text-mode-hook 'TeX-mode-hook 'plain-TeX-mode-hook)
-  (TeX-set-mode-name))
-
-(defun plain-TeX-common-initialization ()
-  "Common initialization for plain TeX like modes."
-  (VirTeX-common-initialization)
-  (set-syntax-table TeX-mode-syntax-table)
-  (setq paragraph-start
-       (concat
-        "\\(^[ \t]*$"
-        "\\|" (regexp-quote TeX-esc) "par\\|"
-        "^[ \t]*"
-        (regexp-quote TeX-esc)
-        "\\("
-        "begin\\|end\\|part\\|chapter\\|"
-        "section\\|subsection\\|subsubsection\\|"
-        "paragraph\\|include\\|includeonly\\|"
-        "tableofcontents\\|appendix\\|label\\|caption\\|"
-        "\\[\\|\\]"                    ; display math delimitors
-        "\\)"
-        "\\|"
-        "^[ \t]*\\$\\$"                ; display math delimitor
-        "\\)" ))
-  (setq paragraph-separate
-       (concat
-        "[ \t]*"
-        "\\("
-        (regexp-quote TeX-esc) "par\\|"
-        "%\\|"
-        "$\\|"
-        "\\$\\$\\|"
-        (regexp-quote TeX-esc)
-        "\\("
-        "begin\\|end\\|label\\|caption\\|part\\|chapter\\|"
-        "section\\|subsection\\|subsubsection\\|"
-        "paragraph\\|include\\|includeonly\\|"
-        "tableofcontents\\|appendix\\|" (regexp-quote TeX-esc)
-        "\\)"
-        "\\)"))
-  (setq TeX-header-end (regexp-quote "%**end of header"))
-  (setq TeX-trailer-start (regexp-quote (concat TeX-esc "bye")))
-  (TeX-run-style-hooks "TEX"))
 
 ;;; Hilighting
 
@@ -3335,17 +3232,21 @@
 
 (defvar plain-TeX-auto-regexp-list
   (let ((token TeX-token-char))
-    `((,(concat "\\\\def\\\\\\(" token "+\\)address@hidden") 1 
TeX-auto-symbol-check)
-      (,(concat "\\\\let\\\\\\(" token "+\\)address@hidden") 1 
TeX-auto-symbol-check)
+    `((,(concat "\\\\def\\\\\\(" token "+\\)address@hidden")
+       1 TeX-auto-symbol-check)
+      (,(concat "\\\\let\\\\\\(" token "+\\)address@hidden")
+       1 TeX-auto-symbol-check)
       (,(concat "\\\\font\\\\\\(" token "+\\)address@hidden") 1 
TeX-auto-symbol)
       (,(concat "\\\\chardef\\\\\\(" token "+\\)address@hidden") 1 
TeX-auto-symbol)
-      (,(concat "\\\\new\\(?:count\\|dimen\\|muskip\\|skip\\)\\\\\\(" token 
"+\\)address@hidden")
+      (,(concat "\\\\new\\(?:count\\|dimen\\|muskip\\|skip\\)\\\\\\(" token
+               "+\\)address@hidden")
        1 TeX-auto-symbol)
       (,(concat "\\\\newfont{?\\\\\\(" token "+\\)}?") 1 TeX-auto-symbol)
       (,(concat "\\\\typein\\[\\\\\\(" token "+\\)\\]") 1 TeX-auto-symbol)
       ("\\\\input +\\(\\.*[^#%\\\\\\.\n\r]+\\)\\(\\.[^#%\\\\\\.\n\r]+\\)?"
        1 TeX-auto-file)
-      (,(concat "\\\\mathchardef\\\\\\(" token "+\\)address@hidden") 1 
TeX-auto-symbol)))
+      (,(concat "\\\\mathchardef\\\\\\(" token "+\\)address@hidden")
+       1 TeX-auto-symbol)))
   "List of regular expression matching common LaTeX macro definitions.")
 
 (defvar TeX-auto-full-regexp-list plain-TeX-auto-regexp-list
@@ -4072,12 +3973,6 @@
     map)
   "Keymap for common TeX and LaTeX commands.")
 
-(defvar plain-TeX-mode-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map TeX-mode-map)
-    map)
-  "Keymap used in plain TeX mode.")
-
 (defun TeX-mode-specific-command-menu (mode)
   "Return a Command menu specific to the major MODE."
   ;; COMPATIBILITY for Emacs < 21
@@ -4217,13 +4112,6 @@
       :help "Hide or show the item containing point"]))
    "Menu definition for commands from tex-fold.el.")
 
-
-;;; Menus for plain TeX mode
-(easy-menu-define plain-TeX-mode-command-menu
-    plain-TeX-mode-map
-    "Command menu used in TeX mode."
-    (TeX-mode-specific-command-menu 'plain-tex-mode))
-
 (defvar TeX-customization-menu nil)
 
 (defvar TeX-common-menu-entries
@@ -4262,91 +4150,6 @@
       :help ,(format "Problems with AUCTeX %s? Mail us!"
                     AUCTeX-version)])))
 
-(defvar plain-TeX-menu-entries
-  (TeX-menu-with-help
-   `(["Macro..." TeX-insert-macro
-      :help "Insert a macro and possibly arguments"]
-     ["Complete" TeX-complete-symbol
-      :help "Complete the current macro"]
-     "-"
-     ("Insert Font"
-      ["Emphasize"  (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
-      ["Bold"       (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
-      ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
-      ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
-      ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
-      ["Italic"     (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
-      ["Slanted"    (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
-      ["Roman"      (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
-      ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
-     ("Replace Font"
-      ["Emphasize"  (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
-      ["Bold"       (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
-      ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
-      ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
-      ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
-      ["Italic"     (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
-      ["Slanted"    (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
-      ["Roman"      (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
-      ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
-     ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
-     "-"
-     ["Comment or Uncomment Region" TeX-comment-or-uncomment-region
-      :help "Comment or uncomment the currently selected region"]
-     ["Comment or Uncomment Paragraph" TeX-comment-or-uncomment-paragraph
-      :help "Comment or uncomment the paragraph containing point"]
-     ,TeX-fold-menu
-     "-" . ,TeX-common-menu-entries)))
-
-(easy-menu-define plain-TeX-mode-menu
-    plain-TeX-mode-map
-    "Menu used in plain TeX mode."
-    (cons "TeX" plain-TeX-menu-entries))
-
-;;; AmSTeX
-
-(defvar AmSTeX-mode-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map TeX-mode-map)
-    map)
-  "Keymap used in `AmSTeX-mode'.")
-
-;; Menu for AmSTeX mode
-(easy-menu-define AmSTeX-mode-command-menu
-    AmSTeX-mode-map
-    "Command menu used in AmsTeX mode."
-    (TeX-mode-specific-command-menu 'ams-tex-mode))
-
-(easy-menu-define AmSTeX-mode-menu
-  AmSTeX-mode-map
-  "Menu used in AMS-TeX mode."
-  (cons "AmS-TeX" plain-TeX-menu-entries))
-
-;;;###autoload
-(defun ams-tex-mode ()
-  "Major mode in AUCTeX for editing AmS-TeX files.
-See info under AUCTeX for documentation.
-
-Special commands:
-\\{AmSTeX-mode-map}
-
-Entering AmS-tex-mode calls the value of `text-mode-hook',
-then the value of `TeX-mode-hook', and then the value
-of `AmS-TeX-mode-hook'."
-  (interactive)
-  (plain-TeX-common-initialization)
-  (setq major-mode 'ams-tex-mode)
-  (use-local-map AmSTeX-mode-map)
-
-  ;; Menu
-  (easy-menu-add AmSTeX-mode-menu AmSTeX-mode-map)
-  (easy-menu-add AmSTeX-mode-command-menu AmSTeX-mode-map)
-
-  (setq TeX-base-mode-name "AmS-TeX")
-  (setq TeX-command-default "AmSTeX")
-  (TeX-run-mode-hooks 'text-mode-hook 'TeX-mode-hook 'AmS-TeX-mode-hook)
-  (TeX-set-mode-name))
-
 
 ;;; Verbatim constructs