* riece-layout.el (riece-set-window-points): Move point in

[riece] / lisp / riece-keyword.el

diff --git a/lisp/riece-keyword.el b/lisp/riece-keyword.el
index 37ae4af..b0b0952 100644 (file)
--- a/lisp/riece-keyword.el
+++ b/lisp/riece-keyword.el
@@ -29,13 +29,17 @@
 
 ;;; Code:
 
+(require 'riece-message)
+
 (defgroup riece-keyword nil
   "Highlight keyword in IRC buffer."
   :group 'riece-vars)
 
 (defcustom riece-keywords nil
   "Keywords to be highlightened."
-  :type '(repeat string)
+  :type '(repeat (choice (string :tag "Keyword")
+                        (cons (string :tag "Regexp")
+                              (integer :tag "Match"))))
   :group 'riece-keyword)
 
 (defcustom riece-notify-keyword-functions nil
@@ -55,39 +59,41 @@
 ;;; The old XEmacs package doesn't have autoload setting for regexp-opt.
 (autoload 'regexp-opt "regexp-opt")
 (defun riece-keyword-message-filter (message)
-  (if riece-keywords
-      (let ((regexp (regexp-opt riece-keywords))
-           (index 0))
-       (while (string-match regexp (riece-message-text message) index)
-         (if (memq 'riece-highlight riece-addons)
-             (put-text-property (match-beginning 0) (match-end 0)
-                                'riece-keyword t
-                                (riece-message-text message)))
-         (save-match-data
-           (run-hook-with-args 'riece-notify-keyword-functions
-                               (match-string 0 (riece-message-text message))))
-         (setq index (match-end 0)))))
+  (if (and riece-keywords
+          ;; Ignore messages which belongs to myself.
+          (not (riece-message-own-p message)))
+      (let* (keywords
+            (alist
+             (nconc
+              (delq nil (mapcar
+                         (lambda (matcher)
+                           (if (stringp matcher)
+                               (ignore
+                                (setq keywords (cons matcher keywords)))
+                             matcher))
+                         riece-keywords))
+              (list (cons (regexp-opt keywords) 0))))
+            index)
+       (while alist
+         (setq index 0)
+         (while (string-match (car (car alist))
+                              (riece-message-text message) index)
+           (if (memq 'riece-highlight riece-addons)
+               (put-text-property (match-beginning (cdr (car alist)))
+                                  (match-end (cdr (car alist)))
+                                  'riece-keyword t
+                                  (riece-message-text message)))
+           (save-match-data
+             (run-hook-with-args 'riece-notify-keyword-functions
+                                 (match-string (cdr (car alist))
+                                               (riece-message-text message))))
+           (setq index (match-end (cdr (car alist)))))
+         (setq alist (cdr alist)))))
   message)
 
-(defun riece-keyword-map-region (start end function)
-  (catch 'done
-    (while t
-      ;; Search for the beginning of the button region.
-      (unless (get-text-property start 'riece-keyword)
-       (setq start (next-single-property-change start 'riece-keyword
-                                                nil end)))
-      (if (= start end)
-         (throw 'done nil))
-      ;; Search for the end of the button region.
-      (let ((button-end (next-single-property-change start 'riece-keyword
-                                                    nil end)))
-       (if (= button-end end)
-           (throw 'done nil))
-       (funcall function start button-end)
-       (setq start button-end)))))
-
 (defun riece-keyword-scan-region (start end)
-  (riece-keyword-map-region
+  (riece-scan-property-region
+   'riece-keyword
    start end
    (lambda (start end)
      (riece-overlay-put (riece-make-overlay start end)