From: Dave Love <fx@gnu.org>
Date: Fri, 27 Oct 2000 16:46:11 +0000 (+0000)
Subject: 2000-10-27  Dave Love  <fx@gnu.org>
X-Git-Tag: emacs-pretest-21.0.90~504
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=62a27ccf01be539c42ae81f07f8a66da82b1f223;p=emacs.git

2000-10-27  Dave Love  <fx@gnu.org>

	* mm-decode.el (mm-valid-and-fit-image-p): Don't test
	display-graphic-p here.

2000-10-27  ShengHuo ZHU  <zsh@cs.rochester.edu>

	* mm-decode.el (mm-viewer-completion-map): New.
	(mm-interactively-view-part): Use it.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f67b0f0e867..4a9a607e7de 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,19 @@
+2000-10-27  Dave Love  <fx@gnu.org>
+
+	* mm-decode.el (mm-valid-and-fit-image-p): Don't test
+	display-graphic-p here.
+
+2000-10-27  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mm-decode.el (mm-viewer-completion-map): New.
+	(mm-interactively-view-part): Use it.
+
+2000-10-27  Simon Josefsson  <sj@extundo.com>
+
+	* mail-source.el (mail-sources): IMAP predicate is a string.
+	(mail-sources): Add default values for IMAP mailbox, predicate and
+	fetchflag.
+
 2000-10-27  Miles Bader  <miles@lsi.nec.co.jp>
 
 	* gnus-ems.el (gnus-ems-redefine): Use (featurep 'xemacs) instead
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 3e24795f6a9..84d393a2af0 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -3,6 +3,7 @@
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Maintainer: bugs@gnus.org
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -219,6 +220,15 @@ to:
 ;; "message/rfc822".
 (defvar mm-dissect-default-type "text/plain")
 
+(defvar mm-viewer-completion-map
+  (let ((map (make-sparse-keymap 'mm-viewer-completion-map)))
+    (set-keymap-parent map minibuffer-local-completion-map)
+    map)
+  "Keymap for input viewer with completion.")
+
+;; Should we bind other key to minibuffer-complete-word?
+(define-key mm-viewer-completion-map " " 'self-insert-command) 
+
 ;;; The functions.
 
 (defun mm-dissect-buffer (&optional no-strict-mime)
@@ -710,7 +720,9 @@ external if displayed external."
 	 (methods
 	  (mapcar (lambda (i) (list (cdr (assoc 'viewer i))))
 		  (mailcap-mime-info type 'all)))
-	 (method (completing-read "Viewer: " methods)))
+	 (method (let ((minibuffer-local-completion-map
+			mm-viewer-completion-map))
+		   (completing-read "Viewer: " methods))))
     (when (string= method "")
       (error "No method given"))
     (if (string-match "^[^% \t]+$" method) 
@@ -828,8 +840,7 @@ external if displayed external."
 
 (defun mm-valid-and-fit-image-p (format handle)
   "Say whether FORMAT can be displayed natively and HANDLE fits the window."
-  (and (display-graphic-p)
-       (mm-valid-image-format-p format)
+  (and (mm-valid-image-format-p format)
        (mm-image-fit-p handle)))
 
 (provide 'mm-decode)