*** dist/vm-crypto.el.dist	Sun Nov 18 23:57:24 2001
--- vm-crypto.el	Tue Jan  1 23:13:51 2002
***************
*** 17,18 ****
--- 17,20 ----
  
+ (provide 'vm-crypto)
+ 
  ;; compatibility
***************
*** 124,126 ****
  				 (format "%d:%s:%s" local-port host port))
! 			   vm-ssh-program-switches
  			   (list host vm-ssh-remote-command)))
--- 126,128 ----
  				 (format "%d:%s:%s" local-port host port))
! 			   (copy-sequence vm-ssh-program-switches)
  			   (list host vm-ssh-remote-command)))
*** dist/vm-menu.el.dist	Mon Dec  3 08:03:04 2001
--- vm-menu.el	Tue Jan 22 13:10:10 2002
***************
*** 67,69 ****
     ["Expunge" vm-expunge-folder vm-message-list]
!    ["Expunge POP Messages" vm-expunge-pop-messages t]
     "---"
--- 67,70 ----
     ["Expunge" vm-expunge-folder vm-message-list]
!    ["Expunge POP Messages" vm-expunge-pop-messages
!     (vm-menu-can-expunge-pop-messages-p)]
     "---"
***************
*** 611,612 ****
--- 612,620 ----
  	     (not (vm-mime-plain-message-p (car vm-message-pointer)))))
