projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nnimap.el (nnimap-find-expired-articles): nnimap `never' expiration fix
[gnus]
/
lisp
/
gnus-eform.el
diff --git
a/lisp/gnus-eform.el
b/lisp/gnus-eform.el
index
3e49eb2
..
0b41b5e
100644
(file)
--- a/
lisp/gnus-eform.el
+++ b/
lisp/gnus-eform.el
@@
-1,25
+1,24
@@
;;; gnus-eform.el --- a mode for editing forms for Gnus
;;; gnus-eform.el --- a mode for editing forms for Gnus
-;; Copyright (C) 1996,97,98 Free Software Foundation, Inc.
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Copyright (C) 1996-2015 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.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; 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
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; 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.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-37,23
+36,24
@@
:group 'gnus)
(defcustom gnus-edit-form-mode-hook nil
:group 'gnus)
(defcustom gnus-edit-form-mode-hook nil
- "
*
Hook run in `gnus-edit-form-mode' buffers."
+ "Hook run in `gnus-edit-form-mode' buffers."
:group 'gnus-edit-form
:type 'hook)
(defcustom gnus-edit-form-menu-hook nil
:group 'gnus-edit-form
:type 'hook)
(defcustom gnus-edit-form-menu-hook nil
- "
*
Hook run when creating menus in `gnus-edit-form-mode' buffers."
+ "Hook run when creating menus in `gnus-edit-form-mode' buffers."
:group 'gnus-edit-form
:type 'hook)
;;; Internal variables
:group 'gnus-edit-form
:type 'hook)
;;; 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))
@@
-67,30
+67,24
@@
["Exit" gnus-edit-form-exit t]))
(gnus-run-hooks 'gnus-edit-form-menu-hook)))
["Exit" gnus-edit-form-exit t]))
(gnus-run-hooks 'gnus-edit-form-menu-hook)))
-(def
un gnus-edit-form-mode ()
+(def
ine-derived-mode gnus-edit-form-mode fundamental-mode "Edit Form"
"Major mode for editing forms.
It is a slightly enhanced emacs-lisp-mode.
\\{gnus-edit-form-mode-map}"
"Major mode for editing forms.
It is a slightly enhanced emacs-lisp-mode.
\\{gnus-edit-form-mode-map}"
- (interactive)
(when (gnus-visual-p 'group-menu 'menu)
(gnus-edit-form-make-menu-bar))
(when (gnus-visual-p 'group-menu 'menu)
(gnus-edit-form-make-menu-bar))
- (kill-all-local-variables)
- (setq major-mode 'gnus-edit-form-mode)
- (setq mode-name "Edit Form")
- (use-local-map gnus-edit-form-mode-map)
(make-local-variable 'gnus-edit-form-done-function)
(make-local-variable 'gnus-edit-form-done-function)
- (make-local-variable 'gnus-prev-winconf)
- (gnus-run-hooks 'gnus-edit-form-mode-hook))
+ (make-local-variable 'gnus-prev-winconf))
-(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
"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)))
(let ((winconf (current-window-configuration)))
- (set-buffer (get-buffer-create gnus-edit-form-buffer))
- (gnus-configure-windows 'edit-form)
- (gnus-add-current-to-buffer-list)
+ (set-buffer (gnus-get-buffer-create gnus-edit-form-buffer))
+ (gnus-configure-windows (or layout 'edit-form))
(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
+99,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
+107,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)))