From: bg66 <bg66>
Date: Thu, 23 Oct 2003 01:45:31 +0000 (+0000)
Subject: * riece-log.el (riece-log-get-directory): Follow the change of
X-Git-Tag: riece-0_1_5~8
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1602544b9a990c3dbc05b05802eea6f69b104c23;p=elisp%2Friece.git

* riece-log.el (riece-log-get-directory): Follow the change of
`riece-channel-regexp'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce30160..b4e3438 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-23  OHASHI Akira  <bg66@koka-in.org>
+
+	* riece-log.el (riece-log-get-directory): Follow the change of
+	`riece-channel-regexp'.
+
 2003-10-22  Daiki Ueno  <ueno@unixuser.org>
 
 	* riece-identity.el (riece-format-identity): Return copied strings.
diff --git a/lisp/riece-log.el b/lisp/riece-log.el
index 8d98e66..b4c801c 100644
--- a/lisp/riece-log.el
+++ b/lisp/riece-log.el
@@ -82,16 +82,18 @@ If integer, flash back only this line numbers. t means all lines."
     (let ((map (assoc channel riece-log-directory-map)))
       (if map
 	  (expand-file-name (cdr map) riece-log-directory)
-	(if (string-match (concat riece-channel-regexp
-				  "\\([^:]+\\)\\(:\\*\\.\\(.*\\)\\)?") channel)
-	    (let ((name (match-string 1 channel))
-		  (suffix (match-string 3 channel)))
-	      (let ((name (if suffix (concat name "-" suffix) name)))
-		(if server
-		    (expand-file-name
-		     name
-		     (expand-file-name server riece-log-directory))
-		  (expand-file-name name riece-log-directory))))
+	(if (string-match riece-channel-regexp channel)
+	    (let ((name (substring channel
+				   (match-end 1) (match-beginning 2)))
+		  (suffix (match-string 2 channel)))
+	      (when (and (stringp suffix)
+			 (string-match "^:\\*\\.\\(.*\\)" suffix))
+		(setq name (concat name "-" (match-string 1 suffix))))
+	      (if server
+		  (expand-file-name
+		   name
+		   (expand-file-name server riece-log-directory))
+		(expand-file-name name riece-log-directory)))
 	  riece-log-directory)))))
 
 (defun riece-log-flashback (identity)