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

comparison lisp/vm/vm-startup.el @ 100:4be1180a9e89 r20-1b2

Import from CVS: tag r20-1b2

author	cvs
date	Mon, 13 Aug 2007 09:15:11 +0200
parents	0d2f883870bc
children	a145efe76779

comparison

equal deleted inserted replaced

-:2d83cbd90d8d
+:4be1180a9e89
 		      (let ((default-directory
 			      (or (and vm-folder-directory
 				       (expand-file-name vm-folder-directory))
 				  default-directory))
 			    (inhibit-local-variables t)
-			    (enable-local-variables nil))
+			    (enable-local-variables nil)
+			    ;; for XEmacs/Mule
+			    (overriding-file-coding-system 'no-conversion))
 			(vm-unsaved-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)))
 				(setq vm-folder-history
 				      (cons item vm-folder-history))))
 			  (vm-unsaved-message "Reading %s... done" file))))))))
 (set-buffer folder-buffer)
+;; for XEmacs/MULE
+;;
+;; 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 vm-mode
+;; is run on it afterwards.
+(defvar file-coding-system)
+(if (and (fboundp 'get-coding-system)
+	       (not (eq file-coding-system
+			(get-coding-system 'no-conversion-unix)))
+	       (not (eq file-coding-system
+			(get-coding-system 'no-conversion-dos)))
+	       (not (eq file-coding-system
+			(get-coding-system 'no-conversion-mac)))
+	       (not (eq file-coding-system
+			(get-coding-system 'binary))))
+	  (progn
+	    (encode-coding-region (point-min) (point-max) file-coding-system)
+	    (set-file-coding-system 'no-conversion nil)
+	    (decode-coding-region (point-min) (point-max) file-coding-system)))
 (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))
 	       (not vm-block-new-mail)
 	       (not vm-folder-read-only))
 	  (progn
 	    (vm-unsaved-message "Checking for new mail for %s..."
 				(or buffer-file-name (buffer-name)))
-	    (if (and (vm-get-spooled-mail) (vm-assimilate-new-messages t))
+	    (if (and (vm-get-spooled-mail t) (vm-assimilate-new-messages t))
 		(progn
 		  (setq totals-blurb (vm-emit-totals-blurb))
 		  (if (vm-thoughtfully-select-message)
 		      (vm-preview-current-message)
 		    (vm-update-summary-and-mode-line))))
 	    (message totals-blurb)))
 ;; Display copyright and copying info unless
 ;; user says no.
-;; Check this-command so we don't make the user wait if
+(if (and (interactive-p) (not vm-startup-message-displayed))
-;; they call vm non-interactively from some other program.
-(if (and (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)
 	    (if (not (input-pending-p))
 		(message totals-blurb)))))))
 (put 'vm-mode 'mode-class 'special)
 (defun vm-mode (&optional read-only)
 "Major mode for reading mail.
-This is VM 6.13.
+This is VM 6.15.
 Commands:
 h - summarize folder contents
 C-t - toggle threads display
 vm-frame-per-folder
 vm-frame-per-summary
 vm-highlighted-header-face
 vm-highlighted-header-regexp
 vm-honor-page-delimiters
+vm-image-directory
 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-invisible-header-regexp
 vm-jump-to-new-messages
 vm-jump-to-unread-messages
 vm-keep-crash-boxes
 vm-keep-sent-messages
+vm-mail-check-interval
 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-base64-decoder-program
 vm-mime-base64-decoder-switches
 vm-mime-base64-encoder-program
 vm-mime-base64-encoder-switches
 vm-mime-button-face
+vm-mime-charset-font-alist
+vm-mime-default-face-charsets
 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-move-after-undeleting
 vm-move-messages-physically
 vm-mutable-frames
 vm-mutable-windows
 vm-netscape-program
+vm-pop-bytes-per-session
+vm-pop-max-message-size
 vm-pop-md5-program
+vm-pop-messages-per-session
 vm-popup-menu-on-mouse-3
 vm-preferences-file
 vm-preview-lines
 vm-preview-read-messages
 vm-primary-inbox
 vm-select-unread-message-hook
 vm-send-digest-hook
 vm-send-using-mime
 vm-skip-deleted-messages
 vm-skip-read-messages
+vm-spool-file-suffixes
 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-thread-indent-level
+vm-tale-is-an-idiot
 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
 folders.
 vm-virtual-mode is not a normal major mode.  If you run it, it
 will not do anything.  The entry point to vm-virtual-mode is
 vm-visit-virtual-folder.")
+(defvar scroll-in-place)
 (defun vm-visit-virtual-folder (folder-name &optional read-only)
 (interactive
 (let ((last-command last-command)
 	 (this-command this-command))
 		buffer-read-only t
 		vm-folder-read-only read-only
 		vm-label-obarray (make-vector 29 0)
 		vm-virtual-folder-definition
 		  (assoc folder-name vm-virtual-folder-alist))
+	  ;; scroll in place messes with scroll-up and this loses
+	  (make-local-variable 'scroll-in-place)
+	  (setq scroll-in-place nil)
 	  (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)
 'vm-frame-per-folder
 'vm-frame-per-summary
 'vm-highlight-url-face
 'vm-highlighted-header-regexp
 'vm-honor-page-delimiters
+'vm-image-directory
 '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-keep-sent-messages
 'vm-mail-header-from
 'vm-mail-hook
 'vm-make-crash-box-name
 'vm-make-spool-file-name
+'vm-mail-check-interval
 '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-base64-decoder-program
 'vm-mime-base64-decoder-switches
 'vm-mime-base64-encoder-program
 'vm-mime-base64-encoder-switches
 'vm-mime-button-face
+'vm-mime-charset-font-alist
+'vm-mime-default-face-charsets
 '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-move-messages-physically
 'vm-movemail-program
 'vm-mutable-frames
 'vm-mutable-windows
 'vm-netscape-program
+'vm-pop-bytes-per-session
+'vm-pop-max-message-size
+'vm-pop-messages-per-session
 'vm-pop-md5-program
 'vm-popup-menu-on-mouse-3
 'vm-preferences-file
 'vm-preview-lines
 'vm-preview-read-messages
 		  (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-set-debug-flags ()
+(or stack-trace-on-error
+debug-on-error
+(setq stack-trace-on-error
+	    '(
+	      wrong-type-argument
+	      wrong-number-of-arguments
+	      args-out-of-range
+	      void-function
+	      void-variable
+	     ))))
 (defun vm-session-initialization ()
 (vm-check-emacs-version)
+(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 @ 100:4be1180a9e89 r20-1b2