X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-eform.el;h=e43e01c99fe2a22b42a93ec248fca4771c03ae48;hb=5dfa1f3daa6e4ea6ee12a8b7f42e785761ee3743;hp=3ab900c055e3bbe4dd99a081e5583be5be51331b;hpb=926bcf02432a9bed8ce9f17224e91c514b2a5093;p=gnus

diff --git a/lisp/gnus-eform.el b/lisp/gnus-eform.el
index 3ab900c05..e43e01c99 100644
--- a/lisp/gnus-eform.el
+++ b/lisp/gnus-eform.el
@@ -1,7 +1,8 @@
 ;;; gnus-eform.el --- a mode for editing forms for Gnus
-;; Copyright (C) 1996 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;;        Free Software Foundation, Inc.
 
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -48,12 +49,13 @@
 
 ;;; Internal variables
 
-(defvar gnus-edit-form-done-function nil)
 (defvar gnus-edit-form-buffer "*Gnus edit form*")
+(defvar gnus-edit-form-done-function nil)
 
 (defvar gnus-edit-form-mode-map nil)
 (unless gnus-edit-form-mode-map
-  (setq gnus-edit-form-mode-map (copy-keymap emacs-lisp-mode-map))
+  (setq gnus-edit-form-mode-map (make-sparse-keymap))
+  (set-keymap-parent gnus-edit-form-mode-map emacs-lisp-mode-map)
   (gnus-define-keys gnus-edit-form-mode-map
     "\C-c\C-c" gnus-edit-form-done
     "\C-c\C-k" gnus-edit-form-exit))
@@ -65,7 +67,7 @@
      '("Edit Form"
        ["Exit and save changes" gnus-edit-form-done t]
        ["Exit" gnus-edit-form-exit t]))
-    (run-hooks 'gnus-edit-form-menu-hook)))
+    (gnus-run-hooks 'gnus-edit-form-menu-hook)))
 
 (defun gnus-edit-form-mode ()
   "Major mode for editing forms.
@@ -81,16 +83,15 @@ 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)
-  (run-hooks 'gnus-edit-form-mode-hook))
+  (gnus-run-hooks 'gnus-edit-form-mode-hook))
 
 (defun gnus-edit-form (form documentation exit-func)
   "Edit FORM in a new buffer.
 Call EXIT-FUNC on exit.  Display DOCUMENTATION in the beginning
 of the buffer."
   (let ((winconf (current-window-configuration)))
-    (set-buffer (get-buffer-create gnus-edit-form-buffer))
+    (set-buffer (gnus-get-buffer-create gnus-edit-form-buffer))
     (gnus-configure-windows 'edit-form)
-    (gnus-add-current-to-buffer-list)
     (gnus-edit-form-mode)
     (setq gnus-prev-winconf winconf)
     (setq gnus-edit-form-done-function exit-func)
@@ -113,11 +114,13 @@ of the buffer."
   "Update changes and kill the current buffer."
   (interactive)
   (goto-char (point-min))
-  (let ((form (read (current-buffer)))
+  (let ((form (condition-case nil
+		  (read (current-buffer))
+		(end-of-file nil)))
 	(func gnus-edit-form-done-function))
     (gnus-edit-form-exit)
     (funcall func form)))
-  
+
 (defun gnus-edit-form-exit ()
   "Kill the current buffer."
   (interactive)
@@ -127,4 +130,5 @@ of the buffer."
 
 (provide 'gnus-eform)
 
+;;; arch-tag: ef50678c-2c28-49ef-affc-e53b3b2c0bf6
 ;;; gnus-eform.el ends here