projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synch to No Gnus 200601131944.
[elisp/gnus.git-]
/
lisp
/
gnus-eform.el
diff --git
a/lisp/gnus-eform.el
b/lisp/gnus-eform.el
index
b8df3d3
..
3b17357
100644
(file)
--- a/
lisp/gnus-eform.el
+++ b/
lisp/gnus-eform.el
@@
-1,7
+1,9
@@
;;; gnus-eform.el --- a mode for editing forms for Gnus
;;; gnus-eform.el --- a mode for editing forms for Gnus
-;; Copyright (C) 1996,97 Free Software Foundation, Inc.
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005 Free Software Foundation, Inc.
+
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; This file is part of GNU Emacs.
;; Keywords: news
;; This file is part of GNU Emacs.
@@
-18,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
;; 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:
;;; Commentary:
@@
-48,12
+50,13
@@
;;; Internal variables
;;; Internal variables
-(defvar gnus-edit-form-done-function nil)
(defvar gnus-edit-form-buffer "*Gnus edit form*")
(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
(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))
(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
+68,7
@@
'("Edit Form"
["Exit and save changes" gnus-edit-form-done t]
["Exit" gnus-edit-form-exit t]))
'("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.
(defun gnus-edit-form-mode ()
"Major mode for editing forms.
@@
-81,16
+84,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)
(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-mode-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)))
(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-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)
(gnus-edit-form-mode)
(setq gnus-prev-winconf winconf)
(setq gnus-edit-form-done-function exit-func)
@@
-105,7
+107,7
@@
of the buffer."
(insert ";; Type `C-c C-c' after you've finished editing.\n")
(insert "\n")
(let ((p (point)))
(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))))
(insert "\n")
(goto-char p))))
@@
-113,7
+115,9
@@
of the buffer."
"Update changes and kill the current buffer."
(interactive)
(goto-char (point-min))
"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)))
(func gnus-edit-form-done-function))
(gnus-edit-form-exit)
(funcall func form)))