* gnus-group.el (gnus-group-name-charset): Allow a method of the short form in

 gnus-group-name-charset-method-alist.

* gnus-eform.el (gnus-edit-form): Add optional argument layout which overrides
 the default layout edit-form.

* gnus-win.el (gnus-buffer-configuration): Add edit-server.

* gnus-srvr.el (gnus-server-edit-server): Use edit-server layout.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11168f4..14e534f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2007-07-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-group.el (gnus-group-name-charset): Allow a method of the short
+       form in gnus-group-name-charset-method-alist.
+
+       * gnus-eform.el (gnus-edit-form): Add optional argument layout which
+       overrides the default layout edit-form.
+
+       * gnus-win.el (gnus-buffer-configuration): Add edit-server.
+
+       * gnus-srvr.el (gnus-server-edit-server): Use edit-server layout.
+
 2007-07-04  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-sum.el (gnus-summary-catchup): Don't recognize cached articles

diff --git a/lisp/gnus-eform.el b/lisp/gnus-eform.el
index bbe95ce..a04b9de 100644 (file)
--- a/lisp/gnus-eform.el
+++ b/lisp/gnus-eform.el
@@ -86,13 +86,14 @@ It is a slightly enhanced emacs-lisp-mode.
   (make-local-variable 'gnus-prev-winconf)
   (gnus-run-mode-hooks 'gnus-edit-form-mode-hook))
 
-(defun gnus-edit-form (form documentation exit-func)
+(defun gnus-edit-form (form documentation exit-func &optional layout)
   "Edit FORM in a new buffer.
 Call EXIT-FUNC on exit.  Display DOCUMENTATION in the beginning
-of the buffer."
+of the buffer.
+The optional LAYOUT overrides the `edit-form' window layout."
   (let ((winconf (current-window-configuration)))
     (set-buffer (gnus-get-buffer-create gnus-edit-form-buffer))
-    (gnus-configure-windows 'edit-form)
+    (gnus-configure-windows (or layout 'edit-form))
     (gnus-edit-form-mode)
     (setq gnus-prev-winconf winconf)
     (setq gnus-edit-form-done-function exit-func)

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 83b5a6e..e0bfd9c 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1218,7 +1218,10 @@ The following commands are available:
 (defun gnus-group-name-charset (method group)
   (if (null method)
       (setq method (gnus-find-method-for-group group)))
-  (let ((item (assoc method gnus-group-name-charset-method-alist))
+  (let ((item (or (assoc method gnus-group-name-charset-method-alist)
+                 (and (consp method)
+                      (assoc (list (car method) (cadr method))
+                             gnus-group-name-charset-method-alist))))
        (alist gnus-group-name-charset-group-alist)
        result)
     (if item

diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el
index 6c86719..ffdfbf4 100644 (file)
--- a/lisp/gnus-srvr.el
+++ b/lisp/gnus-srvr.el
@@ -624,7 +624,8 @@ The following commands are available:
      `(lambda (form)
        (gnus-server-set-info ,server form)
        (gnus-server-list-servers)
-       (gnus-server-position-point)))))
+       (gnus-server-position-point))
+     'edit-server)))
 
 (defun gnus-server-scan-server (server)
   "Request a scan from the current server."

diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el
index 5e40ad5..e2ccb55 100644 (file)
--- a/lisp/gnus-win.el
+++ b/lisp/gnus-win.el
@@ -120,6 +120,10 @@ used to display Gnus windows."
      (vertical 1.0
               (summary 0.25)
               (edit-score 1.0 point)))
+    (edit-server
+     (vertical 1.0
+              (server 0.5)
+              (edit-form 1.0 point)))
     (post
      (vertical 1.0
               (post 1.0 point)))