From: ueno <ueno>
Date: Thu, 5 Oct 2000 06:14:32 +0000 (+0000)
Subject: Synch up with `liece-1_4_4-7'.
X-Git-Tag: liece-2_0_0-pre1~19
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a6d5756407534d33d78e536c371a06f31e76d9f4;p=elisp%2Fliece.git

Synch up with `liece-1_4_4-7'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e893169..a9e9ee6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+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'.
+	(liece-command-set-voices): Ditto.
+
+2000-09-30   Daiki Ueno  <ueno@unixuser.org>
+
+	* liece-xemacs.el (liece-xemacs-modeline-glyph): Add 'xpm check.
+	(liece-xemacs-create-nick-glyph): Ditto.
+	(liece-xemacs-unread-mark): Ditto.
+
 2000-09-23  Akira Ohashi  <bg66@luck.gr.jp>
 
 	* liece-menu.el (liece-command-toggle-freeze): Rename from
diff --git a/lisp/liece-commands.el b/lisp/liece-commands.el
index 0d9f0f1..4438a0f 100644
--- a/lisp/liece-commands.el
+++ b/lisp/liece-commands.el
@@ -496,8 +496,9 @@ Argument CHANGE ."
     (unwind-protect
 	(dolist (nick nicks)
 	  (push nick run)
-	  (if (= (length run) liece-compress-mode-length)
-	      (liece-command-qualify-nicks ?o run (not arg))))
+	  (when (= (length run) liece-compress-mode-length)
+	    (liece-command-qualify-nicks ?o run (not arg))
+	    (setq run nil)))
       (when run
 	(liece-command-qualify-nicks ?o run (not arg))))))
 
@@ -520,8 +521,9 @@ Argument CHANGE ."
     (unwind-protect
 	(dolist (nick nicks)
 	  (push nick run)
-	  (if (= (length run) liece-compress-mode-length)
-	      (liece-command-qualify-nicks ?v run (not arg))))
+	  (when (= (length run) liece-compress-mode-length)
+	    (liece-command-qualify-nicks ?v run (not arg))
+	    (setq run nil)))
       (when run
 	(liece-command-qualify-nicks ?v run (not arg))))))
 
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)
diff --git a/lisp/liece-xemacs.el b/lisp/liece-xemacs.el
index c30b265..d3cf76c 100644
--- a/lisp/liece-xemacs.el
+++ b/lisp/liece-xemacs.el
@@ -240,11 +240,10 @@ If optional argument FORCE is non-nil, always update toolbar."
 	 (let (file)
 	   (make-glyph
 	    (nconc
-	     (if (setq file (liece-locate-icon-file
-			     "liece-pointer.xpm"))
+	     (if (and (featurep 'xpm)
+		      (setq file (liece-locate-icon-file "liece-pointer.xpm")))
 		 (list (vector 'xpm :file file)))
-	     (if (setq file (liece-locate-icon-file
-			     "liece-pointer.xbm"))
+	     (if (setq file (liece-locate-icon-file "liece-pointer.xbm"))
 		 (list (vector 'xbm :file file)))
 	     '([string :data "Liece:"]))))))
     (set-glyph-face glyph 'modeline-buffer-id)
@@ -308,7 +307,8 @@ Modify whole identification by side effect."
    (let ((glyph
 	  (make-glyph
 	   (nconc
-	    (if (setq file (liece-locate-icon-file file))
+	    (if (and (featurep 'xpm)
+		     (setq file (liece-locate-icon-file file)))
 		(list (vector 'xpm :file file)))
 	    (if string
 		(list (vector 'string :data string)))))))
@@ -560,12 +560,13 @@ If ARG is given, don't hide splash buffer."
   (if liece-display-unread-mark
       (with-current-buffer liece-channel-list-buffer
         (let* ((buffer-read-only nil)
-	       (file (liece-xemacs-icon-path
-		      liece-xemacs-unread-icon))
-	       (glyph (make-glyph
-		       (list (vector 'xpm :file file)
-			     (vector 'string
-				     :data liece-channel-unread-character))))
+	       (file (liece-locate-icon-file liece-xemacs-unread-icon))
+	       (glyph
+		(make-glyph
+		 (nconc (if (and (featurep 'xpm) file)
+			    (list (vector 'xpm :file file)))
+			(list (vector 'string
+				      :data liece-channel-unread-character)))))
 	       ext)
 	  (goto-char (point-min))
 	  (when (re-search-forward (concat "^ ?[0-9]+: " chnl "$") nil t)