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

[Masayuki Ataka]

Index: auctex/tex-jp.el
diff -u auctex/tex-jp.el:5.85 auctex/tex-jp.el:5.86
--- auctex/tex-jp.el:5.85       Thu Oct  6 20:36:58 2005
+++ auctex/tex-jp.el    Sun Jan 22 15:02:29 2006
@@ -80,7 +80,6 @@
                                (function-item TeX-run-discard)
                                (function-item TeX-run-background)
                                (function-item TeX-run-silent)
-                               (function-item TeX-run-dviout)
                                (function :tag "Other"))
                        (boolean :tag "Prompt")
                        (choice :tag "Modes"
@@ -108,15 +107,15 @@
 
 ;; Menus
 
-(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))
-
-(easy-menu-define LaTeX-mode-command-menu
-  LaTeX-mode-map
-  "Command menu used in LaTeX mode."
-  (TeX-mode-specific-command-menu 'latex-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))
+
+;; (easy-menu-define LaTeX-mode-command-menu
+;;   LaTeX-mode-map
+;;   "Command menu used in LaTeX mode."
+;;   (TeX-mode-specific-command-menu 'latex-mode))
 
 (setq LaTeX-command-style
       (append '(("^j-\\(article\\|report\\|book\\)$"
@@ -203,14 +202,14 @@
 ;;; Japanese TeX modes
 
 (defvar japanese-TeX-mode nil
-  "Flag to determine if the current buffer is Japanese TeX/LaTeX.")
+  "Non-nil means the current buffer handles Japanese TeX/LaTeX.")
 (make-variable-buffer-local 'japanese-TeX-mode)
 (put 'japanese-TeX-mode 'permanent-local t)
 
 ;;;###autoload
 (defun japanese-plain-tex-mode ()
   "Major mode in AUCTeX for editing Japanese plain TeX files.
-Set japanese-TeX-mode to t, and enters plain-tex-mode."
+Set `japanese-TeX-mode' to t, and enter `TeX-plain-tex-mode'."
   (interactive)
   (setq japanese-TeX-mode t)
   (TeX-plain-tex-mode))
@@ -225,7 +224,7 @@
 ;;;###autoload
 (defun japanese-latex-mode ()
   "Major mode in AUCTeX for editing Japanese LaTeX files.
-Set japanese-TeX-mode to t, and enters latex-mode."
+Set `japanese-TeX-mode' to t, and enter `TeX-latex-mode'."
   (interactive)
   (setq japanese-TeX-mode t)
   (TeX-latex-mode))
@@ -242,21 +241,23 @@
 
 ;;; Support for various self-insert-command
 
-(cond ((fboundp 'can-n-egg-self-insert-command)
-       (fset 'tex-jp-self-insert-command 'can-n-egg-self-insert-command))
-      ((fboundp 'egg-self-insert-command)
-       (fset 'tex-jp-self-insert-command 'egg-self-insert-command))
-      ((fboundp 'canna-self-insert-command)
-       (fset 'tex-jp-self-insert-command 'canna-self-insert-command))
-      (t
-       (fset 'tex-jp-self-insert-command 'self-insert-command)))
+(fset 'japanese-TeX-self-insert-command
+      (cond ((fboundp 'can-n-egg-self-insert-command)
+            'can-n-egg-self-insert-command)
+           ((fboundp 'egg-self-insert-command)
+            'egg-self-insert-command)
+           ((fboundp 'canna-self-insert-command)
+            'canna-self-insert-command)
+           (t
+            'self-insert-command)))
 
 (defun TeX-insert-punctuation ()
   "Insert point or comma, cleaning up preceding space."
   (interactive)
+  (expand-abbrev)
   (if (TeX-looking-at-backward "\\\\/\\(}+\\)" 50)
       (replace-match "\\1" t))
-  (call-interactively 'tex-jp-self-insert-command))
+  (call-interactively 'japanese-TeX-self-insert-command))
 
 ;;; Error Messages
 
@@ -267,7 +268,7 @@
 
     ("Bad math environment delimiter.*" .
 
"$B?t<0%b!<%ICf$G?t<0%b!<%I3+;O%3%^%s%I(B\\[$B$^$?$O(B\\($B!$$^$?$O!$?t<0%b!<%I30$G(B
-$B?t<0%b!<%I=*N;%3%^%s%I(B\\[$B$^$?$O(B\\($B$r(BTeX$B$,8+$D$1$^$7$?!%$3$NLdBj$O!$?t<0%b!<(B
+$B?t<0%b!<%I=*N;%3%^%s%I(B\\]$B$^$?$O(B\\)$B$r(BTeX$B$,8+$D$1$^$7$?!%$3$NLdBj$O!$?t<0%b!<(B
 
$B%I$N%G%j%_%?$,%^%C%A$7$F$$$J$+$C$?$j!$3g8L$N%P%i%s%9$,$H$l$F$$$J$+$C$?$j$9(B
 address@hidden(B")
 
@@ -543,7 +544,7 @@
 
$B$k!%(B(3)address@hidden@.$N$?$a$N>pJs$r(BTeX$B$,J];}$7$-$l$J$$$h$&$J!$$"$^$j$K$bJ#;($J%Z!<(B
 address@hidden@.$7$h$&$H$7$?!%:G=i$N(address@hidden(B
 
$B$N?t$"$k$$$O(B\\index$B!&(B\\glossary$BL?Na$N?t$r8:$i$9$3$H$G$9!%(B3$BHVL\$NLdBj$O(B
-$B$A$g$C$HLq2p$G$9!%$3$l$O!$Bg$-$J(Btabbin$B!&(Btabular$B!&(Barray$B!&(Bpicture$B4D6-$N(B
+$B$A$g$C$HLq2p$G$9!%$3$l$O!$Bg$-$J(Btabbing$B!&(Btabular$B!&(Barray$B!&(Bpicture$B4D6-$N(B
 $B$;address@hidden,$"$j$^$9!%=PNO0LCV$,7hDj$5$l$k$N$rBT$C$F$$$k?^$dI=$G(B
 
TeX$B$N%a%b%j$,$$$C$Q$$$K$J$C$F$$$k$N$+$b$7$l$^$;$s!%K\Ev$K(BTeX$B$NMFNL$rD6(B
 $B$($F$7$^$C$?$N$+$I$&$+D4$Y$k$?$a$K$O!$%(%i!<$N5/$3$C$?>l=j$ND>A0$K(B