From: ueno <ueno>
Date: Thu, 5 Oct 2000 05:59:26 +0000 (+0000)
Subject: * liece-minibuf.el (liece-minibuffer-complete-channel-modes):
X-Git-Tag: liece-1_4_7~43
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ca73d56faafd47f6051521a92e635ce059a9432;p=elisp%2Fliece.git

* liece-minibuf.el (liece-minibuffer-complete-channel-modes):
Don't use old style backquotes.
(liece-minibuffer-completing-read-multiple-1): Remove a partially
matched word construct if it exists.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e72b5bb..78b1342 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-05   Daiki Ueno  <ueno@unixuser.org>
+
+	* liece-minibuf.el (liece-minibuffer-complete-channel-modes):
+	Don't use old style backquotes.
+	(liece-minibuffer-completing-read-multiple-1): Remove a partially
+	matched word construct if it exists.
+
 2000-10-03   Daiki Ueno  <ueno@unixuser.org>
 
 	* liece-commands.el (liece-command-set-operators): Reset `run'.
diff --git a/lisp/liece-minibuf.el b/lisp/liece-minibuf.el
index 1db543c..d5063af 100644
--- a/lisp/liece-minibuf.el
+++ b/lisp/liece-minibuf.el
@@ -134,9 +134,9 @@
 	      (if (memq ?- type)
 		  masks
 		(remove-if
-		 (` (lambda (item)
-		      (and (stringp item)
-			   (string-list-member-ignore-case item '(, masks)))))
+		 `(lambda (item)
+		    (and (stringp item)
+			 (string-list-member-ignore-case item ',masks)))
 		 nicks))))
 	(setq nicks (mapcar (function list) nicks)
 	      candidate (liece-minibuffer-prepare-candidate)
@@ -179,11 +179,15 @@ For more information on STRING, PREDICATE, and FLAG, see the Elisp
 Reference sections on 'Programmed Completion' and 'Basic Completion
 Functions'."
   (let ((except
-	 (butlast
-	  (split-string string liece-minibuffer-completion-separator)))
+	 (split-string string liece-minibuffer-completion-separator))
 	(table
 	 (copy-sequence liece-minibuffer-completion-table))
 	lead)
+    ;; Remove a partially matched word construct if it exists.
+    (or (string-match
+	 (concat liece-minibuffer-completion-separator "$")
+	 string)
+	(setq except (butlast except)))
     (when (string-match
 	   (concat ".*" liece-minibuffer-completion-separator)
 	   string)