*** dist/Makefile.dist	Tue Jun  6 01:48:35 1995
--- Makefile	Sun Jun  9 18:54:40 1996
***************
*** 76,81 ****
  
! autoload:	$(OBJECTS) tapestry.elc
  	@echo "building vm.elc (with all modules set to autoload)..."
! 	@cat vm-startup.elc vm-vars.elc vm-version.elc > vm.elc
! 	@$(EMACS) $(BATCHFLAGS) -l ./make-autoloads -f print-autoloads $(SOURCES) >> vm.elc
  
--- 76,83 ----
  
! autoload:	vm-autoload.elc $(OBJECTS) tapestry.elc
  	@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
  
***************
*** 93,95 ****
  clean:
! 	rm -f $(OBJECTS) tapestry.elc
  
--- 95,97 ----
  clean:
! 	rm -f vm-autoload.el vm-autoload.elc $(OBJECTS) tapestry.elc
  
***************
*** 98,99 ****
--- 100,108 ----
  	@$(EMACS) $(BATCHFLAGS) vm.texinfo -l texinfmt -f texinfo-format-buffer -f save-buffer
+ 
+ vm-autoload.elc:	$(SOURCES)
+ 	@echo scanning sources to build autoload definitions...
+ 	@echo "(provide 'vm-autoload)" > vm-autoload.el
+ 	@$(EMACS) $(BATCHFLAGS) -l ./make-autoloads -f print-autoloads $(SOURCES) >> vm-autoload.el
+ 	@echo compiling vm-autoload.el...
+ 	@$(EMACS) $(BATCHFLAGS) -l $(BYTEOPTS) -f batch-byte-compile vm-autoload.el
  
*** dist/vm-delete.el.dist	Fri Aug  4 18:21:17 1995
--- vm-delete.el	Sat Dec 16 06:56:38 1995
***************
*** 88,90 ****
  	(mlist (vm-select-marked-or-prefixed-messages count))
! 	(count 0))
      (while mlist
--- 88,90 ----
  	(mlist (vm-select-marked-or-prefixed-messages count))
! 	(undel-count 0))
      (while mlist
***************
*** 93,100 ****
  	    (vm-set-deleted-flag (car mlist) nil)
! 	    (vm-increment count)))
        (setq mlist (cdr mlist)))
      (if (and used-marks (interactive-p))
! 	(if (zerop count)
  	    (message "No messages undeleted")
! 	  (message "%d message%s undeleted" count (if (= 1 count) "" "s"))))
      (vm-display nil nil '(vm-undelete-message) '(vm-undelete-message))
--- 93,103 ----
  	    (vm-set-deleted-flag (car mlist) nil)
! 	    (vm-increment undel-count)))
        (setq mlist (cdr mlist)))
      (if (and used-marks (interactive-p))
! 	(if (zerop undel-count)
  	    (message "No messages undeleted")
! 	  (message "%d message%s undeleted"
! 		   undel-count
! 		   (if (= 1 undel-count)
! 		       "" "s"))))
      (vm-display nil nil '(vm-undelete-message) '(vm-undelete-message))
*** dist/vm-folder.el.dist	Fri Aug 18 16:32:54 1995
--- vm-folder.el	Tue Jan  2 18:30:20 1996
***************
*** 1,3 ****
  ;;; VM folder related functions
! ;;; Copyright (C) 1989, 1990, 1991, 1993, 1994, 1995 Kyle E. Jones
  ;;;
--- 1,3 ----
  ;;; VM folder related functions
! ;;; Copyright (C) 1989, 1990, 1991, 1993, 1994, 1995, 1996 Kyle E. Jones
  ;;;
