From: ueno <ueno>
Date: Fri, 30 May 2003 06:04:51 +0000 (+0000)
Subject: * riece-message.el (riece-message-make-bracket): Abolish.
X-Git-Tag: riece-0_0_2~5
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b121b322379bc9a025d1d9add1f6033842a56fd1;p=elisp%2Friece.git

* riece-message.el (riece-message-make-bracket): Abolish.
* riece-highlight.el (riece-highlight-font-lock-keywords):
Give up to fontify "-nick-" or "-nick server-".
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 295536f..dd14f0c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2003-05-30  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece-message.el (riece-message-make-bracket): Abolish.
+	* riece-highlight.el (riece-highlight-font-lock-keywords):
+	Give up to fontify "-nick-" or "-nick server-".
+
 	* riece-highlight.el (riece-highlight-font-lock-keywords):
 	Simplified regexp.
 
diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el
index a9715ef..3c3536d 100644
--- a/lisp/riece-highlight.el
+++ b/lisp/riece-highlight.el
@@ -163,7 +163,7 @@
 (defcustom riece-highlight-font-lock-keywords
   (append
    (list (list (concat "^" riece-time-prefix-regexp
-		       "\\(<[^>]+>\\|>[^<]+<\\|([^)]+)\\|-[^ ]+ [^-]+-\\|=[^ ]+ [^=]+=\\|\\([+-]\\)[^ ]+\\2\\)")
+		       "\\(<[^>]+>\\|>[^<]+<\\|([^)]+)\\|{[^}]+}\\|=[^=]+=\\)")
 	       '(1 riece-prefix-face append t)))
    ;; set property to the whole line
    (mapcar
diff --git a/lisp/riece-message.el b/lisp/riece-message.el
index f2312ad..2bef9f6 100644
--- a/lisp/riece-message.el
+++ b/lisp/riece-message.el
@@ -63,32 +63,27 @@
 
 (defun riece-message-make-open-bracket (message)
   "Makes `open-bracket' string for MESSAGE."
-  (riece-message-make-bracket message t))
+  (if (riece-message-own-p message)
+      ">"
+    (if (eq (riece-message-type message) 'notice)
+	"{"
+      (if (riece-message-private-p message)
+	  "="
+	(if (riece-message-external-p message)
+	    "("
+	  "<")))))
 
 (defun riece-message-make-close-bracket (message)
   "Makes `close-bracket' string for MESSAGE."
-  (riece-message-make-bracket message nil))
-
-(defun riece-message-make-bracket (message open-p)
-  (if (eq open-p (riece-message-own-p message))
-      (if (eq (riece-message-type message) 'notice)
-	  "-"
-	(if (riece-message-private-p message)
-	    (if (riece-message-own-p message)
-		">"
-	      "=")
-	  (if (riece-message-external-p message)
-	      ")"
-	    ">")))
+  (if (riece-message-own-p message)
+      "<"
     (if (eq (riece-message-type message) 'notice)
-	"-"
+	"}"
       (if (riece-message-private-p message)
-	  (if (riece-message-own-p message)
-	      "<"
-	    "=")
+	  "="
 	(if (riece-message-external-p message)
-	    "("
-	  "<")))))
+	    ")"
+	  ">")))))
 
 (defun riece-message-make-name (message)
   "Makes local identity for MESSAGE."