X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-dired.el;h=6c48bd5e33ea8d378dad937e5e82891a7b851e4e;hb=20bc985a3232ebba106d335afcfd6b596bb8efba;hp=14104f4ce6a7cd83ef30c22b63b171bb09b8a98c;hpb=7e6315f5e5339cc5ad13338702801ced3ea06fad;p=gnus

diff --git a/lisp/gnus-dired.el b/lisp/gnus-dired.el
index 14104f4ce..6c48bd5e3 100644
--- a/lisp/gnus-dired.el
+++ b/lisp/gnus-dired.el
@@ -1,6 +1,6 @@
 ;;; gnus-dired.el --- utility functions where gnus and dired meet
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002
+;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Authors: Benjamin Rutt <brutt@bloomington.in.us>,
@@ -21,8 +21,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 Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -58,10 +58,9 @@
   (setq gnus-dired-mode-map (make-sparse-keymap))
 
   (gnus-define-keys gnus-dired-mode-map
-    "\C-c\C-a" gnus-dired-attach
-    "\C-c\C-f" gnus-dired-find-file-mailcap
-    "\C-cP" gnus-dired-print
-    ))
+    "\C-c\C-m\C-a" gnus-dired-attach
+    "\C-c\C-m\C-l" gnus-dired-find-file-mailcap
+    "\C-c\C-m\C-p" gnus-dired-print))
 
 (defun gnus-dired-mode (&optional arg)
   "Minor mode for intersections of gnus and dired.
@@ -73,7 +72,7 @@
 	 (if (null arg) (not gnus-dired-mode)
 	   (> (prefix-numeric-value arg) 0)))
     (when gnus-dired-mode
-      (gnus-add-minor-mode 'gnus-dired-mode "" gnus-dired-mode-map)
+      (add-minor-mode 'gnus-dired-mode "" gnus-dired-mode-map)
       (gnus-run-hooks 'gnus-dired-mode-hook))))
 
 ;;;###autoload
@@ -96,7 +95,7 @@ filenames."
   (let ((destination nil)
 	(files-str nil)
 	(bufs nil))
-    ;; warn if user tries to attach without any files marked 
+    ;; warn if user tries to attach without any files marked
     (if (null files-to-attach)
 	(error "No files to attach")
       (setq files-str
@@ -104,7 +103,7 @@ filenames."
 	     (lambda (f) (file-name-nondirectory f))
 	     files-to-attach ", "))
       (setq bufs (message-buffers))
-    
+
       ;; set up destination message buffer
       (if (and bufs
 	       (y-or-n-p "Attach files to existing message buffer? "))
@@ -146,12 +145,12 @@ If ARG is non-nil, open it in a new buffer."
 		 (not (file-directory-p file-name))
 		 (string-match "\\.[^\\.]+$" file-name)
 		 (setq mime-type
-		       (mailcap-extension-to-mime 
+		       (mailcap-extension-to-mime
 			(match-string 0 file-name)))
-		 (stringp 
+		 (stringp
 		  (setq method
-			(cdr (assoc 'viewer 
-				    (car (mailcap-mime-info mime-type 
+			(cdr (assoc 'viewer
+				    (car (mailcap-mime-info mime-type
 							    'all)))))))
 	    (let ((view-command (mm-mailcap-command method file-name nil)))
 	      (message "viewing via %s" view-command)
@@ -177,16 +176,16 @@ file to save in."
 		(file-name-sans-versions (dired-get-filename) t)
 		(ps-print-preprint current-prefix-arg)))
   (mailcap-parse-mailcaps)
-  (cond 
+  (cond
    ((file-directory-p file-name)
     (error "Can't print a directory"))
    ((file-exists-p file-name)
     (let (mime-type method)
       (if (and (string-match "\\.[^\\.]+$" file-name)
 	       (setq mime-type
-		     (mailcap-extension-to-mime 
+		     (mailcap-extension-to-mime
 		      (match-string 0 file-name)))
-	       (stringp 
+	       (stringp
 		(setq method (mailcap-mime-info mime-type "print"))))
 	  (call-process shell-file-name nil
 			(generate-new-buffer " *mm*")
@@ -204,4 +203,5 @@ file to save in."
 
 (provide 'gnus-dired)
 
+;;; arch-tag: 44737731-e445-4638-a31e-713c7590ec76
 ;;; gnus-dired.el ends here