***************
*** 234,236 ****
  (defun vm-do-needed-mode-line-update ()
!   "Do a modeline updates for the current folder buffer.
  This means setting up all the various vm-ml attribute variables
--- 234,236 ----
  (defun vm-do-needed-mode-line-update ()
!   "Do a modeline update for the current folder buffer.
  This means setting up all the various vm-ml attribute variables
***************
*** 501,503 ****
  OLD-TYPE and NEW-TYPE should be symbols returned from vm-get-folder-type.
! This should be called on non-live buffer like crash boxes.
  This will confuse VM if called on a folder buffer in vm-mode."
--- 501,503 ----
  OLD-TYPE and NEW-TYPE should be symbols returned from vm-get-folder-type.
! This should be called on non-live buffers like crash boxes.
  This will confuse VM if called on a folder buffer in vm-mode."
***************
*** 1936,1941 ****
        (vm-display vm-summary-buffer nil nil nil))
-   (vm-display (current-buffer) nil nil nil)
-   (vm-bury-buffer (current-buffer))
    (if vm-summary-buffer
!       (vm-bury-buffer vm-summary-buffer)))
  
--- 1936,1941 ----
        (vm-display vm-summary-buffer nil nil nil))
    (if vm-summary-buffer
!       (vm-bury-buffer vm-summary-buffer))
!   (vm-display (current-buffer) nil nil nil)
!   (vm-bury-buffer (current-buffer)))
  
***************
*** 2276,2278 ****
       ((eq last-command 'vm-help)
!       (describe-mode))
       ((eq vm-system-state 'previewing)
--- 2276,2278 ----
       ((eq last-command 'vm-help)
!       (describe-function major-mode))
       ((eq vm-system-state 'previewing)
***************
*** 2680,2682 ****
        (let ((lines vm-startup-message-lines))
! 	(message "VM %s, Copyright (C) 1995 Kyle E. Jones; type ? for help"
  		 vm-version)
--- 2680,2682 ----
        (let ((lines vm-startup-message-lines))
! 	(message "VM %s, Copyright (C) 1996 Kyle E. Jones; type ? for help"
  		 vm-version)
*** dist/vm-misc.el.dist	Fri Aug  4 18:21:18 1995
--- vm-misc.el	Sun Jun  9 18:32:09 1996
***************
*** 347,349 ****
  (defun vm-menu-support-possible-p ()
!   (vm-multiple-frames-possible-p))
  
--- 347,350 ----
  (defun vm-menu-support-possible-p ()
!   (or (and (boundp 'window-system) (eq window-system 'x))
!       (and (fboundp 'device-type) (eq (device-type) 'x))))
  
*** dist/vm-motion.el.dist	Tue Jun  6 01:48:37 1995
--- vm-motion.el	Mon Aug 21 00:06:52 1995
***************
*** 425,444 ****
  		 message-list vm-message-list))
! 	 (if (or (null message-pointer)
! 		 (and (>= point (vm-su-start-of (car message-pointer)))
! 		      (< point (vm-su-end-of (car message-pointer)))))
! 	     ()
! 	   (if (< point (vm-su-start-of (car message-pointer)))
! 	       (setq mp message-list)
! 	     (setq mp (cdr message-pointer) message-pointer nil))
! 	   (while (and (not (eq mp message-pointer))
! 		       (>= point (vm-su-end-of (car mp))))
! 	     (setq mp (cdr mp)))
! 	   (if (not (eq mp message-pointer))
! 	       (save-excursion
! 		 (set-buffer vm-mail-buffer)
! 		 (vm-record-and-change-message-pointer
! 		  vm-message-pointer mp)
! 		 (vm-preview-current-message)
! 		 ;; return non-nil so the caller will know that
! 		 ;; a new message was selected.
! 		 t ))))))
--- 425,458 ----
  		 message-list vm-message-list))
! 	 (cond ((or (null message-pointer)
! 		    (and (>= point (vm-su-start-of (car message-pointer)))
! 			 (< point (vm-su-end-of (car message-pointer)))))
! 		nil )
! 	       ;; the position at eob belongs to the last message
! 	       ((and (eobp) (= (vm-su-end-of (car message-pointer)) point))
! 		nil )
! 	       ;; make the position at eob belong to the last message
! 	       ((eobp)
! 		(setq mp (vm-last message-pointer))
! 		(save-excursion
! 		  (set-buffer vm-mail-buffer)
! 		  (vm-record-and-change-message-pointer vm-message-pointer mp)
! 		  (vm-preview-current-message)
! 		  ;; return non-nil so the caller will know that
! 		  ;; a new message was selected.
! 		  t ))
! 	       (t 
! 		(if (< point (vm-su-start-of (car message-pointer)))
! 		    (setq mp message-list)
! 		  (setq mp (cdr message-pointer) message-pointer nil))
! 		(while (and (not (eq mp message-pointer))
! 			    (>= point (vm-su-end-of (car mp))))
! 		  (setq mp (cdr mp)))
! 		(if (not (eq mp message-pointer))
! 		    (save-excursion
! 		      (set-buffer vm-mail-buffer)
! 		      (vm-record-and-change-message-pointer
! 		       vm-message-pointer mp)
! 		      (vm-preview-current-message)
! 		      ;; return non-nil so the caller will know that
! 		      ;; a new message was selected.
! 		      t )))))))
*** dist/vm-pop.el.dist	Fri Aug  4 18:21:19 1995
--- vm-pop.el	Sun Aug 27 17:41:22 1995
***************
*** 25,27 ****
  	(folder-type vm-folder-type)
