From 27420f2d7c555195469e3be82769eaf1a3920864 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Sat, 27 Aug 2005 07:02:53 +0000
Subject: [PATCH] * riece-highlight.el (riece-highlight-uninstall): Use
 riece-remprop instead of remprop.

* riece-addon.el (riece-uninstall-addon): Use riece-remprop
instead of remprop.

* riece-xemacs.el (riece-remprop): New alias.
* riece-emacs.el (riece-remprop): New function.

* COMPILE (riece-compile-modules): Add current directory to load-path.

* riece-history.el (riece-history-requires): New function.
* riece-addon.el (riece-insinuate-addon-1): Require add-on feature.
---
 lisp/COMPILE            |  3 ++-
 lisp/ChangeLog          | 11 +++++++++++
 lisp/riece-addon.el     |  2 +-
 lisp/riece-async.el     |  1 +
 lisp/riece-emacs.el     | 10 ++++++++++
 lisp/riece-highlight.el |  8 ++++----
 lisp/riece-xemacs.el    |  2 ++
 7 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/lisp/COMPILE b/lisp/COMPILE
index 1576401..051a7d9 100644
--- a/lisp/COMPILE
+++ b/lisp/COMPILE
@@ -62,7 +62,8 @@
     "aproxy.rb"))
 
 (defun riece-compile-modules (modules)
-  (let (error-modules)
+  (let ((load-path (cons nil load-path))
+	error-modules)
     (while modules
       (let ((source (expand-file-name
 		     (concat (symbol-name (car modules)) ".el"))))
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f270506..2b34cf0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,16 @@
 2005-08-27  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece-highlight.el (riece-highlight-uninstall): Use
+	riece-remprop instead of remprop.
+
+	* riece-addon.el (riece-uninstall-addon): Use riece-remprop
+	instead of remprop.
+
+	* riece-xemacs.el (riece-remprop): New alias.
+	* riece-emacs.el (riece-remprop): New function.
+
+	* COMPILE (riece-compile-modules): Add current directory to load-path.
+
 	* riece-history.el (riece-history-requires): New function.
 	* riece-addon.el (riece-insinuate-addon-1): Require add-on feature.
 
diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index 1b1288f..9421ff2 100644
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -258,7 +258,7 @@
 		(funcall uninstall))
 	    (setq riece-addon-dependencies
 		  (delq entry riece-addon-dependencies))
-	    (remprop addon 'riece-addon-insinuated)
+	    (riece-remprop addon 'riece-addon-insinuated)
 	    (setq riece-addons (delq addon riece-addons)
 		  riece-save-variables-are-dirty t
 		  riece-addon-dependencies
diff --git a/lisp/riece-async.el b/lisp/riece-async.el
index 6841a0c..b234b58 100644
--- a/lisp/riece-async.el
+++ b/lisp/riece-async.el
@@ -37,6 +37,7 @@
 ;;; Code:
 
 (require 'riece-options)
+(require 'riece-ruby)			;riece-ruby-command
 
 (defgroup riece-async nil
   "Connect to IRC server via async proxy."
diff --git a/lisp/riece-emacs.el b/lisp/riece-emacs.el
index 7477633..2caf85a 100644
--- a/lisp/riece-emacs.el
+++ b/lisp/riece-emacs.el
@@ -135,6 +135,16 @@ If N is nil, all messages will be returned."
 	    (reverse-region (point-min) (point-max))
 	    (buffer-string))))))
 
+(defun riece-remprop (symbol property)
+  (let ((plist (symbol-plist symbol)))
+    (if (eq (car plist) property)
+	(setplist symbol (cdr (cdr plist)))
+      (while (and (nthcdr 2 plist)
+		  (eq (car (nthcdr 2 plist)) property))
+	(setq plist (nthcdr 2 plist)))
+      (if (nthcdr 2 plist)
+	  (setcdr (cdr plist) (nthcdr 4 plist))))))
+
 (provide 'riece-emacs)
 
 ;;; riece-emacs.el ends here
diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el
index 1164918..a0bc93c 100644
--- a/lisp/riece-highlight.el
+++ b/lisp/riece-highlight.el
@@ -289,12 +289,12 @@
 	    (remove-hook 'after-change-functions
 			 'riece-highlight-hide-prefix t))
 	(setq buffers (cdr buffers)))))
-  (remprop 'riece-channel-mode 'font-lock-defaults)
-  (remprop 'riece-others-mode 'font-lock-defaults)
-  (remprop 'riece-dialogue-mode 'font-lock-defaults)
+  (riece-remprop 'riece-channel-mode 'font-lock-defaults)
+  (riece-remprop 'riece-others-mode 'font-lock-defaults)
+  (riece-remprop 'riece-dialogue-mode 'font-lock-defaults)
   (remove-hook 'riece-dialogue-mode-hook
 	       'riece-highlight-setup-dialogue)
-  (remprop 'riece-channel-list-mode 'font-lock-defaults)
+  (riece-remprop 'riece-channel-list-mode 'font-lock-defaults)
   (remove-hook 'riece-channel-list-mode-hook
 	       'riece-highlight-setup-channel-list)
   (remove-hook 'riece-format-identity-for-channel-list-indicator-functions
diff --git a/lisp/riece-xemacs.el b/lisp/riece-xemacs.el
index 70735ac..b50d265 100644
--- a/lisp/riece-xemacs.el
+++ b/lisp/riece-xemacs.el
@@ -137,6 +137,8 @@ If N is nil, all messages will be returned."
   (with-output-to-string
     (print-recent-messages n)))
 
+(defalias 'riece-remprop 'remprop)
+
 (provide 'riece-xemacs)
 
 ;;; riece-xemacs.el ends here
-- 
2.25.1