*** dist/Makefile.dist	Sun Jan 17 17:42:31 1999
--- Makefile	Sat Feb 27 19:36:13 1999
***************
*** 28,30 ****
  # incorrectly.  also preload a file that sets byte compiler options.
! PRELOADS = -l $(BYTEOPTS) -l ./vm-message.el -l ./vm-macro.el -l ./vm-vars.el  -l ./vm-version.el
  
--- 28,30 ----
  # incorrectly.  also preload a file that sets byte compiler options.
! PRELOADS = -l $(BYTEOPTS) -l ./vm-version.el -l ./vm-message.el -l ./vm-macro.el -l ./vm-vars.el  
  
***************
*** 40,42 ****
--- 40,45 ----
  
+ # vm-version.elc needs to be first in this list, because load time
+ # code needs the Emacs/XEmacs MULE/no-MULE feature stuff.
  OBJECTS = \
+     vm-version.elc \
      vm-delete.elc vm-digest.elc vm-easymenu.elc vm-edit.elc vm-folder.elc \
***************
*** 49,51 ****
      vm-toolbar.elc vm-undo.elc \
!     vm-user.elc vm-vars.elc vm-version.elc vm-virtual.elc vm-window.elc
  
--- 52,54 ----
      vm-toolbar.elc vm-undo.elc \
!     vm-user.elc vm-vars.elc vm-virtual.elc vm-window.elc
  
***************
*** 70,74 ****
  	@echo "building vm.elc (with all modules set to autoload)..."
! 	@echo "(require 'vm-startup)" > vm.elc
  	@echo "(require 'vm-vars)" >> vm.elc
- 	@echo "(require 'vm-version)" >> vm.elc
  	@echo "(require 'vm-autoload)" >> vm.elc
--- 73,77 ----
  	@echo "building vm.elc (with all modules set to autoload)..."
! 	@echo "(require 'vm-version)" > vm.elc
! 	@echo "(require 'vm-startup)" >> vm.elc
  	@echo "(require 'vm-vars)" >> vm.elc
  	@echo "(require 'vm-autoload)" >> vm.elc
*** dist/vm-menu.el.dist	Fri Feb  5 01:41:59 1999
--- vm-menu.el	Sat Feb 27 20:00:04 1999
***************
*** 46,75 ****
  