! 	(save-password nil)
  	(handler (and (fboundp 'find-file-name-handler)
--- 25,27 ----
  	(folder-type vm-folder-type)
! 	(saved-password t)
  	(handler (and (fboundp 'find-file-name-handler)
***************
*** 73,75 ****
  				   popdrop))
! 			  save-password t))))
  	  ;; get the trace buffer
--- 73,77 ----
  				   popdrop))
! 			  vm-pop-passwords (cons (list source pass)
! 						 vm-pop-passwords)
! 			  saved-password t))))
  	  ;; get the trace buffer
***************
*** 98,101 ****
  		   (vm-pop-send-command process (format "PASS %s" pass))
! 		   (and (null (vm-pop-read-response process))
! 			(throw 'done nil)))
  		  ((equal auth "rpop")
--- 100,108 ----
  		   (vm-pop-send-command process (format "PASS %s" pass))
! 		   (if (null (vm-pop-read-response process))
! 		       (progn
! 			 (if saved-password
! 			     (setq vm-pop-passwords
! 				   (delete (list source pass)
! 					   vm-pop-passwords)))
! 			 (throw 'done nil))))
  		  ((equal auth "rpop")
***************
*** 123,129 ****
  		  (t (error "Don't know how to authenticate with %s" auth)))
- 	    ;; we're in.
- 	    ;; save the password if we read it from the user.
- 	    (if save-password
- 		(setq vm-pop-passwords (cons (list source pass)
- 					     vm-pop-passwords)))
  	    ;; find out how many messages are in the box.
--- 130,131 ----
*** dist/vm-startup.el.dist	Fri Aug 18 16:32:56 1995
--- vm-startup.el	Sun Jun  9 18:01:02 1996
***************
*** 255,257 ****
  
! This is VM 5.95 (beta).
  
--- 255,257 ----
  
! This is VM 5.96 (beta).
  
***************
*** 638,642 ****
  	  ;; everything to be redone next revisit.
! 	  (setq major-mode 'vm-virtual-mode
! 		;; must come after the setting of major-mode
! 		mode-popup-menu (and vm-use-menus
  				     (vm-menu-support-possible-p)
--- 638,643 ----
  	  ;; everything to be redone next revisit.
! 	  (setq major-mode 'vm-virtual-mode)
! 	  (run-hooks 'vm-virtual-mode-hook)
! 	  ;; must come after the setting of major-mode
! 	  (setq mode-popup-menu (and vm-use-menus
  				     (vm-menu-support-possible-p)
*** dist/vm-summary.el.dist	Fri Aug  4 18:21:19 1995
--- vm-summary.el	Sat Aug 26 22:45:39 1995
***************
*** 298,300 ****
  	((fboundp 'make-extent)
! 	 (if (and vm-summary-overlay (extent-live-p vm-summary-overlay))
  	     (set-extent-endpoints vm-summary-overlay start end)
--- 298,300 ----
  	((fboundp 'make-extent)
! 	 (if (and vm-summary-overlay (extent-end-position vm-summary-overlay))
  	     (set-extent-endpoints vm-summary-overlay start end)
*** dist/vm-vars.el.dist	Fri Aug 18 16:32:57 1995
--- vm-vars.el	Thu May  2 19:09:56 1996
***************
*** 163,165 ****
    (cond ((not (boundp 'system-configuration))
! 	 'From)
  	((or (string-match "-solaris" system-configuration)
--- 163,165 ----
    (cond ((not (boundp 'system-configuration))
! 	 'From_)
  	((or (string-match "-solaris" system-configuration)
***************
*** 1607,1610 ****
  It doesn't matter if the folder buffer already exists, this hook
! is run each time vm or vm-visit-folder is called interactively It
! is NOT run after vm-mode is called.")
  
--- 1607,1610 ----
  It doesn't matter if the folder buffer already exists, this hook
! is run each time vm or vm-visit-folder is called interactively.
! It is NOT run after vm-mode is called.")
  
***************
*** 1639,1643 ****
  (defvar vm-summary-mode-hook nil
!   "*List of hook functions to run when a VM summary buffer is first
! created.  The current buffer will be the summary buffer when the
! hooks are run.")
  
--- 1639,1642 ----
  (defvar vm-summary-mode-hook nil
!   "*List of hook functions to run when a VM summary buffer is created.
! The current buffer will be that buffer when the hooks are run.")
  
***************
*** 1648,1649 ****
--- 1647,1652 ----
  
+ (defvar vm-virtual-mode-hook nil
+   "*List of hook functions to run when a VM virtual folder buffer is created.
+ The current buffer will be that buffer when the hooks are run.")
+ 
  (defvar vm-quit-hook nil
***************
*** 1663,1667 ****
  
! If you use display hooks, you should probably not use VM's
! builtin window configuration system as the result is likely to be
! confusing.")
  
--- 1666,1669 ----
  
! If you use display hooks, you should not use VM's builtin window
! configuration system as the result is likely to be confusing.")
  
***************
*** 1674,1677 ****
  
! If you use undisplay hooks, you should probably not use VM's
! builtin window configuration system as the result is likely to be
  confusing.")
--- 1676,1679 ----
  
! If you use undisplay hooks, you should not use VM's builtin
! window configuration system as the result is likely to be
  confusing.")
***************
*** 2275,2277 ****
  (defvar vm-url-regexp
!   "\\(file\\|ftp\\|gopher\\|http\\|https\\|news\\|wais\\|www\\)://[^ \t\n\f\r\"<>|]*[^ \t\n\f\r\"<>|.!?(){}]"
    "Regular expression that matches an absolute URL.")
--- 2277,2279 ----
  (defvar vm-url-regexp
!   "\\(file\\|ftp\\|gopher\\|http\\|https\\|news\\|wais\\|www\\)://[^ \t\n\f\r\"<>|()]*[^ \t\n\f\r\"<>|.!?(){}]"
    "Regular expression that matches an absolute URL.")
*** dist/vm-version.el.dist	Fri Aug 18 16:32:57 1995
--- vm-version.el	Sun Aug 20 00:22:13 1995
***************
*** 4,6 ****
  
! (defconst vm-version "5.95 (beta)"
    "Version number of VM.")
--- 4,6 ----
  
! (defconst vm-version "5.96 (beta)"
    "Version number of VM.")
*** dist/vm-window.el.dist	Fri Aug  4 18:21:20 1995
--- vm-window.el	Tue Jan  9 15:18:05 1996
***************
*** 386,388 ****
    (if (fboundp 'vm-next-frame)
!       (let ((start (vm-selected-frame))
  	    (delete-me nil)
--- 386,388 ----
    (if (fboundp 'vm-next-frame)
!       (let ((start (vm-next-frame (vm-selected-frame)))
  	    (delete-me nil)