Revert "Fix toggle-freeze behavior when the channel buffer window is selected."

[riece] / lisp / riece-coding.el

diff --git a/lisp/riece-coding.el b/lisp/riece-coding.el
index 7ca4c28..f6d9dda 100644 (file)
--- a/lisp/riece-coding.el
+++ b/lisp/riece-coding.el
@@ -25,39 +25,14 @@
 ;;; Code:
 
 (require 'riece-globals)
-
-(defgroup riece-coding nil
-  "Coding system."
-  :tag "Coding"
-  :prefix "riece-"
-  :group 'riece)
-
-(defcustom riece-default-coding-system
-  (if (featurep 'mule)
-      (cons 'ctext 'iso-2022-jp-2))
-  "Coding system for process I/O.
-The value is a coding system, or a cons cell (DECODING . ENCODING)
-specifying the coding systems for decoding and encoding respectively."
-  :type '(choice (symbol :tag "Coding system")
-                (cons (symbol :tag "Input coding system")
-                      (symbol :tag "Output coding system"))
-                (const nil :tag "No conversion"))
-  :group 'riece-coding)
-
-(if (fboundp 'encode-coding-string)
-    (defalias 'riece--encode-coding-string 'encode-coding-string)
-  (defalias 'riece--encode-coding-string 'identity))
-
-(if (fboundp 'decode-coding-string)
-    (defalias 'riece--decode-coding-string 'decode-coding-string)
-  (defalias 'riece--decode-coding-string 'identity))
+(require 'riece-options)
 
 (defun riece-encode-coding-string (string)
   (if (and (local-variable-p 'riece-coding-system (current-buffer))
           riece-coding-system)         ;should be nil on non-Mule environment
-      (if (consp riece-coding-system)
-         (riece--encode-coding-string string (cdr riece-coding-system))
-       (riece--encode-coding-string string riece-coding-system))
+      (encode-coding-string string (if (consp riece-coding-system)
+                                      (cdr riece-coding-system)
+                                    riece-coding-system))
     string))
 
 (defun riece-decode-coding-string (string)
@@ -70,7 +45,7 @@ specifying the coding systems for decoding and encoding respectively."
     string))
 
 (defun riece-decode-coding-string-1 (string coding-system)
-  (let* ((decoded (riece--decode-coding-string string coding-system))
+  (let* ((decoded (decode-coding-string string coding-system))
         (length (length decoded)))
     (put-text-property 0 length 'riece-decoded-encoded-string
                       string decoded)