*** dist/vm-macro.el.dist	Thu Nov 23 16:16:54 2000
--- vm-macro.el	Sun Nov 26 10:37:36 2000
***************
*** 118,120 ****
  	(vm-xemacs-file-coding-p 'binary)
! 	(t 'raw-text)))
  
--- 118,120 ----
  	(vm-xemacs-file-coding-p 'binary)
! 	(t 'no-conversion)))
  
***************
*** 123,124 ****
  	(vm-xemacs-file-coding-p 'no-conversion)
! 	(t 'no-conversion)))
--- 123,124 ----
  	(vm-xemacs-file-coding-p 'no-conversion)
! 	(t 'raw-text)))
*** dist/vm-mime.el.dist	Thu Nov 23 16:16:54 2000
--- vm-mime.el	Fri Nov 24 18:14:01 2000
***************
*** 1,3 ****
  ;;; MIME support functions
! ;;; Copyright (C) 1997-1998 Kyle E. Jones
  ;;;
--- 1,3 ----
  ;;; MIME support functions
! ;;; Copyright (C) 1997-1998, 2000 Kyle E. Jones
  ;;;
***************
*** 252,254 ****
  		 (fboundp 'base64-decode-region))
! 	    (base64-decode-region start end)
  	    (and crlf (vm-mime-crlf-to-lf-region start end)))
--- 252,256 ----
  		 (fboundp 'base64-decode-region))
! 	    (condition-case data
! 		(base64-decode-region start end)
! 	      (error (vm-mime-error "%S" data)))
  	    (and crlf (vm-mime-crlf-to-lf-region start end)))
***************
*** 332,334 ****
  		 (fboundp 'base64-encode-region))
! 	    (base64-encode-region start end B-encoding))
  	   (t
--- 334,338 ----
  		 (fboundp 'base64-encode-region))
! 	    (condition-case data
! 		(base64-encode-region start end B-encoding)
! 	      (error (vm-mime-error "%S" data))))
  	   (t
***************
*** 3803,3805 ****
  		       (buffer-file-coding-system (vm-binary-coding-system)))
! 		   (insert-file-contents object))))
  	  ;; gather information about the object from the extent.
--- 3807,3817 ----
  		       (buffer-file-coding-system (vm-binary-coding-system)))
! 		   (condition-case data
! 		       (insert-file-contents object)
! 		     (error
! 		      ;; font-lock could signal this error in FSF
! 		      ;; Emacs versions prior to 21.0.  Catch it
! 		      ;; and ignore it.
! 		      (if (equal data '(error "Invalid search bound (wrong side of point)"))
! 			  nil
! 			(signal (car data) (cdr data))))))))
  	  ;; gather information about the object from the extent.
*** dist/vm-minibuf.el.dist	Thu Nov 23 16:16:54 2000
--- vm-minibuf.el	Thu Nov 23 20:16:49 2000
***************
*** 23,31 ****
  	;; In Emacs 21, during a minibuffer read the minibuffer
! 	;; contains propt as buffer text and that text is read
! 	;; only.  So we can no longer assume that (point-min) is
! 	;; where the user-entered text starts and we must avoid
! 	;; modifying that prompt text.  Calling
! 	;; previous-property-change is a kludge but it does the
! 	;; job.
! 	(point-min (previous-property-change (point) nil (point-min)))
  	trimmed-c-list c-list beg end diff word word-prefix-regexp completion)
--- 23,32 ----
  	;; In Emacs 21, during a minibuffer read the minibuffer
! 	;; contains the prompt as buffer text and that text is
! 	;; read only.  So we can no longer assume that (point-min)
! 	;; is where the user-entered text starts and we must avoid
! 	;; modifying that prompt text.  The value we want instead
! 	;; of (point-min) is (minibuffer-prompt-end).
! 	(point-min (if (fboundp 'minibuffer-prompt-end)
! 		       (minibuffer-prompt-end)
! 		     (point-min)))
  	trimmed-c-list c-list beg end diff word word-prefix-regexp completion)
*** dist/vm-misc.el.dist	Thu Nov 23 16:16:54 2000
--- vm-misc.el	Fri Nov 24 08:52:16 2000
***************
*** 527,529 ****
  (if (not (fboundp 'vm-extent-property))
!     (if (fboundp 'overlay-get)
  	(fset 'vm-extent-property 'overlay-get)
--- 527,529 ----
  (if (not (fboundp 'vm-extent-property))
!     (if vm-fsfemacs-p
  	(fset 'vm-extent-property 'overlay-get)
***************
*** 532,534 ****
  (if (not (fboundp 'vm-extent-object))
!     (if (fboundp 'overlay-buffer)
  	(fset 'vm-extent-object 'overlay-buffer)
--- 532,534 ----
  (if (not (fboundp 'vm-extent-object))
!     (if vm-fsfemacs-p
  	(fset 'vm-extent-object 'overlay-buffer)
***************
*** 537,539 ****
  (if (not (fboundp 'vm-set-extent-property))
!     (if (fboundp 'overlay-put)
  	(fset 'vm-set-extent-property 'overlay-put)
--- 537,539 ----
  (if (not (fboundp 'vm-set-extent-property))
!     (if vm-fsfemacs-p
  	(fset 'vm-set-extent-property 'overlay-put)
***************
*** 542,544 ****
  (if (not (fboundp 'vm-set-extent-endpoints))
!     (if (fboundp 'move-overlay)
  	(fset 'vm-set-extent-endpoints 'move-overlay)
--- 542,544 ----
  (if (not (fboundp 'vm-set-extent-endpoints))
!     (if vm-fsfemacs-p
  	(fset 'vm-set-extent-endpoints 'move-overlay)
***************
*** 547,549 ****
  (if (not (fboundp 'vm-make-extent))
!     (if (fboundp 'make-overlay)
  	(fset 'vm-make-extent 'make-overlay)
--- 547,549 ----
  (if (not (fboundp 'vm-make-extent))
!     (if vm-fsfemacs-p
  	(fset 'vm-make-extent 'make-overlay)
***************
*** 552,554 ****
  (if (not (fboundp 'vm-extent-end-position))
!     (if (fboundp 'overlay-end)
  	(fset 'vm-extent-end-position 'overlay-end)
--- 552,554 ----
  (if (not (fboundp 'vm-extent-end-position))
!     (if vm-fsfemacs-p
  	(fset 'vm-extent-end-position 'overlay-end)
***************
*** 557,559 ****
  (if (not (fboundp 'vm-extent-start-position))
!     (if (fboundp 'overlay-start)
  	(fset 'vm-extent-start-position 'overlay-start)
--- 557,559 ----
  (if (not (fboundp 'vm-extent-start-position))
!     (if vm-fsfemacs-p
  	(fset 'vm-extent-start-position 'overlay-start)
***************
*** 562,564 ****
  (if (not (fboundp 'vm-detach-extent))
!     (if (fboundp 'delete-overlay)
  	(fset 'vm-detach-extent 'delete-overlay)
--- 562,564 ----
  (if (not (fboundp 'vm-detach-extent))
!     (if vm-fsfemacs-p
  	(fset 'vm-detach-extent 'delete-overlay)
***************
*** 567,569 ****
  (if (not (fboundp 'vm-extent-properties))
!     (if (fboundp 'overlay-properties)
  	(fset 'vm-extent-properties 'overlay-properties)
--- 567,569 ----
  (if (not (fboundp 'vm-extent-properties))
!     (if vm-fsfemacs-p
  	(fset 'vm-extent-properties 'overlay-properties)
*** dist/vm-pop.el.dist	Thu Nov 23 16:16:54 2000
--- vm-pop.el	Sat Nov 25 15:02:23 2000
***************
*** 471,477 ****
      ;; Previously we did not read the QUIT response because of
!     ;; TCP shutdown problems (under Windows?) that made it better
!     ;; if we just closed the connection.  Microsoft Exchange
!     ;; apparently fails to expunge messages if we shut down the
!     ;; connection without reading the QUIT response.
!     (vm-pop-read-response process)
      (if (not keep-buffer)
--- 471,483 ----
      ;; Previously we did not read the QUIT response because of
!     ;; TCP shutdown problems (under Windows?) that made it
!     ;; better if we just closed the connection.  Microsoft
!     ;; Exchange apparently fails to expunge messages if we shut
!     ;; down the connection without reading the QUIT response.
!     ;; So we provide an option and let the user decide what
!     ;; works best for them.
!     (if vm-pop-read-quit-response
! 	(progn
! 	  (message "Waiting for response to POP QUIT command...")
! 	  (vm-pop-read-response process)
! 	  (message "Waiting for response to POP QUIT command... done")))
      (if (not keep-buffer)
*** dist/vm-startup.el.dist	Thu Nov 23 16:16:54 2000
--- vm-startup.el	Sun Nov 26 16:11:30 2000
***************
*** 167,178 ****
  	    (auto-fill-mode 0)
! 	    ;; This needs to be here for two reasons:
! 	    ;; 1. The summary and folder buffers must agree on
! 	    ;;    the width of 8-bit chars (4 vs. 1) because
! 	    ;;    string-width is used in the summary formatting
! 	    ;;    routines at a time when the folder buffer is
! 	    ;;    the current buffer.
! 	    ;; 2. If an 8-bit message arrives undeclared the 8-bit
! 	    ;;    characters in it should be displayed using the
! 	    ;;    user's default face charset, rather than as
! 	    ;;    octal escapes.
  	    (vm-fsfemacs-nonmule-display-8bit-chars)
--- 167,172 ----
  	    (auto-fill-mode 0)
! 	    ;; If an 8-bit message arrives undeclared the 8-bit
! 	    ;; characters in it should be displayed using the
! 	    ;; user's default face charset, rather than as octal
! 	    ;; escapes.
  	    (vm-fsfemacs-nonmule-display-8bit-chars)
***************
*** 345,347 ****
  
! This is VM 6.85.
  
--- 339,341 ----
  
! This is VM 6.86.
  
*** dist/vm-summary.el.dist	Tue Nov 14 21:42:27 2000
--- vm-summary.el	Thu Nov 23 23:07:19 2000
***************
*** 1,3 ****
  ;;; Summary gathering and formatting routines for VM
! ;;; Copyright (C) 1989-1995 Kyle E. Jones
  ;;;
--- 1,3 ----
  ;;; Summary gathering and formatting routines for VM
! ;;; Copyright (C) 1989-1995, 2000 Kyle E. Jones
  ;;;
*** dist/vm-toolbar.el.dist	Thu Nov 23 16:16:55 2000
--- vm-toolbar.el	Sun Nov 26 15:59:15 2000
***************
*** 1,3 ****
  ;;; Toolbar related functions and commands
! ;;; Copyright (C) 1995-1997 Kyle E. Jones
  ;;;
--- 1,3 ----
  ;;; Toolbar related functions and commands
! ;;; Copyright (C) 1995-1997, 2000 Kyle E. Jones
  ;;;
***************
*** 178,182 ****
  VM uses this button to offer help if you're in trouble.
! Under normal circumstances, this button runs `vm-help'.\n
  If the current folder looks out-of-date relative to its auto-save
! file then this button will run `recover-file'."])
  
--- 178,186 ----
  VM uses this button to offer help if you're in trouble.
! Under normal circumstances, this button runs `vm-help'.
  If the current folder looks out-of-date relative to its auto-save
! file then this button will run `recover-file'
! If there is mail waiting in one of the spool files associated
! with the current folder, this button will run `vm-get-new-mail'.
! If the current message needs to be MIME decoded then this button
! will run 'vm-decode-mime-message'."])
  
***************
*** 322,324 ****
    (if vm-fsfemacs-p
!       (vm-toolbar-fsfemacs-install-toolbar)
      (if (not (and (stringp vm-toolbar-pixmap-directory)
--- 326,329 ----
    (if vm-fsfemacs-p
!       (if vm-fsfemacs-toolbar-installed-p
! 	  (vm-toolbar-fsfemacs-install-toolbar))
      (if (not (and (stringp vm-toolbar-pixmap-directory)
***************
*** 487,489 ****
  	(dir vm-toolbar-pixmap-directory)
! 	(extension (if (image-type-available-p 'xpm) "xpm" "xbm"))
  	item t-spec sym name images)
--- 492,497 ----
  	(dir vm-toolbar-pixmap-directory)
! 	(extension (if (and (display-color-p)
! 			    (image-type-available-p 'xpm))
! 		       "xpm"
! 		     "xbm"))
  	item t-spec sym name images)
***************
*** 512,514 ****
  			   (intern (format "vm-toolbar-%s-button" sym))))
! 	     (if (eq sym 'mime)
  		 (setq name "mime-colorful")
--- 520,522 ----
  			   (intern (format "vm-toolbar-%s-button" sym))))
! 	     (if (and (eq sym 'mime) (string= extension "xpm"))
  		 (setq name "mime-colorful")
***************
*** 593,595 ****
  	     (define-key vm-mode-map (vector 'tool-bar 'help-getmail) item)
! 	     (setq name "mime-colorful")
  	     (setq images (vm-toolbar-make-fsfemacs-toolbar-image-spec
--- 601,605 ----
  	     (define-key vm-mode-map (vector 'tool-bar 'help-getmail) item)
! 	     (if (string= extension "xpm")
! 		 (setq name "mime-colorful")
! 	       (setq name "mime"))
  	     (setq images (vm-toolbar-make-fsfemacs-toolbar-image-spec
***************
*** 606,608 ****
  	     (define-key vm-mode-map (vector 'tool-bar 'help-mime) item)))
!       (setq button-list (cdr button-list)))))
  
--- 616,619 ----
  	     (define-key vm-mode-map (vector 'tool-bar 'help-mime) item)))
!       (setq button-list (cdr button-list))))
!   (setq vm-fsfemacs-toolbar-installed-p t))
  
***************
*** 613,614 ****
--- 624,626 ----
  	     ':type (intern extension)
+ 	     ':mask 'heuristic
  	     ':file (expand-file-name
***************
*** 619,620 ****
--- 631,633 ----
  	     ':type (intern extension)
+ 	     ':mask 'heuristic
  	     ':file (expand-file-name
***************
*** 625,626 ****
--- 638,640 ----
  	     ':type (intern extension)
+ 	     ':mask 'heuristic
  	     ':file (expand-file-name
***************
*** 631,632 ****
--- 645,647 ----
  	     ':type (intern extension)
+ 	     ':mask 'heuristic
  	     ':file (expand-file-name
***************
*** 638,639 ****
--- 653,655 ----
  	   ':type (intern extension)
+ 	   ':mask 'heuristic
  	   ':file (expand-file-name
***************
*** 644,645 ****
--- 660,662 ----
  	   ':type (intern extension)
+ 	   ':mask 'heuristic
  	   ':file (expand-file-name
***************
*** 650,651 ****
--- 667,669 ----
  	   ':type (intern extension)
+ 	   ':mask 'heuristic
  	   ':file (expand-file-name
***************
*** 656,657 ****
--- 674,676 ----
  	   ':type (intern extension)
+ 	   ':mask 'heuristic
  	   ':file (expand-file-name
*** dist/vm-vars.el.dist	Thu Nov 23 16:16:55 2000
--- vm-vars.el	Sun Nov 26 15:56:35 2000
***************
*** 286,288 ****
  remote POP server supports the UIDL command.  If the server does
! not support UIDL and you've asked VM leave messages on the server,
  VM will complain about the lack of UIDL support and not retrieve
--- 286,288 ----
  remote POP server supports the UIDL command.  If the server does
! not support UIDL and you've asked to VM leave messages on the server,
  VM will complain about the lack of UIDL support and not retrieve
***************
*** 290,291 ****
--- 290,300 ----
  
+ (defvar vm-pop-read-quit-response t
+   "*Non-nil value tells VM to read the response to the POP QUIT command.
+ Sometimes, for reasons unknown, the QUIT response never arrives
+ from some POP servers and VM will hang waiting for it.  So it is
+ useful to be able to tell VM not to wait.  Some other
+ servers will not expunge messages unless the QUIT response is
+ read, so for these servers you should set the variable's value to
+ t.")
+ 
  (defvar vm-recognize-pop-maildrops "^[^:]+:[^:]+:[^:]+:[^:]+:[^:]+"
***************
*** 2401,2403 ****
  
! This variable only has meaning under XEmacs 19.12 and beyond.
  See also `vm-toolbar-orientation' to control where the toolbar is placed.")
--- 2410,2414 ----
  
! This variable only has meaning under XEmacs 19.12 and beyond, and under
! Emacs 21 and beyond.
! 
  See also `vm-toolbar-orientation' to control where the toolbar is placed.")
***************
*** 2409,2411 ****
  
! This variable only has meaning under XEmacs 19.12 and beyond.")
  
--- 2420,2423 ----
  
! This variable only has meaning under XEmacs 19.12 and beyond.
! Under FSF Emacs 21 the toolbar is always at the top of the frame")
  
***************
*** 2494,2496 ****
  If `vm-url-retrieval-methods' value is nil, VM will not try to
! use any external programs.")
  
--- 2506,2508 ----
  If `vm-url-retrieval-methods' value is nil, VM will not try to
! use any URL retrieval methods.")
  
***************
*** 3701,3702 ****
--- 3713,3715 ----
  (defvar left-toolbar-width nil)
+ (defvar vm-fsfemacs-toolbar-installed-p nil)
  ;; this defvar matches the XEmacs one so it doesn't matter if VM
*** dist/vm-version.el.dist	Thu Nov 23 16:16:55 2000
--- vm-version.el	Sun Nov 26 16:11:30 2000
***************
*** 4,6 ****
  
! (defconst vm-version "6.85"
    "Version number of VM.")
--- 4,6 ----
  
! (defconst vm-version "6.86"
    "Version number of VM.")
*** dist/vm-window.el.dist	Thu Nov 16 00:07:05 2000
--- vm-window.el	Sat Nov 25 22:57:24 2000
***************
*** 211,213 ****
  						(symbol-value x)
! 					      x ))))
        (set-tapestry (nth 1 config) 1)
--- 211,220 ----
  						(symbol-value x)
! 					      (if (and (stringp x)
! 						       (get-buffer x)
! 						       (zerop
! 							(save-excursion
! 							  (set-buffer x)
! 							  (buffer-size))))
! 						  nonexistent
! 						x )))))
        (set-tapestry (nth 1 config) 1)
*** dist/pixmaps/help-up.xpm.dist	Sat Jun 27 22:09:04 1998
--- pixmaps/help-up.xpm	Sun Nov 26 15:00:24 2000
***************
*** 6,8 ****
  "i	c Gray20",
! "@	c rgb:ff/7f/ff",
  "T	c red",
--- 6,8 ----
  "i	c Gray20",
! "@	c rgb:e1/92/46",
  "T	c red",