From b5db0b1bf4d0a99bdbc7e1e23bcff4c0a64f7bc2 Mon Sep 17 00:00:00 2001 From: ueno Date: Mon, 29 Jan 2007 01:09:59 +0000 Subject: [PATCH] Removed aliases for encode-coding-string & decode-coding-string since they are not called if riece-coding-system is unset. --- lisp/ChangeLog | 5 ----- lisp/riece-coding.el | 16 ++++------------ 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1f6f8e3..d26f855 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -6,11 +6,6 @@ * riece-epg.el (epg-cancel): Autoload. * riece-options.el (riece): Specify :group. -2007-01-28 Daiki Ueno - - * riece-coding.el (riece--encode-coding-string): New alias. - (riece--decode-coding-string): New alias. - 2007-01-22 Daiki Ueno * riece-mcat.el (riece-mcat-extract): Abolished ALIST arg. diff --git a/lisp/riece-coding.el b/lisp/riece-coding.el index 7ca4c28..c0d1ac6 100644 --- a/lisp/riece-coding.el +++ b/lisp/riece-coding.el @@ -44,20 +44,12 @@ specifying the coding systems for decoding and encoding respectively." (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)) - (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 +62,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) -- 1.7.10.4