feature/fix-mode-names-overlap ae43b622 3/6: Commit for ConTeXt modes

[Ikumi Keita]

branch: feature/fix-mode-names-overlap
commit ae43b62283c4e56c4fc2cef26adddd3587473a0e
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Commit: Ikumi Keita <ikumi@ikumi.que.jp>

    Commit for ConTeXt modes
    
    * context.el:
    * context-en.el:
    * context-nl.el:
    * tex.el:
    * tex-fold.el:
    Change major mode names.
    context-mode -> ConTeXt-mode
    context-en-mode -> ConTeXt-en-mode
    context-nl-mode -> ConTeXt-nl-mode
---
 context-en.el |  7 +++++--
 context-nl.el |  7 +++++--
 context.el    | 16 ++++++++--------
 tex-fold.el   |  8 ++++----
 tex.el        | 14 +++++++-------
 5 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/context-en.el b/context-en.el
index 62394206..c9b98410 100644
--- a/context-en.el
+++ b/context-en.el
@@ -203,13 +203,13 @@ That is, besides the section(-block) commands.")
    '("sym" (TeX-arg-string "Symbol") (TeX-arg-literal " "))))
 
 ;;;###autoload
-(defun context-en-mode ()
+(defun ConTeXt-en-mode ()
   "Major mode for editing files for ConTeXt using its english interface.
 
 Special commands:
 \\{ConTeXt-mode-map}
 
-Entering `context-mode' calls the value of `text-mode-hook',
+Entering `ConTeXt-mode' calls the value of `text-mode-hook',
 then the value of `TeX-mode-hook', and then the value
 of `ConTeXt-mode-hook'."
   (interactive)
@@ -224,6 +224,9 @@ of `ConTeXt-mode-hook'."
   (setq TeX-base-mode-name "ConTeXt-en")
   (TeX-set-mode-name))
 
+;;;###autoload
+(defalias 'context-en-mode #'ConTeXt-en-mode)
+
 (provide 'context-en)
 
 ;;; context-en.el ends here
diff --git a/context-nl.el b/context-nl.el
index 49aacac4..c473874e 100644
--- a/context-nl.el
+++ b/context-nl.el
@@ -178,13 +178,13 @@ That is, besides the section(-block) commands.")
    '("sym" (TeX-arg-string "Symbol") (TeX-arg-literal " "))))
 
 ;;;###autoload
-(defun context-nl-mode ()
+(defun ConTeXt-nl-mode ()
   "Major mode for editing files for ConTeXt using its dutch interface.
 
 Special commands:
 \\{ConTeXt-mode-map}
 
-Entering `context-mode' calls the value of `text-mode-hook',
+Entering `ConTeXt-mode' calls the value of `text-mode-hook',
 then the value of `TeX-mode-hook', and then the value
 of `ConTeXt-mode-hook'."
   (interactive)
@@ -200,6 +200,9 @@ of `ConTeXt-mode-hook'."
   (setq TeX-base-mode-name "ConTeXt-nl")
   (TeX-set-mode-name))
 
+;;;###autoload
+(defalias 'context-nl-mode #'ConTeXt-nl-mode)
+
 (provide 'context-nl)
 
 ;;; context-nl.el ends here
diff --git a/context.el b/context.el
index 40214aad..a3716237 100644
--- a/context.el
+++ b/context.el
@@ -945,7 +945,7 @@ An entry looks like: (\"environment\" . function)")
   (metapost-mode)
   (message "Type `M-x exit-recursive-edit' to get back")
   (recursive-edit)
-  (context-mode)
+  (ConTeXt-mode)
   (widen))
 
 ;; find smarter name.  Suggestions welcome
@@ -1596,7 +1596,7 @@ else.  There might be text before point."
 (easy-menu-define ConTeXt-mode-command-menu
   ConTeXt-mode-map
   "Command menu used in ConTeXt mode."
-  (TeX-mode-specific-command-menu 'context-mode))
+  (TeX-mode-specific-command-menu 'ConTeXt-mode))
 
 ;; it seems the menu is evaluated at compile/load-time
 ;; we don't have ConTeXt-current-interface at that time
@@ -1659,7 +1659,7 @@ else.  There might be text before point."
 
 (defun ConTeXt-menu-update (&optional menu)
   "Update entries on AUCTeX menu."
-  (or (not (memq major-mode '(context-mode)))
+  (or (not (memq major-mode '(ConTeXt-mode)))
       (null ConTeXt-menu-changed)
       (progn
         (TeX-update-style)
@@ -1819,7 +1819,7 @@ that is, you do _not_ have to cater for this yourself by 
adding \\\\\\=' or $."
   :type '(repeat regexp)
   :group 'TeX-command)
 
-(TeX-abbrev-mode-setup context-mode)
+(TeX-abbrev-mode-setup ConTeXt-mode)
 
 (defun ConTeXt-mode-common-initialization ()
   "Initialization code that is common for all ConTeXt interfaces."
@@ -1830,9 +1830,9 @@ that is, you do _not_ have to cater for this yourself by 
adding \\\\\\=' or $."
     (setq save-ConTeXt-current-interface ConTeXt-current-interface)
     (plain-TeX-common-initialization)
     (setq ConTeXt-current-interface save-ConTeXt-current-interface))
-  (setq major-mode 'context-mode)
+  (setq major-mode 'ConTeXt-mode)
 
-  (setq local-abbrev-table context-mode-abbrev-table)
+  (setq local-abbrev-table ConTeXt-mode-abbrev-table)
   (set (make-local-variable 'TeX-style-hook-dialect) ConTeXt-dialect)
 
   (require (intern (concat "context-" ConTeXt-current-interface)))
@@ -1922,10 +1922,10 @@ that is, you do _not_ have to cater for this yourself 
by adding \\\\\\=' or $."
                  ConTeXt-default-interface)))))
 
 ;;;###autoload
-(defalias 'ConTeXt-mode #'context-mode)
+(defalias 'context-mode #'ConTeXt-mode)
 
 ;;;###autoload
-(defun context-mode ()
+(defun ConTeXt-mode ()
   "Major mode in AUCTeX for editing ConTeXt files.
 
 Special commands:
diff --git a/tex-fold.el b/tex-fold.el
index 12d72f80..f1c261eb 100644
--- a/tex-fold.el
+++ b/tex-fold.el
@@ -323,7 +323,7 @@ for macros and `math' for math macros."
           (cl-pushnew i item-list :test #'equal)))
       (when item-list
         (setq regexp (cond ((and (eq type 'env)
-                                 (eq major-mode 'context-mode))
+                                 (eq major-mode 'ConTeXt-mode))
                             (concat (regexp-quote TeX-esc)
                                     "start" (regexp-opt item-list t)))
                            ((and (eq type 'env)
@@ -422,7 +422,7 @@ Return non-nil if an item was found and folded, nil 
otherwise."
       (message
        "Folding of environments is not supported in current mode")
     (let ((item-start (cond ((and (eq type 'env)
-                                  (eq major-mode 'context-mode))
+                                  (eq major-mode 'ConTeXt-mode))
                              (save-excursion
                                (ConTeXt-find-matching-start) (point)))
                             ((and (eq type 'env)
@@ -441,7 +441,7 @@ Return non-nil if an item was found and folded, nil 
otherwise."
                             (goto-char item-start)
                             (looking-at
                              (cond ((and (eq type 'env)
-                                         (eq major-mode 'context-mode))
+                                         (eq major-mode 'ConTeXt-mode))
                                     (concat (regexp-quote TeX-esc)
                                             "start\\([A-Za-z]+\\)"))
                                    ((and (eq type 'env)
@@ -530,7 +530,7 @@ TYPE can be either `env' for environments, `macro' for 
macros or
 `math' for math macros."
   (save-excursion
     (cond ((and (eq type 'env)
-                (eq major-mode 'context-mode))
+                (eq major-mode 'ConTeXt-mode))
            (goto-char start)
            (ConTeXt-find-matching-stop)
            (point))
diff --git a/tex.el b/tex.el
index 512f9ca6..09d1ea85 100644
--- a/tex.el
+++ b/tex.el
@@ -197,13 +197,13 @@ If nil, none is specified."
     ;; support for ConTeXt  --pg
     ;; first version of ConTeXt to support nonstopmode: 2003.2.10
     ("ConTeXt" "%(cntxcom) --once --texutil %(extraopts) %(execopts)%t"
-     TeX-run-TeX nil (context-mode) :help "Run ConTeXt once")
+     TeX-run-TeX nil (ConTeXt-mode) :help "Run ConTeXt once")
     ("ConTeXt Full" "%(cntxcom) %(extraopts) %(execopts)%t"
      TeX-run-TeX nil
-     (context-mode) :help "Run ConTeXt until completion")
+     (ConTeXt-mode) :help "Run ConTeXt until completion")
     ("BibTeX" "bibtex %(O?aux)" TeX-run-BibTeX nil
      (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode Texinfo-mode
-                     context-mode)
+                     ConTeXt-mode)
      :help "Run BibTeX")
     ("Biber" "biber %(output-dir) %s" TeX-run-Biber nil
      (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode Texinfo-mode)
@@ -349,7 +349,7 @@ Any additional elements get just transferred to the 
respective menu entries."
                                 (set (const :tag "Plain TeX" plain-TeX-mode)
                                      (const :tag "LaTeX" latex-mode)
                                      (const :tag "DocTeX" doctex-mode)
-                                     (const :tag "ConTeXt" context-mode)
+                                     (const :tag "ConTeXt" ConTeXt-mode)
                                      (const :tag "Texinfo" Texinfo-mode)
                                      (const :tag "AmSTeX" AmSTeX-mode)))
                         (repeat :tag "Menu elements" :inline t sexp))))
@@ -996,7 +996,7 @@ If no mode is given the current major mode is used."
                                      (AmSTeX-mode . "AmSTeX")
                                      (doctex-mode . "docTeX")
                                      (Texinfo-mode . "Texinfo")
-                                     (context-mode . "ConTeXt")))))
+                                     (ConTeXt-mode . "ConTeXt")))))
 
 ;;; Viewing
 
@@ -3659,7 +3659,7 @@ Choose `ignore' if you don't want AUCTeX to install 
support for font locking."
      "-- string likely in Japanese TeX --")
     ("AMSTEX" AmSTeX-mode
      "\\\\document\\b")
-    ("CONTEXT" context-mode
+    ("CONTEXT" ConTeXt-mode
      "\\\\\\(start\\(text\\|tekst\\|proje[ck]t\\|proiect\\|\
 produ[ck]t\\|produs\\|environment\\|omgeving\\|umgebung\\|prostredi\\|mediu\\|\
 component\\|onderdeel\\|komponent[ea]\\|componenta\\)\
@@ -6448,7 +6448,7 @@ enter the number of the file to view, anything else to 
skip: ") list)))
 (autoload 'info-lookup->completions "info-look")
 
 (defvar TeX-doc-backend-alist
-  '((texdoc (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode context-mode)
+  '((texdoc (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode ConTeXt-mode)
             (lambda ()
               (when (executable-find "texdoc")
                 (TeX-search-files-by-type 'docs 'global t t)))