projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use assoc instead of assoc-string to avoid warning on XEmacs.
[gnus]
/
lisp
/
gnus-dired.el
diff --git
a/lisp/gnus-dired.el
b/lisp/gnus-dired.el
index
f9502b4
..
c38b0cd
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-2011 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>
@@
-122,6
+121,8
@@
See `mail-user-agent' for more information."
(push (buffer-name buffer) buffers))))
(nreverse buffers))))
(push (buffer-name buffer) buffers))))
(nreverse buffers))))
+(autoload 'gnus-completing-read "gnus-util")
+
;; Method to attach files to a mail composition.
(defun gnus-dired-attach (files-to-attach)
"Attach dired's marked files to a gnus message composition.
;; Method to attach files to a mail composition.
(defun gnus-dired-attach (files-to-attach)
"Attach dired's marked files to a gnus message composition.
@@
-133,7
+134,9
@@
filenames."
(mapcar
;; don't attach directories
(lambda (f) (if (file-directory-p f) nil f))
(mapcar
;; don't attach directories
(lambda (f) (if (file-directory-p f) nil f))
- (nreverse (dired-map-over-marks (dired-get-filename) nil))))))
+ (nreverse
+ (let ((arg nil)) ;; Silence XEmacs 21.5 when compiling.
+ (dired-map-over-marks (dired-get-filename) arg)))))))
(let ((destination nil)
(files-str nil)
(bufs nil))
(let ((destination nil)
(files-str nil)
(bufs nil))
@@
-152,12
+155,8
@@
filenames."
(setq destination
(if (= (length bufs) 1)
(get-buffer (car bufs))
(setq destination
(if (= (length bufs) 1)
(get-buffer (car bufs))
- (completing-read "Attach to which mail composition buffer: "
- (mapcar
- (lambda (b)
- (cons b (get-buffer b)))
- bufs)
- nil t)))
+ (gnus-completing-read "Attach to which mail composition buffer"
+ bufs t)))
;; 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