xemacs-beta: lisp/vm/vm-startup.el comparison

comparison lisp/vm/vm-startup.el @ 98:0d2f883870bc r20-1b1

Import from CVS: tag r20-1b1

author	cvs
date	Mon, 13 Aug 2007 09:13:56 +0200
parents	c0c698873ce1
children	4be1180a9e89

comparison

equal deleted inserted replaced

-:498bf5da1c90
+:0d2f883870bc
 ;;; Entry points for VM
-;;; Copyright (C) 1994, 1995 Kyle E. Jones
+;;; Copyright (C) 1994-1997 Kyle E. Jones
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
 ;;; the Free Software Foundation; either version 1, or (at your option)
 ;;; any later version.
 				(setq vm-folder-history
 				      (cons item vm-folder-history))))
 			  (vm-unsaved-message "Reading %s... done" file))))))))
 (set-buffer folder-buffer)
 (vm-check-for-killed-summary)
+(vm-check-for-killed-presentation)
 ;; If the buffer's not modified then we know that there can be no
 ;; messages in the folder that are not on disk.
 (or (buffer-modified-p) (setq vm-messages-not-on-disk 0))
 (setq first-time (not (eq major-mode 'vm-mode))
 	    preserve-auto-save-file (and buffer-file-name
 					   buffer-file-name)))
 ;; Force the folder to be read only if the auto
 ;; save file contains information the user might not
 ;; want overwritten, i.e. recover-file might be
 ;; desired.  What we want to avoid is an auto-save.
-;; Making the folder read only will keep it
+;; Making the folder read only will keep
 ;; subsequent actions from modifying the buffer in a
 ;; way that triggers an auto save.
 ;;
 ;; Also force the folder read-only if it was read only and
 ;; not already in vm-mode, since there's probably a good
 	    (vm-start-itimers-if-needed)))
 ;; make a new frame if the user wants one.  reuse an
 ;; existing frame that is showing this folder.
 (if (and full-startup
-	       vm-frame-per-folder
-	       (vm-multiple-frames-possible-p)
 	       ;; this so that "emacs -f vm" doesn't create a frame.
 	       this-command)
-	  (let ((w (or (vm-get-buffer-window (current-buffer))
+	  (apply 'vm-goto-new-folder-frame-maybe
-		       ;; summary == folder for the purpose
+		 (if folder '(folder) '(primary-folder folder))))
-		       ;; of frame reuse.
-		       (and vm-summary-buffer
+;; raise frame if requested and apply startup window
-			    (vm-get-buffer-window vm-summary-buffer)))))
+;; configuration.
-	    (if (null w)
+(if full-startup
-		(progn
+	  (progn
-		  (if folder
+	    (if vm-raise-frame-at-startup
-		      (vm-goto-new-frame 'folder)
+		(vm-raise-frame))
-		    (vm-goto-new-frame 'primary-folder 'folder))
+	    (vm-display nil nil (list this-command)
-		  (vm-set-hooks-for-frame-deletion))
+			(list (or this-command 'vm) 'startup))))
-	      (save-excursion
-		(select-window w)
-		(and vm-warp-mouse-to-new-frame
-		     (vm-warp-mouse-to-frame-maybe (vm-window-frame w)))))))
 ;; say this NOW, before the non-previewers read a message,
 ;; alter the new message count and confuse themselves.
 (if full-startup
 	  ;; save blurb so we can repeat it later as necessary.
 	  (setq totals-blurb (vm-emit-totals-blurb)))
 (vm-thoughtfully-select-message)
 (if vm-message-list
 	  (vm-preview-current-message)
 	(vm-update-summary-and-mode-line))
-(if full-startup
-	  (vm-display (current-buffer) t nil nil))
 ;; need to do this after any frame creation because the
 ;; toolbar sets frame-specific height and width specifiers.
 (and (vm-toolbar-support-possible-p) vm-use-toolbar
 	   (progn
 	     (vm-toolbar-install-toolbar)
 (and vm-use-menus (vm-menu-support-possible-p)
 	   (vm-menu-install-visited-folders-menu))
 (if full-startup
-	  (save-excursion
+	  (progn
-	    (vm-display (current-buffer) t nil nil)
+	    (if (and (vm-should-generate-summary)
-	    (if	(and (vm-should-generate-summary)
 		     ;; don't generate a summary if recover-file is
 		     ;; likely to happen, since recover-file does
 		     ;; nothing useful in a summary buffer.
 		     (not preserve-auto-save-file))
-		(vm-summarize t))
+		(vm-summarize t nil))
-	    ;; People were confused that (vm) behaved differently
+	    ;; raise the summary frame if the user wants frames
-	    ;; than M-x vm.  We used to list all the various VM
+	    ;; raised and if there is a summary frame.
-	    ;; startup commands here, but now we just accept any
+	    (if (and vm-summary-buffer
-	    ;; command and treat it as if it were VM.  It's
+		     vm-frame-per-summary
-	    ;; probably just as well, since any command that
+		     vm-raise-frame-at-startup)
-	    ;; calls VM probably does want the window
+		(vm-raise-frame))
-	    ;; configuration to be setup.
+	    ;; if vm-mutable-windows is nil, the startup
-	    (vm-display nil nil (list this-command)
+	    ;; configuration can't be applied, so do
-			(list (or this-command 'vm) 'startup))))
+	    ;; something to get a VM buffer on the screen
+	    (if vm-mutable-windows
+		(vm-display nil nil (list this-command)
+			    (list (or this-command 'vm) 'startup))
+	      (save-excursion
+		(switch-to-buffer (or vm-summary-buffer
+				      vm-presentation-buffer
+				      (current-buffer)))))))
 (run-hooks 'vm-visit-folder-hook)
 (if full-startup
 	  (message totals-blurb))
 ;; Display copyright and copying info unless
 ;; user says no.
 ;; Check this-command so we don't make the user wait if
 ;; they call vm non-interactively from some other program.
-(if (and (not vm-inhibit-startup-message)
+(if (and (not vm-startup-message-displayed)
-	       (not vm-startup-message-displayed)
 	       (or (memq this-command '(vm vm-visit-folder))
 		   ;; for emacs -f vm
 		   (null last-command)))
 	  (progn
 	    (vm-display-startup-message)
 (put 'vm-mode 'mode-class 'special)
 (defun vm-mode (&optional read-only)
 "Major mode for reading mail.
-This is VM 5.96 (beta).
+This is VM 6.13.
 Commands:
 h - summarize folder contents
 C-t - toggle threads display
 B - resend the current message to another user.
 c - continue composing the most recent message you were composing
 @ - digestify and mail entire folder contents (the folder is not modified)
 * - burst a digest into individual messages, and append and assimilate these
-message into the current folder.
+messages into the current folder.
 G - sort messages by various keys
 g - get any new mail that has arrived in the system mailbox
 (new mail is appended to the disk and buffer copies of the
 M M - mark the current message
 M U - unmark the current message
 M m - mark all messages
 M u - unmark all messages
-M C - mark messages matches by a virtual folder selector
+M C - mark messages matched by a virtual folder selector
-M c - unmark messages matches by a virtual folder selector
+M c - unmark messages matched by a virtual folder selector
 M T - mark thread tree rooted at the current message
 M t - unmark thread tree rooted at the current message
 M S - mark messages with the same subject as the current message
 M s - unmark messages with the same subject as the current message
 M A - mark messages with the same author as the current message
 M a - unmark messages with the same author as the current message
+M R - mark messages within the point/mark region in the summary
+M r - unmark messages within the point/mark region in the summary
 M ? - partial help for mark commands
 W S - save the current window configuration to a name
 W D - delete a window configuration
 Variables:
 vm-arrived-message-hook
 vm-arrived-messages-hook
 vm-auto-center-summary
+vm-auto-decode-mime-messages
+vm-auto-displayed-mime-content-types
 vm-auto-folder-alist
 vm-auto-folder-case-fold-search
 vm-auto-get-new-mail
 vm-auto-next-message
 vm-berkeley-mail-compatibility
+vm-burst-digest-messages-inherit-labels
 vm-check-folder-types
-vm-convert-folder-types
 vm-circular-folders
 vm-confirm-new-folders
 vm-confirm-quit
+vm-convert-folder-types
 vm-crash-box
+vm-crash-box-suffix
 vm-default-folder-type
 vm-delete-after-archiving
 vm-delete-after-bursting
 vm-delete-after-saving
 vm-delete-empty-folders
 vm-digest-burst-type
 vm-digest-center-preamble
 vm-digest-preamble-format
 vm-digest-send-type
 vm-display-buffer-hook
+vm-display-using-mime
 vm-edit-message-hook
 vm-folder-directory
 vm-folder-read-only
 vm-follow-summary-cursor
 vm-forward-message-hook
 vm-forwarded-headers
 vm-forwarding-digest-type
 vm-forwarding-subject-format
 vm-frame-parameter-alist
+vm-frame-per-completion
 vm-frame-per-composition
+vm-frame-per-edit
 vm-frame-per-folder
+vm-frame-per-summary
 vm-highlighted-header-face
 vm-highlighted-header-regexp
 vm-honor-page-delimiters
 vm-in-reply-to-format
 vm-included-text-attribution-format
 vm-included-text-discard-header-regexp
 vm-included-text-headers
 vm-included-text-prefix
-vm-inhibit-startup-message
 vm-invisible-header-regexp
 vm-jump-to-new-messages
 vm-jump-to-unread-messages
+vm-keep-crash-boxes
 vm-keep-sent-messages
-vm-keep-crash-boxes
 vm-mail-header-from
 vm-mail-mode-hook
+vm-make-crash-box-name
+vm-make-spool-file-name
+vm-mime-8bit-composition-charset
+vm-mime-8bit-text-transfer-encoding
+vm-mime-alternative-select-method
+vm-mime-attachment-auto-type-alist
+vm-mime-attachment-save-directory
+vm-mime-avoid-folding-content-type
+vm-mime-base64-decoder-program
+vm-mime-base64-decoder-switches
+vm-mime-base64-encoder-program
+vm-mime-base64-encoder-switches
+vm-mime-button-face
+vm-mime-digest-discard-header-regexp
+vm-mime-digest-headers
+vm-mime-display-function
+vm-mime-external-content-types-alist
+vm-mime-internal-content-types
+vm-mime-max-message-size
 vm-mode-hook
 vm-mosaic-program
 vm-move-after-deleting
+vm-move-after-killing
 vm-move-after-undeleting
 vm-move-messages-physically
+vm-mutable-frames
 vm-mutable-windows
-vm-mutable-frames
 vm-netscape-program
-vm-options-file
 vm-pop-md5-program
+vm-popup-menu-on-mouse-3
+vm-preferences-file
 vm-preview-lines
 vm-preview-read-messages
 vm-primary-inbox
 vm-quit-hook
 vm-recognize-pop-maildrops
 vm-reply-hook
+vm-reply-ignored-addresses
 vm-reply-ignored-reply-tos
-vm-reply-ignored-addresses
 vm-reply-subject-prefix
 vm-resend-bounced-discard-header-regexp
 vm-resend-bounced-headers
 vm-resend-bounced-message-hook
 vm-resend-discard-header-regexp
 vm-search-using-regexps
 vm-select-message-hook
 vm-select-new-message-hook
 vm-select-unread-message-hook
 vm-send-digest-hook
+vm-send-using-mime
 vm-skip-deleted-messages
 vm-skip-read-messages
 vm-spool-files
+vm-spool-file-suffixes
 vm-startup-with-summary
 vm-strip-reply-headers
 vm-summary-arrow
 vm-summary-format
 vm-summary-highlight-face
 vm-summary-mode-hook
 vm-summary-redo-hook
 vm-summary-show-threads
-vm-summary-subject-no-newlines
 vm-summary-thread-indent-level
+vm-temp-file-directory
+vm-tale-is-an-idiot
 vm-trust-From_-with-Content-Length
 vm-undisplay-buffer-hook
 vm-unforwarded-header-regexp
 vm-url-browser
 vm-url-search-limit
 vm-use-menus
+vm-use-toolbar
 vm-virtual-folder-alist
 vm-virtual-mirror
 vm-visible-headers
 vm-visit-folder-hook
 vm-visit-when-saving
 		  (assoc folder-name vm-virtual-folder-alist))
 	  (vm-build-virtual-message-list nil)
 	  (use-local-map vm-mode-map)
 	  (and (vm-menu-support-possible-p)
 	       (vm-menu-install-menus))
+	  (add-hook 'kill-buffer-hook 'vm-garbage-collect-folder)
+	  (add-hook 'kill-buffer-hook 'vm-garbage-collect-message)
 	  ;; save this for last in case the user interrupts.
 	  ;; an interrupt anywhere before this point will cause
 	  ;; 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
+	  (setq mode-popup-menu (and vm-use-menus vm-popup-menu-on-mouse-3
 				     (vm-menu-support-possible-p)
 				     (vm-menu-mode-menu)))
 	  (setq blurb (vm-emit-totals-blurb))
 	  (if vm-summary-show-threads
 	      (vm-sort-messages "thread"))
 	      (vm-preview-current-message)
 	    (vm-update-summary-and-mode-line))
 	  (message blurb)))
 ;; make a new frame if the user wants one.  reuse an
 ;; existing frame that is showing this folder.
-(if (and vm-frame-per-folder (vm-multiple-frames-possible-p))
+(vm-goto-new-folder-frame-maybe 'folder)
-	(let ((w (or (vm-get-buffer-window (current-buffer))
+(if vm-raise-frame-at-startup
-		     ;; summary == folder for the purpose
+	(vm-raise-frame))
-		     ;; of frame reuse.
+(vm-display nil nil (list this-command) (list this-command 'startup))
-		     (and vm-summary-buffer
-			  (vm-get-buffer-window (current-buffer))))))
-	  (if (null w)
-	      (vm-goto-new-frame 'folder)
-	    (save-excursion
-	      (select-window w)
-	      (and vm-warp-mouse-to-new-frame
-		   (vm-warp-mouse-to-frame-maybe (vm-window-frame w)))))
-	  (vm-set-hooks-for-frame-deletion)))
-(vm-display (current-buffer) t nil nil)
 (and (vm-toolbar-support-possible-p) vm-use-toolbar
 	 (vm-toolbar-install-toolbar))
 (if first-time
-	(if (vm-should-generate-summary)
+	(progn
-	    (progn (vm-summarize t)
+	  (if (vm-should-generate-summary)
-		   (message blurb))))
+	      (progn (vm-summarize t nil)
-(vm-display nil nil '(vm-visit-virtual-folder
+		     (message blurb)))
-			  vm-visit-virtual-folder-other-frame
+	  ;; raise the summary frame if the user wants frames
-			  vm-visit-virtual-folder-other-window
+	  ;; raised and if there is a summary frame.
-			  vm-create-virtual-folder
+	  (if (and vm-summary-buffer
-			  vm-apply-virtual-folder)
+		   vm-frame-per-summary
-		(list this-command 'startup))
+		   vm-raise-frame-at-startup)
+	      (vm-raise-frame))
+	  ;; if vm-mutable-windows is nil, the startup
+	  ;; configuration can't be applied, so do
+	  ;; something to get a VM buffer on the screen
+	  (if vm-mutable-windows
+	      (vm-display nil nil (list this-command)
+			  (list (or this-command 'vm) 'startup))
+	    (save-excursion
+	      (switch-to-buffer (or vm-summary-buffer
+				    vm-presentation-buffer
+				    (current-buffer)))))))
 ;; check interactive-p so as not to bog the user down if they
 ;; run this function from within another function.
-(and (interactive-p) (not vm-inhibit-startup-message)
+(and (interactive-p)
 	 (not vm-startup-message-displayed)
 	 (vm-display-startup-message)
 	 (message blurb))))
 (defun vm-visit-virtual-folder-other-frame (folder-name &optional read-only)
 (concat "VM " vm-version)
 (list
 'vm-arrived-message-hook
 'vm-arrived-messages-hook
 'vm-auto-center-summary
+'vm-auto-decode-mime-messages
+'vm-auto-displayed-mime-content-types
 ;; don't send this by default, might be personal stuff in here.
 ;;      'vm-auto-folder-alist
 'vm-auto-folder-case-fold-search
 'vm-auto-get-new-mail
 'vm-auto-next-message
 'vm-circular-folders
 'vm-confirm-new-folders
 'vm-confirm-quit
 'vm-convert-folder-types
 'vm-crash-box
+'vm-crash-box-suffix
 'vm-default-folder-type
 'vm-delete-after-archiving
 'vm-delete-after-bursting
 'vm-delete-after-saving
 'vm-delete-empty-folders
 'vm-digest-identifier-header-format
 'vm-digest-center-preamble
 'vm-digest-preamble-format
 'vm-digest-send-type
 'vm-display-buffer-hook
+'vm-display-using-mime
 'vm-edit-message-hook
 'vm-edit-message-mode
 'vm-flush-interval
 'vm-folder-directory
 'vm-folder-read-only
 'vm-forward-message-hook
 'vm-forwarded-headers
 'vm-forwarding-digest-type
 'vm-forwarding-subject-format
 'vm-frame-parameter-alist
+'vm-frame-per-completion
 'vm-frame-per-composition
+'vm-frame-per-edit
 'vm-frame-per-folder
+'vm-frame-per-summary
 'vm-highlight-url-face
 'vm-highlighted-header-regexp
 'vm-honor-page-delimiters
 'vm-in-reply-to-format
 'vm-included-text-attribution-format
 'vm-included-text-discard-header-regexp
 'vm-included-text-headers
 'vm-included-text-prefix
-'vm-inhibit-startup-message
 'vm-init-file
 'vm-invisible-header-regexp
 'vm-jump-to-new-messages
 'vm-jump-to-unread-messages
 'vm-keep-crash-boxes
 'vm-keep-sent-messages
 'vm-mail-header-from
 'vm-mail-hook
+'vm-make-crash-box-name
+'vm-make-spool-file-name
 'vm-mail-mode-hook
+'vm-mime-8bit-composition-charset
+'vm-mime-8bit-text-transfer-encoding
+'vm-mime-alternative-select-method
+'vm-mime-attachment-auto-type-alist
+'vm-mime-attachment-save-directory
+'vm-mime-avoid-folding-content-type
+'vm-mime-base64-decoder-program
+'vm-mime-base64-decoder-switches
+'vm-mime-base64-encoder-program
+'vm-mime-base64-encoder-switches
+'vm-mime-button-face
+'vm-mime-digest-discard-header-regexp
+'vm-mime-digest-headers
+'vm-mime-display-function
+'vm-mime-external-content-types-alist
+'vm-mime-internal-content-types
+'vm-mime-max-message-size
 'vm-mode-hook
 'vm-mode-hooks
 'vm-mosaic-program
 'vm-move-after-deleting
 'vm-move-after-undeleting
 'vm-move-messages-physically
 'vm-movemail-program
 'vm-mutable-frames
 'vm-mutable-windows
 'vm-netscape-program
-'vm-options-file
 'vm-pop-md5-program
+'vm-popup-menu-on-mouse-3
+'vm-preferences-file
 'vm-preview-lines
 'vm-preview-read-messages
 'vm-primary-inbox
 'vm-quit-hook
 'vm-recognize-pop-maildrops
 'vm-search-using-regexps
 'vm-select-message-hook
 'vm-select-new-message-hook
 'vm-select-unread-message-hook
 'vm-send-digest-hook
+'vm-send-using-mime
 'vm-skip-deleted-messages
 'vm-skip-read-messages
 ;; don't send vm-spool-files by default, might contain passwords
 ;;      'vm-spool-files
+'vm-spool-file-suffixes
 'vm-startup-with-summary
 'vm-strip-reply-headers
 'vm-summary-format
 'vm-summary-highlight-face
 'vm-summary-mode-hook
 'vm-summary-mode-hooks
 'vm-summary-redo-hook
 'vm-summary-show-threads
-'vm-summary-subject-no-newlines
 'vm-summary-thread-indent-level
 'vm-summary-uninteresting-senders
 'vm-summary-uninteresting-senders-arrow
 'vm-tale-is-an-idiot
+'vm-temp-file-directory
 'vm-trust-From_-with-Content-Length
 'vm-undisplay-buffer-hook
 'vm-unforwarded-header-regexp
 'vm-url-browser
 'vm-url-search-limit
 'vm-use-menus
+'vm-use-toolbar
 'vm-virtual-folder-alist
 'vm-virtual-mirror
 'vm-visible-headers
 'vm-visit-folder-hook
 'vm-visit-when-saving
 (if (or (not vm-init-file-loaded) interactive)
 (load vm-init-file (not interactive) (not interactive) t))
 (setq vm-init-file-loaded t)
 (vm-display nil nil '(vm-load-init-file) '(vm-load-init-file)))
+(defun vm-check-emacs-version ()
+(cond ((and (vm-xemacs-p)
+	      (or (< emacs-major-version 19)
+		  (and (= emacs-major-version 19)
+		       (< emacs-minor-version 14))))
+	 (error "VM %s must be run on XEmacs 19.14 or a later version."
+		vm-version))
+	((and (vm-fsfemacs-19-p)
+	      (or (< emacs-major-version 19)
+		  (and (= emacs-major-version 19)
+		       (< emacs-minor-version 34))))
+	 (error "VM %s must be run on Emacs 19.34 or a later version."
+		vm-version))))
 (defun vm-session-initialization ()
+(vm-check-emacs-version)
 ;; If this is the first time VM has been run in this Emacs session,
 ;; do some necessary preparations.
 (if (or (not (boundp 'vm-session-beginning))
 	  vm-session-beginning)
 (progn

Mercurial > hg > xemacs-beta

comparison lisp/vm/vm-startup.el @ 98:0d2f883870bc r20-1b1