projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(gnus-summary-refer-thread): Implement a version that uses *-request-thread.
[gnus]
/
lisp
/
gnus-vm.el
diff --git
a/lisp/gnus-vm.el
b/lisp/gnus-vm.el
index
11d99da
..
9ca7813
100644
(file)
--- a/
lisp/gnus-vm.el
+++ b/
lisp/gnus-vm.el
@@
-1,15
+1,17
@@
;;; gnus-vm.el --- vm interface for Gnus
;;; gnus-vm.el --- vm interface for Gnus
-;; Copyright (C) 1994,95,96 Free Software Foundation, Inc.
+
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Per Persson <pp@gnu.ai.mit.edu>
;; Keywords: news, mail
;; This file is part of GNU Emacs.
;; Author: Per Persson <pp@gnu.ai.mit.edu>
;; Keywords: news, mail
;; 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
@@
-17,15
+19,13
@@
;; 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:
-;; Major contributors:
+;; Major contributors:
;; Christian Limpach <Christian.Limpach@nice.ch>
;; Christian Limpach <Christian.Limpach@nice.ch>
-;; Some code stolen from:
+;; Some code stolen from:
;; Rick Sladkey <jrs@world.std.com>
;;; Code:
;; Rick Sladkey <jrs@world.std.com>
;;; Code:
@@
-36,6
+36,7
@@
(require 'gnus-msg)
(eval-when-compile
(require 'gnus-msg)
(eval-when-compile
+ (require 'cl)
(autoload 'vm-mode "vm")
(autoload 'vm-save-message "vm")
(autoload 'vm-forward-message "vm")
(autoload 'vm-mode "vm")
(autoload 'vm-save-message "vm")
(autoload 'vm-forward-message "vm")
@@
-46,11
+47,10
@@
"Inhibit loading `win-vm' if using a window-system.
Has to be set before gnus-vm is loaded.")
"Inhibit loading `win-vm' if using a window-system.
Has to be set before gnus-vm is loaded.")
-(or gnus-vm-inhibit-window-system
- (condition-case nil
- (when window-system
- (require 'win-vm))
- (error nil)))
+(unless gnus-vm-inhibit-window-system
+ (ignore-errors
+ (when window-system
+ (require 'win-vm))))
(when (not (featurep 'vm))
(load "vm"))
(when (not (featurep 'vm))
(load "vm"))
@@
-74,7
+74,7
@@
Has to be set before gnus-vm is loaded.")
(insert "\n")
(vm-mode)
tmp-folder))
(insert "\n")
(vm-mode)
tmp-folder))
-
+
(defun gnus-summary-save-article-vm (&optional arg)
"Append the current article to a vm folder.
If N is a positive number, save the N next articles.
(defun gnus-summary-save-article-vm (&optional arg)
"Append the current article to a vm folder.
If N is a positive number, save the N next articles.
@@
-82,30
+82,25
@@
If N is a negative number, save the N previous articles.
If N is nil and any articles have been marked with the process mark,
save those articles instead."
(interactive "P")
If N is nil and any articles have been marked with the process mark,
save those articles instead."
(interactive "P")
+ (require 'gnus-art)
(let ((gnus-default-article-saver 'gnus-summary-save-in-vm))
(gnus-summary-save-article arg)))
(defun gnus-summary-save-in-vm (&optional folder)
(interactive)
(let ((gnus-default-article-saver 'gnus-summary-save-in-vm))
(gnus-summary-save-article arg)))
(defun gnus-summary-save-in-vm (&optional folder)
(interactive)
- (let ((default-name
- (funcall gnus-mail-save-name gnus-newsgroup-name
- gnus-current-headers gnus-newsgroup-last-mail)))
- (setq folder
- (cond ((eq folder 'default) default-name)
- (folder folder)
- (t (gnus-read-save-file-name
- "Save %s in VM folder:" default-name))))
- (gnus-make-directory (file-name-directory folder))
- (set-buffer gnus-original-article-buffer)
+ (setq folder
+ (gnus-read-save-file-name
+ "Save %s in VM folder:" folder
+ gnus-mail-save-name gnus-newsgroup-name
+ gnus-current-headers 'gnus-newsgroup-last-mail))
+ (gnus-eval-in-buffer-window gnus-original-article-buffer
(save-excursion
(save-restriction
(widen)
(let ((vm-folder (gnus-vm-make-folder)))
(vm-save-message folder)
(save-excursion
(save-restriction
(widen)
(let ((vm-folder (gnus-vm-make-folder)))
(vm-save-message folder)
- (kill-buffer vm-folder))))
- ;; Remember the directory name to save articles.
- (setq gnus-newsgroup-last-mail folder)))
+ (kill-buffer vm-folder))))))
(provide 'gnus-vm)
(provide 'gnus-vm)
-;;; gnus-vm.el ends here
.
+;;; gnus-vm.el ends here