Merge from emacs--devo--0

[gnus] / lisp / gnus-eform.el

diff --git a/lisp/gnus-eform.el b/lisp/gnus-eform.el
index 3c1ecc1..ae89d4e 100644 (file)
--- a/lisp/gnus-eform.el
+++ b/lisp/gnus-eform.el
@@ -1,6 +1,7 @@
 ;;; gnus-eform.el --- a mode for editing forms for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000
-;;        Free Software Foundation, Inc.
+
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -9,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,8 +20,8 @@
 
 ;; 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:
 
@@ -83,15 +84,16 @@ It is a slightly enhanced emacs-lisp-mode.
   (use-local-map gnus-edit-form-mode-map)
   (make-local-variable 'gnus-edit-form-done-function)
   (make-local-variable 'gnus-prev-winconf)
-  (gnus-run-hooks 'gnus-edit-form-mode-hook))
+  (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)
@@ -106,7 +108,7 @@ of the buffer."
     (insert ";; Type `C-c C-c' after you've finished editing.\n")
     (insert "\n")
     (let ((p (point)))
-      (pp form (current-buffer))
+      (gnus-pp form)
       (insert "\n")
       (goto-char p))))
 
@@ -115,8 +117,8 @@ of the buffer."
   (interactive)
   (goto-char (point-min))
   (let ((form (condition-case nil
-                  (read (current-buffer))
-                (end-of-file nil)))
+                 (read (current-buffer))
+               (end-of-file nil)))
        (func gnus-edit-form-done-function))
     (gnus-edit-form-exit)
     (funcall func form)))
@@ -130,4 +132,5 @@ of the buffer."
 
 (provide 'gnus-eform)
 
+;;; arch-tag: ef50678c-2c28-49ef-affc-e53b3b2c0bf6
 ;;; gnus-eform.el ends here