X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-keyword.el;h=85251b7790b2bf13c546deb37f706f265f29d36d;hb=c29ab70caf2fe4359a3166546a8f380443cc5240;hp=b0b09525b22aeb2cba65e7837602b5755a7fee0f;hpb=1436511bbcdfa8a028b5112d2d45ab390dc633a9;p=elisp%2Friece.git

diff --git a/lisp/riece-keyword.el b/lisp/riece-keyword.el
index b0b0952..85251b7 100644
--- a/lisp/riece-keyword.el
+++ b/lisp/riece-keyword.el
@@ -1,4 +1,4 @@
-;;; riece-keyword.el --- highlight keywords in channel buffers
+;;; riece-keyword.el --- detect keywords in IRC buffers
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -19,21 +19,21 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
-;; To use, add the following line to your ~/.riece/init.el:
-;; (add-to-list 'riece-addons 'riece-keyword)
+;; NOTE: This is an add-on module for Riece.
 
 ;;; Code:
 
 (require 'riece-message)
 
 (defgroup riece-keyword nil
-  "Highlight keyword in IRC buffer."
-  :group 'riece-vars)
+  "Detect keywords in IRC buffers."
+  :prefix "riece-"
+  :group 'riece)
 
 (defcustom riece-keywords nil
   "Keywords to be highlightened."
@@ -47,19 +47,33 @@
   :type '(list function)
   :group 'riece-keyword)
 
+(make-obsolete-variable 'riece-notify-keyword-functions
+			'riece-keyword-notify-functions)
+
+(defcustom riece-keyword-notify-functions nil
+  "Functions used to notify keyword match.
+Two arguments are passed to each function: the keyword used to match
+and the matched message object."
+  :type '(list function)
+  :group 'riece-keyword)
+
 (defface riece-keyword-face
   '((((class color))
      (:foreground "red" :underline t))
     (t
-     ()))
+     (:underline t)))
   "Face used for highlightening matching keyword."
   :group 'riece-highlight-faces)
 (defvar riece-keyword-face 'riece-keyword-face)
 
+(defconst riece-keyword-description
+  "Detect keywords in IRC buffers.")
+
 ;;; The old XEmacs package doesn't have autoload setting for regexp-opt.
 (autoload 'regexp-opt "regexp-opt")
 (defun riece-keyword-message-filter (message)
-  (if (and riece-keywords
+  (if (and (get 'riece-keyword 'riece-addon-enabled)
+	   riece-keywords
 	   ;; Ignore messages which belongs to myself.
 	   (not (riece-message-own-p message)))
       (let* (keywords
@@ -78,34 +92,29 @@
 	  (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))))
+	    (put-text-property (match-beginning (cdr (car alist)))
+			       (match-end (cdr (car alist)))
+			       'riece-overlay-face riece-keyword-face
+			       (riece-message-text message))
+	    (run-hook-with-args 'riece-notify-keyword-functions
+				(match-string (cdr (car alist))
+					      (riece-message-text message)))
+	    (run-hook-with-args 'riece-keyword-notify-functions
+				(cdr (car alist))
+				message)
 	    (setq index (match-end (cdr (car alist)))))
 	  (setq alist (cdr alist)))))
   message)
 
-(defun riece-keyword-scan-region (start end)
-  (riece-scan-property-region
-   'riece-keyword
-   start end
-   (lambda (start end)
-     (riece-overlay-put (riece-make-overlay start end)
-			'face riece-keyword-face))))
-
 (defun riece-keyword-requires ()
   (if (memq 'riece-highlight riece-addons)
       '(riece-highlight)))
 
 (defun riece-keyword-insinuate ()
-  (add-hook 'riece-message-filter-functions 'riece-keyword-message-filter)
-  (add-hook 'riece-after-insert-functions 'riece-keyword-scan-region))
+  (add-hook 'riece-message-filter-functions 'riece-keyword-message-filter))
+
+(defun riece-keyword-uninstall ()
+  (remove-hook 'riece-message-filter-functions 'riece-keyword-message-filter))
 
 (provide 'riece-keyword)