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

comparison lisp/vm/vm-startup.el @ 54:05472e90ae02 r19-16-pre2

Import from CVS: tag r19-16-pre2

author	cvs
date	Mon, 13 Aug 2007 08:57:55 +0200
parents	8b8b7f3559a2
children	131b0175ea99

comparison

equal deleted inserted replaced

-:875393c1a535
+:05472e90ae02
 to the value of vm-primary-inbox.  The folder buffer is put into VM
 mode, a major mode for reading mail.
 Prefix arg or optional second arg READ-ONLY non-nil indicates
 that the folder should be considered read only.  No attribute
-changes, messages additions or deletions will be allowed in the
+changes, message additions or deletions will be allowed in the
 visited folder.
 Visiting the primary inbox causes any contents of the system mailbox to
 be moved and appended to the resulting buffer.
 				       (expand-file-name vm-folder-directory))
 				  default-directory))
 			    (inhibit-local-variables t)
 			    (enable-local-variables nil)
 			    ;; for XEmacs/Mule
-			    (overriding-file-coding-system 'no-conversion))
+			    (coding-system-for-read 'no-conversion))
 			(message "Reading %s..." file)
 			(prog1 (find-file-noselect file)
 			  ;; update folder history
 			  (let ((item (or folder vm-primary-inbox)))
 			    (if (not (equal item (car vm-folder-history)))
 ;; If the file coding system is not a no-conversion variant,
 ;; make it so by encoding all the text, then setting
 ;; the file coding system and decoding it.
 ;; This is only possible if a file is visited and then vm-mode
 ;; is run on it afterwards.
-(defvar file-coding-system)
+(defvar buffer-file-coding-system)
-(if (and (vm-xemacs-mule-p)
+(if (and vm-xemacs-mule-p
-	       (not (eq (get-coding-system file-coding-system)
+	       (not (eq (get-coding-system buffer-file-coding-system)
 			(get-coding-system 'no-conversion-unix)))
-	       (not (eq (get-coding-system file-coding-system)
+	       (not (eq (get-coding-system buffer-file-coding-system)
 			(get-coding-system 'no-conversion-dos)))
-	       (not (eq (get-coding-system file-coding-system)
+	       (not (eq (get-coding-system buffer-file-coding-system)
 			(get-coding-system 'no-conversion-mac)))
-	       (not (eq (get-coding-system file-coding-system)
+	       (not (eq (get-coding-system buffer-file-coding-system)
 			(get-coding-system 'binary))))
 	  (let ((buffer-read-only nil)
 		(omodified (buffer-modified-p)))
 	    (unwind-protect
 		(progn
 		  (encode-coding-region (point-min) (point-max)
-					file-coding-system)
+					buffer-file-coding-system)
-		  (set-file-coding-system 'no-conversion nil)
+		  (set-buffer-file-coding-system 'no-conversion nil)
 		  (decode-coding-region (point-min) (point-max)
-					file-coding-system))
+					buffer-file-coding-system))
 	      (set-buffer-modified-p omodified))))
 (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.
 		 (if folder '(folder) '(primary-folder folder))))
 ;; raise frame if requested and apply startup window
 ;; configuration.
 (if full-startup
-	  (progn
+	  (let ((buffer-to-display (or vm-summary-buffer
+				       vm-presentation-buffer
+				       (current-buffer))))
+	    (vm-display buffer-to-display buffer-to-display
+			(list this-command)
+			(list (or this-command 'vm) 'startup))
 	    (if vm-raise-frame-at-startup
-		(vm-raise-frame))
+		(vm-raise-frame))))
-	    (vm-display nil nil (list this-command)
-			(list (or this-command 'vm) 'startup))))
 ;; 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-update-summary-and-mode-line)
-	  (vm-preview-current-message)
-	(vm-update-summary-and-mode-line))
 ;; 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)
 		     (not preserve-auto-save-file))
 		(vm-summarize t nil))
 	    ;; raise the summary frame if the user wants frames
 	    ;; raised and if there is a summary frame.
 	    (if (and vm-summary-buffer
+		     vm-mutable-frames
 		     vm-frame-per-summary
 		     vm-raise-frame-at-startup)
 		(vm-raise-frame))
 	    ;; if vm-mutable-windows is nil, the startup
 	    ;; configuration can't be applied, so do
 			    (list (or this-command 'vm) 'startup))
 	      (save-excursion
 		(switch-to-buffer (or vm-summary-buffer
 				      vm-presentation-buffer
 				      (current-buffer)))))))
+(if vm-message-list
+	  (vm-preview-current-message))
 (run-hooks 'vm-visit-folder-hook)
 (if full-startup
 	  (message totals-blurb))
 (put 'vm-mode 'mode-class 'special)
 (defun vm-mode (&optional read-only)
 "Major mode for reading mail.
-This is VM 6.22.
+This is VM 6.34.
 Commands:
 h - summarize folder contents
 C-t - toggle threads display
 vm-frame-parameter-alist
 vm-frame-per-completion
 vm-frame-per-composition
 vm-frame-per-edit
 vm-frame-per-folder
+vm-frame-per-help
 vm-frame-per-summary
 vm-highlighted-header-face
 vm-highlighted-header-regexp
 vm-honor-page-delimiters
 vm-image-directory
 vm-summary-redo-hook
 vm-summary-show-threads
 vm-summary-thread-indent-level
 vm-tale-is-an-idiot
 vm-temp-file-directory
+vm-toolbar-pixmap-directory
 vm-trust-From_-with-Content-Length
 vm-undisplay-buffer-hook
 vm-unforwarded-header-regexp
 vm-url-browser
 vm-url-search-limit
 	      (progn (vm-summarize t nil)
 		     (message blurb)))
 	  ;; raise the summary frame if the user wants frames
 	  ;; raised and if there is a summary frame.
 	  (if (and vm-summary-buffer
+		   vm-mutable-frames
 		   vm-frame-per-summary
 		   vm-raise-frame-at-startup)
 	      (vm-raise-frame))
 	  ;; if vm-mutable-windows is nil, the startup
 	  ;; configuration can't be applied, so do
 (other-window 1)
 (let ((vm-frame-per-folder nil)
 	(vm-search-other-frames nil))
 (vm-visit-virtual-folder folder-name read-only)))
-(defun vm-mail ()
+(defun vm-mail (&optional to)
-"Send a mail message from within VM, or from without."
+"Send a mail message from within VM, or from without.
+Optional argument TO is a string that should contain a comma separated
+recipient list."
 (interactive)
 (vm-session-initialization)
 (vm-select-folder-buffer)
 (vm-check-for-killed-summary)
-(vm-mail-internal)
+(vm-mail-internal nil to)
 (run-hooks 'vm-mail-hook)
 (run-hooks 'vm-mail-mode-hook))
-(defun vm-mail-other-frame ()
+(defun vm-mail-other-frame (&optional to)
-"Like vm-mail, but run in a newly created frame."
+"Like vm-mail, but run in a newly created frame.
+Optional argument TO is a string that should contain a comma separated
+recipient list."
 (interactive)
 (vm-session-initialization)
 (if (vm-multiple-frames-possible-p)
 (vm-goto-new-frame 'composition))
 (let ((vm-frame-per-composition nil)
 	(vm-search-other-frames nil))
-(vm-mail))
+(vm-mail to))
 (if (vm-multiple-frames-possible-p)
 (vm-set-hooks-for-frame-deletion)))
-(defun vm-mail-other-window ()
+(defun vm-mail-other-window (&optional to)
-"Like vm-mail, but run in a different window."
+"Like vm-mail, but run in a different window.
+Optional argument TO is a string that should contain a comma separated
+recipient list."
 (interactive)
 (vm-session-initialization)
 (if (one-window-p t)
 (split-window))
 (other-window 1)
 (let ((vm-frame-per-composition nil)
 	(vm-search-other-frames nil))
-(vm-mail)))
+(vm-mail to)))
 (defun vm-submit-bug-report ()
 "Submit a bug report, with pertinent information to the VM bug list."
 (interactive)
 (require 'reporter)
 'vm-frame-parameter-alist
 'vm-frame-per-completion
 'vm-frame-per-composition
 'vm-frame-per-edit
 'vm-frame-per-folder
+'vm-frame-per-help
 'vm-frame-per-summary
 'vm-highlight-url-face
 'vm-highlighted-header-regexp
 'vm-honor-page-delimiters
 'vm-image-directory
 'vm-summary-show-threads
 'vm-summary-thread-indent-level
 'vm-summary-uninteresting-senders
 'vm-summary-uninteresting-senders-arrow
 'vm-tale-is-an-idiot
+'vm-toolbar-pixmap-directory
 'vm-temp-file-directory
 'vm-trust-From_-with-Content-Length
 'vm-undisplay-buffer-hook
 'vm-unforwarded-header-regexp
 'vm-url-browser
 ;; see what the user had loaded
 'features
 )
 nil
 nil
-"Please change the Subject header to a concise bug description.\nRemember to cover the basics, that is, what you expected to\nhappen and what in fact did happen.  Please remove these instructions from your message.")
+"Please change the Subject header to a concise bug description.\nRemember to cover the basics, that is, what you expected to\nhappen and what in fact did happen.  Please remove these\ninstructions from your message.")
 (save-excursion
 (goto-char (point-min))
 (mail-position-on-field "Subject")
 (beginning-of-line)
 (delete-region (point) (progn (forward-line) (point)))
 (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)
+(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)
+	((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))))
 	      void-function
 	      void-variable
 	     ))))
 (defun vm-session-initialization ()
+(vm-note-emacs-version)
 (vm-check-emacs-version)
-(vm-set-debug-flags)
+;;  (vm-set-debug-flags)
 ;; 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 @ 54:05472e90ae02 r19-16-pre2