- ;; copied from vm-vars.el because vm-xemacs-p, vm-xemacs-mule-p, 
- ;; vm-fsfemacs-mule-p, and vm-fsfemacs-p are needed below at load time
- ;; and vm-note-emacs-version may not be autoloadable.
- (or (fboundp 'vm-note-emacs-version)
-     (defun vm-note-emacs-version ()
-       (setq vm-xemacs-p (string-match "XEmacs" emacs-version)
- 	    vm-xemacs-mule-p (and vm-xemacs-p (featurep 'mule)
- 				  ;; paranoia
- 				  (fboundp 'set-buffer-file-coding-system))
- 	    vm-fsfemacs-p (not vm-xemacs-p)
- 	    vm-fsfemacs-mule-p (and (not vm-xemacs-mule-p) (featurep 'mule)
- 				    (fboundp 'set-buffer-file-coding-system)))))
- 
- ;; make sure the emacs/xemacs version variables are set, as they
- ;; are needed below at load time.
- (vm-note-emacs-version)
- 
- (defun vm-menu-fsfemacs-menus-p ()
-   (and vm-fsfemacs-p
-        (fboundp 'menu-bar-mode)))
- 
- (defun vm-menu-xemacs-menus-p ()
-   (and vm-xemacs-p
-        (fboundp 'set-buffer-menubar)))
- 
- (defun vm-fsfemacs-p ()
-   (not (string-match "XEmacs\\|Lucid" emacs-version)))
- 
  (defvar vm-menu-folders-menu 
--- 46,47 ----
*** dist/vm-mime.el.dist	Thu Feb 25 23:30:53 1999
--- vm-mime.el	Mon Mar  1 12:21:19 1999
***************
*** 2114,2115 ****
--- 2114,2137 ----
  
+ (defun vm-mime-reader-map-save-file ()
+   (interactive)
+   (vm-mime-run-display-function-at-point 'vm-mime-send-body-to-file))
+ 
+ (defun vm-mime-reader-map-pipe-to-command ()
+   (interactive)
+   (vm-mime-run-display-function-at-point
+    'vm-mime-pipe-body-to-queried-command))
+ 
+ (defun vm-mime-reader-map-pipe-to-printer ()
+   (interactive)
+   (vm-mime-run-display-function-at-point 'vm-mime-send-body-to-printer))
+ 
+ (defun vm-mime-reader-map-display-using-external-viewer ()
+   (interactive)
+   (vm-mime-run-display-function-at-point
+    'vm-mime-display-body-using-external-viewer))
+ 
+ (defun vm-mime-reader-map-display-using-default ()
+   (interactive)
+   (vm-mime-run-display-function-at-point 'vm-mime-display-body-as-text))
+ 
  ;; for the karking compiler
***************
*** 2154,2156 ****
    (let ((start (point))	e
! 	(keymap (make-sparse-keymap))
  	(buffer-read-only nil))
--- 2176,2178 ----
    (let ((start (point))	e
! 	(keymap vm-mime-reader-map)
  	(buffer-read-only nil))
***************
*** 2160,2164 ****
        (setq keymap (nconc keymap (current-local-map))))
-     (define-key keymap "\r" 'vm-mime-run-display-function-at-point)
-     (if (and (vm-mouse-xemacs-mouse-p) vm-popup-menu-on-mouse-3)
- 	(define-key keymap 'button3 'vm-menu-popup-mime-dispose-menu))
      (if (not (bolp))
--- 2182,2183 ----
***************
*** 3131,3136 ****
  		       ;; don't let buffer-file-coding-system be changed
! 		       ;; by insert-file-contents-literally.  The
  		       ;; value we bind to it to here isn't important.
  		       (buffer-file-coding-system 'binary))
! 		   (insert-file-contents-literally object))))
  	  ;; gather information about the object from the extent.
--- 3150,3155 ----
  		       ;; don't let buffer-file-coding-system be changed
! 		       ;; by insert-file-contents.  The
  		       ;; value we bind to it to here isn't important.
  		       (buffer-file-coding-system 'binary))
! 		   (insert-file-contents object))))
  	  ;; gather information about the object from the extent.
*** dist/vm-misc.el.dist	Thu Feb 25 23:30:54 1999
--- vm-misc.el	Sat Feb 27 19:45:56 1999
***************
*** 378,417 ****
  
- (defun vm-multiple-frames-possible-p () 
-   (cond (vm-xemacs-p 
- 	 (or (memq 'win (device-matching-specifier-tag-list))
- 	     (featurep 'tty-frames)))
-         (vm-fsfemacs-p 
-          (fboundp 'make-frame))))
-  
- (defun vm-mouse-support-possible-p () 
-   (cond (vm-xemacs-p 
-          (featurep 'window-system)) 
-         (vm-fsfemacs-p 
-          (fboundp 'track-mouse))))
-  
- (defun vm-mouse-support-possible-here-p ()
-   (cond (vm-xemacs-p
- 	 (memq 'win (device-matching-specifier-tag-list)))
- 	(vm-fsfemacs-p
- 	 (memq window-system '(x win32)))))
- 
- (defun vm-menu-support-possible-p ()
-   (cond (vm-xemacs-p
- 	 (featurep 'menubar))
- 	(vm-fsfemacs-p
- 	 (fboundp 'menu-bar-mode))))
-  
- (defun vm-toolbar-support-possible-p ()
-   (and vm-xemacs-p (featurep 'toolbar)))
- 
- (defun vm-multiple-fonts-possible-p ()
-   (cond (vm-xemacs-p
- 	 (memq (device-type) '(x mswindows)))
- 	(vm-fsfemacs-p
- 	 (or (eq window-system 'x)
- 	     (eq window-system 'win32)))))
- 
- (defun vm-images-possible-here-p ()
-   (and vm-xemacs-p (memq (device-type) '(x mswindows))))
- 
  (defun vm-run-message-hook (message &optional hook-variable)
--- 378,379 ----
*** dist/vm-mouse.el.dist	Thu Feb 25 23:30:54 1999
--- vm-mouse.el	Sat Feb 27 20:00:15 1999
***************
*** 19,28 ****
  
- (defun vm-mouse-fsfemacs-mouse-p ()
-   (and vm-fsfemacs-p
-        (fboundp 'set-mouse-position)))
- 
- (defun vm-mouse-xemacs-mouse-p ()
-   (and vm-xemacs-p
-        (fboundp 'set-mouse-position)))
- 
  (defun vm-mouse-set-mouse-track-highlight (start end &optional overlay)
--- 19,20 ----
***************
*** 141,144 ****
  	;; this might come in handy later if I want selectable
! 	;; objects that don't have an extent or extent keymap
! 	;; attached.
  	((vm-mouse-xemacs-mouse-p)
--- 133,135 ----
  	;; this might come in handy later if I want selectable
! 	;; objects that don't have an extent keymap attached.
  	((vm-mouse-xemacs-mouse-p)
*** dist/vm-reply.el.dist	Thu Feb 25 23:30:55 1999
--- vm-reply.el	Tue Mar 16 10:10:26 1999
***************
*** 1440,1441 ****
--- 1440,1442 ----
    (interactive)
+   (vm-session-initialization)
    (if continue
*** dist/vm-startup.el.dist	Thu Feb 25 23:30:56 1999
--- vm-startup.el	Tue Mar 16 20:58:57 1999
***************
*** 317,319 ****
  
! This is VM 6.68.
  
--- 317,319 ----
  
! This is VM 6.69.
  
*** dist/vm-vars.el.dist	Thu Feb 25 23:30:57 1999
--- vm-vars.el	Tue Mar  2 13:05:16 1999
***************
*** 784,786 ****
  
! (defvar vm-mime-default-face-charsets '("us-ascii" "iso-8859-1")
    "*List of character sets that can be displayed using the `default' face.
--- 784,789 ----
  
! (defvar vm-mime-default-face-charsets
!   (if vm-fsfemacs-mule-p
!       '("us-ascii")
!     '("us-ascii" "iso-8859-1"))
    "*List of character sets that can be displayed using the `default' face.
***************
*** 2939,2940 ****
--- 2942,2958 ----
  
+ (defvar vm-mime-reader-map
+   (let ((map (make-sparse-keymap)))
+     (define-key map "$s" 'vm-mime-reader-map-save-file)
+     (define-key map "$|" 'vm-mime-reader-map-pipe-to-command)
+     (define-key map "$p" 'vm-mime-reader-map-pipe-to-printer)
+     (define-key map "$d" 'vm-mime-reader-map-display-using-default)
+     (define-key map "$e" 'vm-mime-reader-map-display-using-external-viewer)
+     (define-key map "\r" 'vm-mime-run-display-function-at-point)
+     (cond ((vm-mouse-xemacs-mouse-p)
+ 	   (define-key map 'button3 'vm-menu-popup-mime-dispose-menu)))
+     (cond ((fboundp 'set-keymap-name)
+ 	   (set-keymap-name map 'vm-mime-reader-map)))
+     map )
+   "Keymap for the MIME buttons in VM folder buffers.")
+ 
  (defvar vm-folder-history nil
***************
*** 3564,3582 ****
  (defconst vm-mime-header-list '("MIME-Version:" "Content-"))
- (defconst vm-xemacs-p nil)
- (defconst vm-xemacs-mule-p nil)
- (defconst vm-fsfemacs-p nil)
- (defconst vm-fsfemacs-mule-p nil)
- (defun vm-xemacs-p () vm-xemacs-p)
- (defun vm-xemacs-mule-p () vm-xemacs-mule-p)
- (defun vm-fsfemacs-p () vm-fsfemacs-p)
- (defun vm-fsfemacs-mule-p () vm-fsfemacs-mule-p)
- (defun vm-note-emacs-version ()
-   (setq vm-xemacs-p (string-match "XEmacs" emacs-version)
- 	vm-xemacs-mule-p (and vm-xemacs-p (featurep 'mule)
- 			      ;; paranoia
- 			      (fboundp 'set-buffer-file-coding-system))
- 	vm-fsfemacs-p (not vm-xemacs-p)
- 	vm-fsfemacs-mule-p (and (not vm-xemacs-mule-p) (featurep 'mule)
- 				(fboundp 'set-buffer-file-coding-system))))
- (vm-note-emacs-version)
  
--- 3582,3583 ----
*** dist/vm-version.el.dist	Thu Feb 25 23:30:57 1999
--- vm-version.el	Tue Mar 16 20:58:57 1999
***************
*** 4,6 ****
  
! (defconst vm-version "6.68"
    "Version number of VM.")
--- 4,6 ----
  
! (defconst vm-version "6.69"
    "Version number of VM.")
***************
*** 10 ****
--- 10,83 ----
    vm-version)
+ 
+ (defconst vm-xemacs-p nil)
+ (defconst vm-xemacs-mule-p nil)
+ (defconst vm-fsfemacs-p nil)
+ (defconst vm-fsfemacs-mule-p nil)
+ (defun vm-xemacs-p () vm-xemacs-p)
+ (defun vm-xemacs-mule-p () vm-xemacs-mule-p)
+ (defun vm-fsfemacs-p () vm-fsfemacs-p)
+ (defun vm-fsfemacs-mule-p () vm-fsfemacs-mule-p)
+ (defun vm-note-emacs-version ()
+   (setq vm-xemacs-p (string-match "XEmacs" emacs-version)
+ 	vm-xemacs-mule-p (and vm-xemacs-p (featurep 'mule)
+ 			      ;; paranoia
+ 			      (fboundp 'set-buffer-file-coding-system))
+ 	vm-fsfemacs-p (not vm-xemacs-p)
+ 	vm-fsfemacs-mule-p (and (not vm-xemacs-mule-p) (featurep 'mule)
+ 				(fboundp 'set-buffer-file-coding-system))))
+ (vm-note-emacs-version)
+ 
+ (defun vm-mouse-fsfemacs-mouse-p ()
+   (and vm-fsfemacs-p
+        (fboundp 'set-mouse-position)))
+ 
+ (defun vm-mouse-xemacs-mouse-p ()
+   (and vm-xemacs-p
+        (fboundp 'set-mouse-position)))
+ 
+ (defun vm-menu-fsfemacs-menus-p ()
+   (and vm-fsfemacs-p
+        (fboundp 'menu-bar-mode)))
+ 
+ (defun vm-menu-xemacs-menus-p ()
+   (and vm-xemacs-p
+        (fboundp 'set-buffer-menubar)))
+ 
+ (defun vm-multiple-frames-possible-p () 
+   (cond (vm-xemacs-p 
+ 	 (or (memq 'win (device-matching-specifier-tag-list))
+ 	     (featurep 'tty-frames)))
+         (vm-fsfemacs-p 
+          (fboundp 'make-frame))))
+  
+ (defun vm-mouse-support-possible-p () 
+   (cond (vm-xemacs-p 
+          (featurep 'window-system)) 
+         (vm-fsfemacs-p 
+          (fboundp 'track-mouse))))
+  
+ (defun vm-mouse-support-possible-here-p ()
+   (cond (vm-xemacs-p
+ 	 (memq 'win (device-matching-specifier-tag-list)))
+ 	(vm-fsfemacs-p
+ 	 (memq window-system '(x win32)))))
+ 
+ (defun vm-menu-support-possible-p ()
+   (cond (vm-xemacs-p
+ 	 (featurep 'menubar))
+ 	(vm-fsfemacs-p
+ 	 (fboundp 'menu-bar-mode))))
+  
+ (defun vm-toolbar-support-possible-p ()
+   (and vm-xemacs-p (featurep 'toolbar)))
+ 
+ (defun vm-multiple-fonts-possible-p ()
+   (cond (vm-xemacs-p
+ 	 (memq (device-type) '(x mswindows)))
+ 	(vm-fsfemacs-p
+ 	 (or (eq window-system 'x)
+ 	     (eq window-system 'win32)))))
+ 
+ (defun vm-images-possible-here-p ()
+   (and vm-xemacs-p (memq (device-type) '(x mswindows))))
+