+     (error nil)))
+ 
+ (defun vm-menu-can-expunge-pop-messages-p ()
+   (condition-case nil
+       (save-excursion
+ 	(vm-select-folder-buffer)
+ 	(not (eq vm-folder-access-method 'pop)))
      (error nil)))
*** dist/vm-mime.el.dist	Mon Dec  3 08:03:04 2001
--- vm-mime.el	Thu Jan 17 17:28:58 2002
***************
*** 27,29 ****
  (if (fboundp 'define-error)
!     (define-error 'vm-mime-error "MIME error")
    (put 'vm-mime-error 'error-conditions '(vm-mime-error error))
--- 27,33 ----
  (if (fboundp 'define-error)
!     (progn
!       (define-error 'vm-image-too-small "Image too small")
!       (define-error 'vm-mime-error "MIME error"))
!   (put 'vm-image-too-small 'error-conditions '(vm-image-too-small error))
!   (put 'vm-image-too-small 'error-message "Image too small")
    (put 'vm-mime-error 'error-conditions '(vm-mime-error error))
***************
*** 1320,1321 ****
--- 1324,1326 ----
  	   (and (fboundp 'w3-region)
+ 		vm-mime-use-w3-for-text/html
  		;; this because GNUS bogusly sets up autoloads
***************
*** 1343,1354 ****
  	(fake-layout (make-vector 1 (list nil)))
! 	(done nil))
!     (while (and alist (not done))
        (cond ((and (vm-mime-types-match (car (car alist)) type)
! 		  (or (progn
! 			(setcar (aref fake-layout 0) (nth 1 (car alist)))
! 			(vm-mime-can-display-internal fake-layout))
! 		      (vm-mime-find-external-viewer (nth 1 (car alist)))))
! 	     (setq done t))
! 	    (t (setq alist (cdr alist)))))
!     (and alist (car alist))))
  
--- 1348,1363 ----
  	(fake-layout (make-vector 1 (list nil)))
! 	best second-best)
!     (while (and alist (not best))
        (cond ((and (vm-mime-types-match (car (car alist)) type)
! 		  (not (vm-mime-types-match (nth 1 (car alist)) type)))
! 	     (cond ((and (not best)
! 			 (progn
! 			   (setcar (aref fake-layout 0) (nth 1 (car alist)))
! 			   (vm-mime-can-display-internal fake-layout)))
! 		    (setq best (car alist)))
! 		   ((and (not second-best)
! 			 (vm-mime-find-external-viewer (nth 1 (car alist))))
! 		    (setq second-best (car alist))))))
!       (setq alist (cdr alist)))
!     (or best second-best)))
  
***************
*** 2050,2051 ****
--- 2059,2110 ----
  	     (setq best-layout (or best second-best
+ 				   (car (vm-mm-layout-parts layout))))))
+ 	  ((and (consp vm-mime-alternative-select-method)
+ 		(eq (car vm-mime-alternative-select-method)
+ 		    'favorite-internal))
+ 	   (let ((done nil)
+ 		 (best nil)
+ 		 (saved-part-list
+ 		  (nreverse (copy-sequence (vm-mm-layout-parts layout))))
+ 		 (favs (cdr vm-mime-alternative-select-method))
+ 		 (second-best nil)
+ 		 part-list type)
+ 	     (while (and favs (not done))
+ 	       (setq part-list saved-part-list)
+ 	       (while (and part-list (not done))
+ 		 (setq type (car (vm-mm-layout-type (car part-list))))
+ 		 (cond ((or (vm-mime-can-display-internal (car part-list) t)
+ 			    (vm-mime-find-external-viewer type))
+ 			(if (vm-mime-types-match (car favs) type)
+ 			    (setq best (car part-list)
+ 				  done t)
+ 			  (or second-best
+ 			      (setq second-best (car part-list))))))
+ 		 (setq part-list (cdr part-list)))
+ 	       (setq favs (cdr favs)))
+ 	     (setq best-layout (or best second-best
+ 				   (car (vm-mm-layout-parts layout))))))
+ 	  ((and (consp vm-mime-alternative-select-method)
+ 		(eq (car vm-mime-alternative-select-method) 'favorite))
+ 	   (let ((done nil)
+ 		 (best nil)
+ 		 (saved-part-list
+ 		  (nreverse (copy-sequence (vm-mm-layout-parts layout))))
+ 		 (favs (cdr vm-mime-alternative-select-method))
+ 		 (second-best nil)
+ 		 part-list type)
+ 	     (while (and favs (not done))
+ 	       (setq part-list saved-part-list)
+ 	       (while (and part-list (not done))
+ 		 (setq type (car (vm-mm-layout-type (car part-list))))
+ 		 (cond ((and (vm-mime-can-display-internal (car part-list) t)
+ 			     (vm-mime-should-display-internal (car part-list)
+ 							      nil))
+ 			(if (vm-mime-types-match (car favs) type)
+ 			    (setq best (car part-list)
+ 				  done t)
+ 			  (or second-best
+ 			      (setq second-best (car part-list))))))
+ 		 (setq part-list (cdr part-list)))
+ 	       (setq favs (cdr favs)))
+ 	     (setq best-layout (or best second-best
  				   (car (vm-mm-layout-parts layout)))))))
***************
*** 2508,2514 ****
  	  (delete-region start end))
! 	(if (or (not (bolp))
! 		(bobp)
! 		(= (point) (vm-text-of (vm-mm-layout-message layout)))
! 		(map-extents 'extent-property nil (1- (point)) (point)
! 			     'begin-glyph))
  	    (insert "\n"))
--- 2567,2569 ----
  	  (delete-region start end))
! 	(if (not (bolp))
  	    (insert "\n"))
***************
*** 2519,2522 ****
  		   (let ((strips (vm-make-image-strips tempfile
! 						       (font-height
! 							(face-font 'default))
  						       image-type
--- 2574,2577 ----
  		   (let ((strips (vm-make-image-strips tempfile
! 						       (* 2 (font-height
! 							(face-font 'default)))
  						       image-type
***************
*** 2541,2544 ****
  						 "|image|"))))))
! 		       (setq e (vm-make-extent (1- (point)) (point)))
! 		       (if (cdr strips) (insert "\n"))
  		       (vm-set-extent-property e 'begin-glyph g)
--- 2596,2599 ----
  						 "|image|"))))))
! 		       (insert " \n")
! 		       (setq e (vm-make-extent (- (point) 2) (1- (point))))
  		       (vm-set-extent-property e 'begin-glyph g)
***************
*** 2587,2590 ****
  	       (set-glyph-baseline g 100)
! 	       (set-glyph-face g 'vm-monochrome-image)
! 	       (setq e (vm-make-extent (1- (point)) (point)))
  	       (vm-set-extent-property e 'begin-glyph g)
--- 2642,2647 ----
  	       (set-glyph-baseline g 100)
! 	       (if (memq image-type '(xbm))
! 		   (set-glyph-face g 'vm-monochrome-image))
! 	       (insert " \n")
! 	       (setq e (vm-make-extent (- (point) 2) (1- (point))))
  	       (vm-set-extent-property e 'begin-glyph g)
***************
*** 2972,2974 ****
        (set-glyph-baseline g 50)
!       (set-glyph-face g 'vm-monochrome-image)
        (set-extent-begin-glyph (car extents) g)
--- 3029,3032 ----
        (set-glyph-baseline g 50)
!       (if (memq image-type '(xbm))
! 	  (set-glyph-face g 'vm-monochrome-image))
        (set-extent-begin-glyph (car extents) g)
***************
*** 3057,3059 ****
  	     (set-glyph-baseline g 50)
! 	     (set-glyph-face g 'vm-monochrome-image)
  	     (set-extent-begin-glyph (car eee) g)))
--- 3115,3118 ----
  	     (set-glyph-baseline g 50)
! 	     (if (memq image-type '(xbm))
! 		 (set-glyph-face g 'vm-monochrome-image))
  	     (set-extent-begin-glyph (car eee) g)))
***************
*** 3291,3295 ****
        (let ((dir vm-image-directory)
! 	    ;; no device-bitplanes under FSF Emacs, so assume we
! 	    ;; have a >=16-bit display
! 	    (colorful t)
  	    (tuples
--- 3350,3356 ----
        (let ((dir vm-image-directory)
! 	    ;; no display-planes function under FSF Emacs before
! 	    ;; v21, so only try to use it if present.
! 	    (colorful (if (fboundp 'display-planes)
! 			  (> (display-planes) 15)
! 			t))
  	    (tuples
*** dist/vm-minibuf.el.dist	Sun Nov 26 16:19:33 2000
--- vm-minibuf.el	Thu Dec 27 11:14:56 2001
***************
*** 31,32 ****
--- 31,33 ----
  		     (point-min)))
+ 	(case-fold-search completion-ignore-case)
  	trimmed-c-list c-list beg end diff word word-prefix-regexp completion)
***************
*** 89,93 ****
         ;; We have some completion chars.  Insert them.
!        ((> diff 0)
  	(goto-char end)
! 	(insert (substring completion (- diff)))
  	(if (and vm-completion-auto-space
--- 90,96 ----
         ;; We have some completion chars.  Insert them.
!        ((or (> diff 0)
! 	    (and (zerop diff) (not (string-equal completion word))))
  	(goto-char end)
! 	(delete-char (- (length word)))
! 	(insert completion)
  	(if (and vm-completion-auto-space
*** dist/vm-page.el.dist	Sun Nov 25 22:09:21 2001
--- vm-page.el	Tue Jan 15 10:58:22 2002
***************
*** 242,252 ****
  
! (defun vm-scroll-forward-one-line ()
!   "Scroll forward one line."
!   (interactive)
!   (vm-scroll-forward 1))
  
! (defun vm-scroll-backward-one-line ()
!   "Scroll backward one line."
!   (interactive)
!   (vm-scroll-forward -1))
  
--- 242,256 ----
  
! (defun vm-scroll-forward-one-line (&optional count)
!   "Scroll forward one line.
! Prefix arg N means scroll forward N lines.
! Negative arg means scroll backward."
!   (interactive "p")
!   (vm-scroll-forward count))
  
! (defun vm-scroll-backward-one-line (&optional count)
!   "Scroll backward one line.
! Prefix arg N means scroll backward N lines.
! Negative arg means scroll forward."
!   (interactive "p")
!   (vm-scroll-forward (- count)))
  
***************
*** 587,589 ****
    ;; message in the previewed state.  Save some time later by not
!   ;; doing preview action that hte user will never see anyway.
    (let ((just-passing-through
--- 591,593 ----
    ;; message in the previewed state.  Save some time later by not
!   ;; doing preview action that the user will never see anyway.
    (let ((just-passing-through
*** dist/vm-pop.el.dist	Mon Dec  3 08:03:04 2001
--- vm-pop.el	Sat Jan  5 15:19:18 2002
***************
*** 250,251 ****
--- 250,253 ----
    (vm-error-if-virtual-folder)
+   (if (and (interactive-p) (eq vm-folder-access-method 'pop))
+       (error "This command is not meant for POP folders.  Use the normal folder expunge instead."))
    (let ((process nil)
***************
*** 993,995 ****
  						statblob)
! 		     (setq r-list (cdr r-list))))
  	       (error
--- 995,998 ----
  						statblob)
! 		     (setq r-list (cdr r-list)
! 			   n (1+ n))))
  	       (error
*** dist/vm-reply.el.dist	Sun Nov 25 22:09:21 2001
--- vm-reply.el	Sun Dec  9 18:53:49 2001
***************
*** 482,483 ****
--- 482,494 ----
  
+ (defvar vm-dont-ask-coding-system-question nil)
+ 
+ (cond ((and vm-fsfemacs-mule-p
+ 	    (not (fboundp 'vm-old-select-message-coding-system)))
+        (fset 'vm-old-select-message-coding-system
+ 	     (symbol-function 'select-message-coding-system))
+        (defun select-message-coding-system (&rest ignored)
+ 	 (if vm-dont-ask-coding-system-question
+ 	     nil
+ 	   (apply 'vm-old-select-message-coding-system ignored)))))
+ 
  (defun vm-mail-send ()
***************
*** 530,532 ****
        ;; also protect value of this-command from minibuffer reads
!       (let ((this-command this-command))
  	(save-excursion
--- 541,547 ----
        ;; also protect value of this-command from minibuffer reads
!       (let ((this-command this-command)
! 	    ;; For Emacs 21.
! 	    (mail-send-nonascii t)
! 	    (sendmail-coding-system (vm-binary-coding-system))
! 	    (vm-dont-ask-coding-system-question t))
  	(save-excursion
*** dist/vm-startup.el.dist	Mon Dec  3 08:03:05 2001
--- vm-startup.el	Tue Jan 22 13:37:46 2002
***************
*** 354,356 ****
  
! This is VM 7.00.
  
--- 354,356 ----
  
! This is VM 7.01.
  
***************
*** 561,562 ****
--- 561,563 ----
     vm-imagemagick-convert-program
+    vm-imagemagick-identify-program
     vm-imap-auto-expunge-alist
***************
*** 866,867 ****
--- 867,870 ----
    (vm-check-for-killed-summary)
+   (if (and (equal folder "") (stringp vm-last-visit-pop-folder))
+       (setq folder vm-last-visit-pop-folder))
    (if (null (vm-pop-find-spec-for-name folder))
***************
*** 1318,1319 ****
--- 1321,1323 ----
        'vm-imagemagick-convert-program
+       'vm-imagemagick-identify-program
  ;; IMAP passwords might be listed here
*** dist/vm-summary.el.dist	Mon Dec  3 08:03:05 2001
--- vm-summary.el	Tue Jan 22 11:21:01 2002
***************
*** 757,759 ****
  		    (zerop (length year)))
! 		(string-match "\\(^\\| \\)\\([0-9]+\\) " date start))
        (setq string (substring date (match-beginning 2) (match-end 2))
--- 757,759 ----
  		    (zerop (length year)))
! 		(string-match "\\(^\\| \\)\\([0-9]+\\)\\($\\| \\)" date start))
        (setq string (substring date (match-beginning 2) (match-end 2))
*** dist/vm-vars.el.dist	Mon Dec  3 08:03:05 2001
--- vm-vars.el	Sun Jan 20 08:02:12 2002
***************
*** 952,954 ****
  `vm-mime-internal-content-types').  If none of the parts can be
! displayed internally, behavior reverts to that of 'best.")
  
--- 952,970 ----
  `vm-mime-internal-content-types').  If none of the parts can be
! displayed internally, behavior reverts to that of 'best.
! 
! The value can also be a list of the form
! 
! (favorite TYPE ...)
! 
! with the first element of the list being the symbol 'favorite'.  The
! remaining elements of the list are strings specifying MIME types.
! VM will look for each TYPE in turn in the list of alternatives and
! choose the first matching alternative found that can be displayed.
! If the symbol 'favorite' is 'favorite-internal' instead, the first TYPE
! that matches an alternative that can be displayed internally will be
! chosen.")
! 
! (defvar vm-mime-use-w3-for-text/html t
!   "*Non-nil means use Emacs W3 to display text/html MIME objects
! Nil means don't use W3 for this.")
  
***************
*** 1068,1071 ****
  	 (list "image" "image/tiff" (format "%s - tiff:-" x))
- 	 (list "image" "image/pbm" (format "%s - pbm:-" x))
  	 (list "image" "image/xpm" (format "%s - xpm:-" x))
  	 (list "image" "image/xbm" (format "%s - xbm:-" x))
--- 1084,1087 ----
  	 (list "image" "image/tiff" (format "%s - tiff:-" x))
  	 (list "image" "image/xpm" (format "%s - xpm:-" x))
+ 	 (list "image" "image/pbm" (format "%s - pbm:-" x))
  	 (list "image" "image/xbm" (format "%s - xbm:-" x))
***************
*** 1273,1275 ****
      ("application/pdf"		.	".pdf")
!     ("application/vnd.ms.excel"	.	".xls")
      ("application/mac-binhex40"	.	".hqx")
--- 1289,1291 ----
      ("application/pdf"		.	".pdf")
!     ("application/vnd.ms-excel"	.	".xls")
      ("application/mac-binhex40"	.	".hqx")
***************
*** 1277,1279 ****
      ("application/zip"		.	".zip")
! )
    "*Alist used to select a filename suffix for MIME object temporary files.
--- 1293,1295 ----
      ("application/zip"		.	".zip")
!    )
    "*Alist used to select a filename suffix for MIME object temporary files.
***************
*** 3233,3235 ****
  (defvar vm-stunnel-program-switches nil
!   "*List of command line switches to pass to stunnel.")
  
--- 3249,3253 ----
  (defvar vm-stunnel-program-switches nil
!   "*List of command line switches to pass to stunnel.
! Leave this set to nil unless you understand how VM uses stunnel
! and know that you need to change something to get stunnel working.")
  
***************
*** 3245,3247 ****
  found, the OpenSSL library will refuse wto work and stunnel will
! not be able to estaible an SSL connection.
  
--- 3263,3265 ----
  found, the OpenSSL library will refuse wto work and stunnel will
! not be able to establish an SSL connection.
  
*** dist/vm-version.el.dist	Mon Dec  3 08:03:05 2001
--- vm-version.el	Tue Jan 22 13:37:46 2002
***************
*** 4,6 ****
  
! (defconst vm-version "7.00"
    "Version number of VM.")
--- 4,6 ----
  
! (defconst vm-version "7.01"
    "Version number of VM.")