* mml.el (mml-mode): Replace gnus-add-minor-mode with

[gnus] / lisp / gnus-dired.el

diff --git a/lisp/gnus-dired.el b/lisp/gnus-dired.el
index 1f65b01..3937874 100644 (file)
--- 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>,
@@ -31,7 +31,7 @@
 ;; have the effect of installing keybindings in dired-mode, place the
 ;; following in your ~/.gnus:
 
-;; (require 'gnus-dired)
+;; (require 'gnus-dired) ;, isn't needed due to autoload cookies
 ;; (add-hook 'dired-mode-hook 'turn-on-gnus-dired-mode)
 
 ;; Note that if you visit dired buffers before your ~/.gnus file has
@@ -58,8 +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-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.
@@ -71,11 +72,12 @@
         (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))))
 
-;; Convenience method to turn on gnus-dired-mode.
-(defsubst turn-on-gnus-dired-mode ()
+;;;###autoload
+(defun turn-on-gnus-dired-mode ()
+  "Convenience method to turn on gnus-dired-mode."
   (gnus-dired-mode 1))
 
 ;; Method to attach files to a gnus composition.
@@ -93,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
@@ -101,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? "))
@@ -137,18 +139,18 @@ If ARG is non-nil, open it in a new buffer."
                (file-name-sans-versions (dired-get-filename) t)
                current-prefix-arg))
   (mailcap-parse-mailcaps)
-  (if (and (file-exists-p file-name)
-          (not (file-directory-p file-name)))
+  (if (file-exists-p file-name)
       (let (mime-type method)
        (if (and (not arg)
+                (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)
@@ -162,6 +164,43 @@ If ARG is non-nil, open it in a new buffer."
        (error "File is a symlink to a nonexistent target")
       (error "File no longer exists; type `g' to update Dired buffer"))))
 
+(defun gnus-dired-print (&optional file-name print-to)
+  "In dired, print FILE-NAME according to the mailcap file.
+
+If there is no print command, print in a PostScript image. If the
+optional argument PRINT-TO is nil, send the image to the printer. If
+PRINT-TO is a string, save the PostScript image in a file with that
+name.  If PRINT-TO is a number, prompt the user for the name of the
+file to save in."
+  (interactive (list
+               (file-name-sans-versions (dired-get-filename) t)
+               (ps-print-preprint current-prefix-arg)))
+  (mailcap-parse-mailcaps)
+  (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
+                     (match-string 0 file-name)))
+              (stringp
+               (setq method (mailcap-mime-info mime-type "print"))))
+         (call-process shell-file-name nil
+                       (generate-new-buffer " *mm*")
+                       nil
+                       shell-command-switch
+                       (mm-mailcap-command method file-name mime-type))
+       (with-temp-buffer
+         (insert-file-contents file-name)
+         (gnus-print-buffer))
+       (ps-despool print-to))))
+   ((file-symlink-p file-name)
+     (error "File is a symlink to a nonexistent target"))
+    (t
+     (error "File no longer exists; type `g' to update Dired buffer"))))
+
 (provide 'gnus-dired)
 
 ;;; gnus-dired.el ends here