X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-dired.el;h=a12046f73b8a0b3ddfbbcff9b57a3ef826a54ad5;hb=b0eccd76f35ef80c3ad13f09e588d49358e9c22a;hp=f9502b43c06a71bdeca4bb3f73f637b976fbdaec;hpb=9b922c10bd39f8c5fa709ab420dc1134eff0181a;p=gnus

diff --git a/lisp/gnus-dired.el b/lisp/gnus-dired.el
index f9502b43c..a12046f73 100644
--- a/lisp/gnus-dired.el
+++ b/lisp/gnus-dired.el
@@ -133,7 +133,9 @@ filenames."
 	  (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))
@@ -152,12 +154,8 @@ filenames."
 	  (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