projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import No Gnus v0.4.
[elisp/gnus.git-]
/
lisp
/
gnus-vm.el
diff --git
a/lisp/gnus-vm.el
b/lisp/gnus-vm.el
index
6fe4b26
..
775e0aa
100644
(file)
--- a/
lisp/gnus-vm.el
+++ b/
lisp/gnus-vm.el
@@
-1,5
+1,7
@@
;;; gnus-vm.el --- vm interface for Gnus
;;; gnus-vm.el --- vm interface for Gnus
-;; Copyright (C) 1994,95,96,97,98,99 Free Software Foundation, Inc.
+
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Per Persson <pp@gnu.ai.mit.edu>
;; Keywords: news, mail
;; Author: Per Persson <pp@gnu.ai.mit.edu>
;; Keywords: news, mail
@@
-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:
@@
-36,6
+38,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
+49,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"))
@@
-82,6
+84,7
@@
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)))
(let ((gnus-default-article-saver 'gnus-summary-save-in-vm))
(gnus-summary-save-article arg)))
@@
-102,4
+105,5
@@
save those articles instead."
(provide 'gnus-vm)
(provide 'gnus-vm)
-;;; gnus-vm.el ends here.
+;;; arch-tag: 42ca7f88-a12f-461d-be3e-cac7efb44866
+;;; gnus-vm.el ends here