From 8052c56a80af6ecf101643ed060e6ea0afc8aa3a Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Mon, 29 Jan 2007 00:57:23 +0000
Subject: [PATCH] * riece-ctcp.el (riece-handle-ctcp-ping-request): Removed
 useless argument for `format'. * riece-mcat.el
 (riece-mcat-extract): New local variable `pointer'. *
 riece-epg.el (epg-cancel): Autoload. * riece-options.el
 (riece): Specify :group.

---
 lisp/ChangeLog        |    8 ++++++++
 lisp/riece-ctcp.el    |    2 +-
 lisp/riece-epg.el     |    1 +
 lisp/riece-mcat.el    |    2 +-
 lisp/riece-options.el |    4 +++-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac1fca0..1f6f8e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-29  Daiki Ueno  <ueno@unixuser.org>
+
+	* riece-ctcp.el (riece-handle-ctcp-ping-request): Removed useless
+	argument for `format'.
+	* riece-mcat.el (riece-mcat-extract): New local variable `pointer'.
+	* riece-epg.el (epg-cancel): Autoload.
+	* riece-options.el (riece): Specify :group.
+
 2007-01-28  Daiki Ueno  <ueno@unixuser.org>
 
 	* riece-coding.el (riece--encode-coding-string): New alias.
diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index 2f600fb..7060735 100644
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -118,7 +118,7 @@
     (riece-send-string
      (if string
 	 (format "NOTICE %s :\1PING %s\1\r\n" user string)
-       (format "NOTICE %s :\1PING\1\r\n" user string)))
+       (format "NOTICE %s :\1PING\1\r\n" user)))
     (riece-insert-change buffer (format "CTCP PING from %s\n" user))
     (riece-insert-change
      (if (and riece-channel-buffer-mode
diff --git a/lisp/riece-epg.el b/lisp/riece-epg.el
index 6c1c77f..63c5997 100644
--- a/lisp/riece-epg.el
+++ b/lisp/riece-epg.el
@@ -32,6 +32,7 @@
 (autoload 'epg-encrypt-string "epg")
 (autoload 'epg-passphrase-callback-function "epg")
 (autoload 'epg-context-set-passphrase-callback "epg")
+(autoload 'epg-cancel "epg")
 
 (eval-when-compile
   (autoload 'riece-command-send-message "riece-commands"))
diff --git a/lisp/riece-mcat.el b/lisp/riece-mcat.el
index 5bfc62e..5c77de6 100644
--- a/lisp/riece-mcat.el
+++ b/lisp/riece-mcat.el
@@ -46,7 +46,7 @@
 
 (defun riece-mcat-extract (files)
   (save-excursion
-    (let (message-list)
+    (let (message-list pointer)
       (while files
 	(with-temp-buffer
 	  (insert-file-contents (car files))
diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index 6987933..0406914 100644
--- a/lisp/riece-options.el
+++ b/lisp/riece-options.el
@@ -29,7 +29,9 @@
 
 ;; User modifiable variables.
 (defgroup riece nil
-  "Riece specific customize group.")
+  "Riece specific customize group."
+  :prefix "riece-"
+  :group 'applications)
 
 (defgroup riece-options nil
   "Riece user customizable variables."
-- 
1.7.10.4