X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-coding.el;h=f6d9ddaed0d2e63c49aecd02070a5e0fcea4b103;hp=3b5f934dcde94a40dec54028d07f1f6b0c84cf66;hb=cfb081fd178e69c501290eb464d88204b5c94639;hpb=d8715f2c854706095952ceb524a7168c54694504

diff --git a/lisp/riece-coding.el b/lisp/riece-coding.el
index 3b5f934..f6d9dda 100644
--- a/lisp/riece-coding.el
+++ b/lisp/riece-coding.el
@@ -19,37 +19,20 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; 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)
+(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)
-	  (encode-coding-string string (cdr riece-coding-system))
-	(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)