projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes made in Emacs trunk
[gnus]
/
lisp
/
gnus-dired.el
diff --git
a/lisp/gnus-dired.el
b/lisp/gnus-dired.el
index
8b6d391
..
1592d73
100644
(file)
--- a/
lisp/gnus-dired.el
+++ b/
lisp/gnus-dired.el
@@
-1,7
+1,6
@@
;;; gnus-dired.el --- utility functions where gnus and dired meet
;;; gnus-dired.el --- utility functions where gnus and dired meet
-;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2001-2013 Free Software Foundation, Inc.
;; Authors: Benjamin Rutt <brutt@bloomington.in.us>,
;; Shenghuo Zhu <zsh@cs.rochester.edu>
;; Authors: Benjamin Rutt <brutt@bloomington.in.us>,
;; Shenghuo Zhu <zsh@cs.rochester.edu>
@@
-156,8
+155,8
@@
filenames."
(setq destination
(if (= (length bufs) 1)
(get-buffer (car bufs))
(setq destination
(if (= (length bufs) 1)
(get-buffer (car bufs))
- (gnus-completing-read "Attach to
which mail composition
buffer"
- bufs t)))
+ (gnus-completing-read "Attach to buffer"
+ bufs t
nil nil (car bufs)
)))
;; setup a new mail composition buffer
(let ((mail-user-agent gnus-dired-mail-mode)
;; A workaround to prevent Gnus from displaying the Gnus
;; setup a new mail composition buffer
(let ((mail-user-agent gnus-dired-mail-mode)
;; A workaround to prevent Gnus from displaying the Gnus
@@
-252,7
+251,7
@@
file to save in."
(if (eq gnus-dired-mail-mode 'gnus-user-agent)
(gnus-print-buffer)
;; FIXME:
(if (eq gnus-dired-mail-mode 'gnus-user-agent)
(gnus-print-buffer)
;; FIXME:
- (error "MIME print only implemeted via Gnus")))
+ (error "MIME print only impleme
n
ted via Gnus")))
(ps-despool print-to))))
((file-symlink-p file-name)
(error "File is a symlink to a nonexistent target"))
(ps-despool print-to))))
((file-symlink-p file-name)
(error "File is a symlink to a nonexistent target"))