emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/auctex 77c2cda 15/43: Remove XEmacs compatibility code


From: Tassilo Horn
Subject: [elpa] externals/auctex 77c2cda 15/43: Remove XEmacs compatibility code in tex-jp.el
Date: Tue, 20 Mar 2018 11:34:08 -0400 (EDT)

branch: externals/auctex
commit 77c2cda99c60108cf9bb7e5706101bf8cd1ae20e
Author: Ikumi Keita <address@hidden>
Commit: Ikumi Keita <address@hidden>

    Remove XEmacs compatibility code in tex-jp.el
    
    * tex-jp.el (japanese-TeX-set-process-coding-system)
    (japanese-TeX-coding-ejsu): Remove code for compatibility with
    XEmacs.
---
 tex-jp.el | 36 ++----------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/tex-jp.el b/tex-jp.el
index 4d34fa8..83e66af 100644
--- a/tex-jp.el
+++ b/tex-jp.el
@@ -390,29 +390,7 @@ See also a user custom option 
`TeX-japanese-process-input-coding-system'."
                   ;; address@hidden"(Blocale 
$B$,F|K\8l$r%5%]!<%H$7$J$$>l9g$O(B
                   ;; euc $B$K8GDj$9$k!#(B
                   (t
-                   (let ((lcs
-                          (cond
-                           ((boundp 'locale-coding-system)
-                            locale-coding-system)
-                           ;; XEmacs doesn't have `locale-coding-system'.
-                           ;; Instead xemacs 21.5 has
-                           ;; `get-coding-system-from-locale' and
-                           ;; `current-locale'.  They aren't available on
-                           ;; xemacs 21.4.
-                           ((and
-                             (featurep 'xemacs)
-                             (fboundp 'get-coding-system-from-locale))
-                            (get-coding-system-from-locale
-                             (if (fboundp 'current-locale)
-                                 (current-locale)
-                               ;; I don't know XEmacs well, so incorporate
-                               ;; the suggestion of
-                               ;; 
http://lists.gnu.org/archive/html/auctex-devel/2017-02/msg00079.html
-                               ;; as well.
-                               (or (getenv "LC_ALL")
-                                   (getenv "LC_CTYPE")
-                                   (getenv "LANG")
-                                   "")))))))
+                   (let ((lcs locale-coding-system))
                      (if (and lcs (japanese-TeX-coding-ejsu lcs))
                          lcs 'euc-jp)))))))
 
@@ -455,28 +433,18 @@ shift_jis: \"sjis\"
 utf-8:     \"utf8\"
 Return nil otherwise."
   (let ((base (coding-system-base coding-system)))
-    (if (featurep 'xemacs)
-       (setq base (coding-system-name base)))
     (cdr (assq base
               '((japanese-iso-8bit . "euc")
-                (euc-jp . "euc") ; for xemacs
                 (iso-2022-jp . "jis")
                 (japanese-shift-jis . "sjis")
-                (shift_jis . "sjis") ; for xemacs
                 (utf-8 . "utf8")
-                (mule-utf-8 . "utf8") ; for emacs 21, 22
-                ;; utf-8-auto $B$d(B utf-8-emacs 
$B$rF~$l$kI,MW$O$"$k$N$+!)(B
 
-                ;; xemacs 21.5 with mule $B$K$O!"(Bjisx0213 $B$N(B charset 
$B$O(B
-                ;; $B$"$k$,$=$lMQ$N(B coding system $B$O$J$$!#(B
                 (euc-jis-2004 . "euc")
                 (iso-2022-jp-2004 . "jis")
                 (japanese-shift-jis-2004 . "sjis")
 
                 (japanese-cp932 . "sjis")
-                (eucjp-ms . "euc")
-                (windows-932 . "sjis") ; for xemacs 21.5 with mule
-               )))))
+                (eucjp-ms . "euc"))))))
 
 (defun japanese-TeX-get-encoding-string ()
   "Return coding option string for Japanese pTeX family.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]