From: ueno <ueno>
Date: Tue, 4 Sep 2007 10:52:38 +0000 (+0000)
Subject: 2007-09-04  Didier Verna  <didier@xemacs.org>
X-Git-Tag: riece-5_0_0~39
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6802b2a9d24c465268b988ba836ce6cf4b32cde2;p=elisp%2Friece.git

2007-09-04  Didier Verna  <didier@xemacs.org>

        * riece-addon.el (riece-addon-list-mark-face-alist): Fix misuse of
        the list widget type.
        * riece-google.el (riece-google-program): Ditto.
        * riece-highlight.el (riece-channel-list-mark-face-alist): Ditto.
        * riece-keyword.el (riece-notify-keyword-functions)
        (riece-keyword-notify-functions): Ditto.
        * riece-layout.el (riece-layout-alist): Ditto.
        * riece-rdcc.el (riece-rdcc-send-program)
        (riece-rdcc-decode-address-program): Ditto.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bd8996..a45f4de 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2007-09-04  Didier Verna  <didier@xemacs.org>
+
+        * riece-addon.el (riece-addon-list-mark-face-alist): Fix misuse of
+        the list widget type.
+        * riece-google.el (riece-google-program): Ditto.
+        * riece-highlight.el (riece-channel-list-mark-face-alist): Ditto.
+        * riece-keyword.el (riece-notify-keyword-functions)
+        (riece-keyword-notify-functions): Ditto.
+        * riece-layout.el (riece-layout-alist): Ditto.
+        * riece-rdcc.el (riece-rdcc-send-program)
+        (riece-rdcc-decode-address-program): Ditto.
+
 2007-08-19  Daiki Ueno  <ueno@unixuser.org>
 
 	* riece-commands.el (riece-command-kick-with-ban): New command.
diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index 671ba2e..3fac57f 100644
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -94,7 +94,7 @@
     (?? . riece-addon-list-uninstalled-face)
     (?  . riece-addon-list-unloaded-face))
   "An alist mapping marks on riece-addon-list-buffer to faces."
-  :type 'list
+  :type '(repeat (cons character symbol))
   :group 'riece-addon-list)
 
 (defcustom riece-addon-list-font-lock-keywords
diff --git a/lisp/riece-google.el b/lisp/riece-google.el
index 3bfe96e..465d068 100644
--- a/lisp/riece-google.el
+++ b/lisp/riece-google.el
@@ -136,7 +136,7 @@ rescue Exception => e
 end
 ")
   "Ruby program for searching by Google."
-  :type 'list
+  :type 'sexp
   :group 'riece-google)
 
 (defcustom riece-google-license-key nil
diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el
index 3057747..97e9af1 100644
--- a/lisp/riece-highlight.el
+++ b/lisp/riece-highlight.el
@@ -181,7 +181,7 @@
 (defcustom riece-channel-list-mark-face-alist
   '((?* . riece-channel-list-current-face))
   "An alist mapping marks on riece-channel-list-buffer to faces."
-  :type 'list
+  :type '(repeat (cons character symbol))
   :group 'riece-highlight)
 
 (defcustom riece-channel-list-font-lock-keywords
diff --git a/lisp/riece-keyword.el b/lisp/riece-keyword.el
index 85251b7..0d5c8e3 100644
--- a/lisp/riece-keyword.el
+++ b/lisp/riece-keyword.el
@@ -44,7 +44,7 @@
 
 (defcustom riece-notify-keyword-functions nil
   "Functions used to notify keyword match."
-  :type '(list function)
+  :type '(repeat function)
   :group 'riece-keyword)
 
 (make-obsolete-variable 'riece-notify-keyword-functions
@@ -54,7 +54,7 @@
   "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)
+  :type '(repeat function)
   :group 'riece-keyword)
 
 (defface riece-keyword-face
diff --git a/lisp/riece-layout.el b/lisp/riece-layout.el
index 6583b1b..33467ae 100644
--- a/lisp/riece-layout.el
+++ b/lisp/riece-layout.el
@@ -57,7 +57,11 @@ In the first form, NAME is a string which specifies the layout
 setting, and CONFIGURE-FUNCTION is a function which does window
 splitting, etc.  PARAMETERS are collected and passed to CONFIGURE-FUNCTION.
 In the second form, NAME1 is an alias for NAME2."
-  :type 'list
+  :type '(repeat (choice (list :tag "Layout"
+                               (string :tag "Name")
+                               (function :tag "Configure function")
+                               (repeat :tag "Parameters" :inline t symbol))
+                         (cons :tag "Alias" string string)))
   :group 'riece-layout)
 
 (defun riece-redraw-layout (&optional force)
diff --git a/lisp/riece-rdcc.el b/lisp/riece-rdcc.el
index d2416ce..977e3b3 100644
--- a/lisp/riece-rdcc.el
+++ b/lisp/riece-rdcc.el
@@ -81,14 +81,14 @@ if session
 end
 ")
   "Ruby program to send file with DCC."
-  :type 'list
+  :type 'sexp
   :group 'riece-rdcc)
 
 (defcustom riece-rdcc-decode-address-program
   '("\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
     address " >> 8 & 0xFF}.#{" address " & 0xFF}\"")
   "Ruby program to numeric IP address."
-  :type 'list
+  :type 'sexp
   :group 'riece-rdcc)
 
 (defcustom riece-rdcc-save-directory nil