From 0a352ee7680e35785b0d2655d42ef0e3bc00f6ef Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Thu, 26 Sep 2002 23:52:52 +0000
Subject: [PATCH] * liece-minibuf.el (liece-minibuf-completing-read): Don't
 use the 7th argument of completing-read.

* liece-coding.el (liece-mime-charset-for-write): Use
`mime-charset-to-coding-system' instead of `mime-charset-p'.
(liece-mime-charset-for-read): Ditto.
---
 lisp/ChangeLog        |   11 +++++++++++
 lisp/liece-coding.el  |    4 ++--
 lisp/liece-minibuf.el |   19 ++++++++++++-------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a79481..dbfc369 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-26  Daiki Ueno  <ueno@unixuser.org>
+
+	* liece-minibuf.el (liece-minibuf-completing-read): Don't use the
+	7th argument of completing-read.
+
 2002-09-24  Daiki Ueno  <ueno@unixuser.org>
 
 	* liece-handle.el (liece-handle-mode-message): Check chnlp before
@@ -99,6 +104,12 @@
 
 	* gettext.el (gettext-mapcar*): Eliminate recursion.
 
+2002-03-24  Daiki Ueno  <daiki@xemacs.org>
+
+	* liece-coding.el (liece-mime-charset-for-write): Use
+	`mime-charset-to-coding-system' instead of `mime-charset-p'.
+ 	(liece-mime-charset-for-read): Ditto.
+ 
 2002-03-20  Daiki Ueno  <ueno@unixuser.org>
 
 	* gettext.el (bind-text-domain): Respect LC_ALL and LC_MESSAGES;
diff --git a/lisp/liece-coding.el b/lisp/liece-coding.el
index 2670cf6..76b5970 100644
--- a/lisp/liece-coding.el
+++ b/lisp/liece-coding.el
@@ -41,7 +41,7 @@
   :group 'liece)
   
 (defcustom liece-mime-charset-for-write
-  (if (mime-charset-p 'iso-2022-jp-2)
+  (if (mime-charset-to-coding-system 'iso-2022-jp-2)
       'iso-2022-jp-2
     default-mime-charset-for-write)
   "Charset used in any transferred messages."
@@ -49,7 +49,7 @@
   :group 'liece-coding)
 
 (defcustom liece-mime-charset-for-read
-  (if (mime-charset-p 'x-ctext)
+  (if (mime-charset-to-coding-system 'x-ctext)
       'x-ctext
     default-mime-charset)
   "Charset used in any transferred messages."
diff --git a/lisp/liece-minibuf.el b/lisp/liece-minibuf.el
index d5063af..acf32d6 100644
--- a/lisp/liece-minibuf.el
+++ b/lisp/liece-minibuf.el
@@ -151,12 +151,17 @@
     (mapconcat (function car) liece-supported-user-mode-alist ""))))
 
 (defun liece-minibuffer-completing-read
-  (prompt table &optional predicate require-match initial-input history default)
-  (completing-read
-   (if default
-       (format "%s(default %s) " prompt default)
-     prompt)
-   table predicate require-match initial-input history default))
+  (prompt table &optional predicate require-match initial-input history
+	  default)
+  (let ((result
+	 (completing-read
+	  (if default
+	      (format "%s(default %s) " prompt default)
+	    prompt)
+	  table predicate require-match initial-input history)))
+    (if (and default (equal result ""))
+	default
+      result)))
 
 (defvar liece-minibuffer-completion-separator ","
   "Separator used for separating strings in `liece-minibuffer-completing-read-multiple'.
@@ -225,7 +230,7 @@ PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HISTORY, DEFAULT."
       (let ((liece-minibuffer-completion-table
 	     table))
 	(split-string
-	 (completing-read
+	 (liece-minibuffer-completing-read
 	  prompt #'liece-minibuffer-completing-read-multiple-1
 	  predicate require-match initial-input history default)
 	 liece-minibuffer-completion-separator)))))
-- 
1.7.10.4