Index: xemacs-20.0/CHANGES-beta
diff -c xemacs-20.0/CHANGES-beta:1.28 xemacs-20.0/CHANGES-beta:1.29
*** xemacs-20.0/CHANGES-beta:1.28	Wed Apr 16 11:07:31 1997
--- xemacs-20.0/CHANGES-beta	Wed Apr 16 17:51:28 1997
***************
*** 1,9 ****
--- 1,14 ----
  							-*- indented-text -*-
  to 20.1
+ -- facemenu.el boo boo.
+ -- VM-6.27
+ -- README.htmlpro left as reference for htmlpro.dtd
+ 
  -- Commercial sound driver fix
  -- Wnn6 corrections
  -- Filling corrections
  -- Animated GIF boo boo.
+ 
  -- time.el-1.15
  -- itimer.el-1.06
  -- facemenu-keymap moved to `C-x F'
Index: xemacs-20.0/ChangeLog
diff -c xemacs-20.0/ChangeLog:1.28 xemacs-20.0/ChangeLog:1.29
*** xemacs-20.0/ChangeLog:1.28	Tue Apr 15 21:07:25 1997
--- xemacs-20.0/ChangeLog	Wed Apr 16 17:51:28 1997
***************
*** 1,3 ****
--- 1,7 ----
+ Wed Apr 16 17:44:05 1997  Steven L Baur  <steve@altair.xemacs.org>
+ 
+ 	* XEmacs 20.1 is re-released.
+ 
  Tue Apr 15 21:03:22 1997  Steven L Baur  <steve@altair.xemacs.org>
  
  	* XEmacs 20.1 is released.
Index: xemacs-20.0/etc/sgml/README.htmlpro
diff -c /dev/null xemacs-20.0/etc/sgml/README.htmlpro:1.1
*** /dev/null	Wed Apr 16 18:00:08 1997
--- xemacs-20.0/etc/sgml/README.htmlpro	Wed Apr 16 14:31:24 1997
***************
*** 0 ****
--- 1,6 ----
+ Drazen Kacar <dave@public.srce.hr> writes regarding htmlpro.dtd:
+ 
+ You probably want the home page URL, though. Try
+ <URL:http://www.arbornet.org/~silmaril/dtds/html/htmlpro.html>
+ The site cannot be reached sometimes. The mirror exists somewhere, but I
+ don't have the URL.
Index: xemacs-20.0/lisp/efs/dired-faces.el
diff -c xemacs-20.0/lisp/efs/dired-faces.el:1.4 xemacs-20.0/lisp/efs/dired-faces.el:1.5
*** xemacs-20.0/lisp/efs/dired-faces.el:1.4	Thu Apr 10 19:10:06 1997
--- xemacs-20.0/lisp/efs/dired-faces.el	Wed Apr 16 17:51:31 1997
***************
*** 63,70 ****
    "Face used for unimportant files."
    :group 'dired)
  
! (defface dired-face-permissions '((t (:background "grey75")
! 				     (:foreground "black")))
    "Face used for interactive permissions."
    :group 'dired)
  
--- 63,70 ----
    "Face used for unimportant files."
    :group 'dired)
  
! (defface dired-face-permissions '((t (:background "grey75"
! 				      :foreground "black")))
    "Face used for interactive permissions."
    :group 'dired)
  
Index: xemacs-20.0/lisp/prim/about.el
diff -c xemacs-20.0/lisp/prim/about.el:1.15 xemacs-20.0/lisp/prim/about.el:1.16
*** xemacs-20.0/lisp/prim/about.el:1.15	Tue Apr 15 21:07:52 1997
--- xemacs-20.0/lisp/prim/about.el	Wed Apr 16 17:51:33 1997
***************
*** 1122,1127 ****
--- 1122,1128 ----
  	  Fred Appelman <Fred.Appelman@cv.ruu.nl>
  	  Erik \"The Pope\" Arneson <lazarus@mind.net>
  	  Tor Arntsen <tor@spacetec.no>
+ 	  Marc Aurel <4-tea-2@bong.saar.de>
  	  Larry Auton <lda@control.att.com>
  	  Oswald P. Backus IV <backus@altagroup.com>
  	  Mike Battaglia <mbattagl@dsccc.com>
***************
*** 1169,1174 ****
--- 1170,1176 ----
  	  Holger Franz <hfranz@physik.rwth-aachen.de>
  	  Benjamin Fried <bf@morgan.com>
  	  Barry Friedman <friedman@nortel.ca>
+ 	  Kazuyoshi Furutaka <furutaka@Flux.tokai.jaeri.go.jp>
  	  Lew Gaiter III <lew@StarFire.com>
  	  Itay Gat <itay@cs.huji.ac.il>
  	  Tim Geisler <Tim.Geisler@informatik.uni-muenchen.de>
***************
*** 1176,1181 ****
--- 1178,1184 ----
  	  Christian F. Goetze <cg@bigbook.com>
  	  Yusuf Goolamabbas <yusufg@iss.nus.sg>
  	  Wolfgang Grieskamp <wg@cs.tu-berlin.de>
+ 	  John Griffith <griffith@sfs.nphil.uni-tuebingen.de>
  	  James Grinter <jrg@demon.net>
  	  Ben Gross <bgross@uiuc.edu>
  	  Dirk Grunwald <grunwald@foobar.cs.Colorado.EDU>
***************
*** 1205,1210 ****
--- 1208,1214 ----
  	  Philip Johnson <johnson@uhics.ics.Hawaii.Edu>
  	  J. Kean Johnston <jkj@paradigm-sa.com>
  	  Andreas Kaempf <andreas@sccon.com>
+ 	  Yoshiaki Kasahara <kasahara@nc.kyushu-u.ac.jp>
  	  Amir Katz <amir@ndsoft.com>
  	  Doug Keller <dkeller@vnet.ibm.com>
  	  Hunter Kelly <retnuh@corona>
***************
*** 1225,1230 ****
--- 1229,1235 ----
  	  Christian Limpach <Christian.Limpach@nice.ch>
  	  Markus Linnala <maage@b14b.tupsu.ton.tut.fi>
  	  Robert Lipe <robertl@arnet.com>
+ 	  Derrell Lipman <derrell@vis-av.com>
  	  Damon Lipparelli <lipp@aa.net>
  	  Hamish Macdonald <hamish@bnr.ca>
  	  Ian MacKinnon <imackinnon@telia.co.uk>
***************
*** 1246,1251 ****
--- 1251,1257 ----
  	  Heiko Muenkel <muenkel@tnt.uni-hannover.de>
  	  Arup Mukherjee <arup+@cs.cmu.edu>
  	  Colas Nahaboo <Colas.Nahaboo@sophia.inria.fr>
+ 	  TSUTOMU NAKAMURA <tsutomu@rs.kyoto.omronsoft.co.jp>
  	  Lynn D. Newton <lynn@ives.phx.mcd.mot.com>
  	  Casey Nielson <knielson@joule.elee.calpoly.edu>
  	  Georg Nikodym <Georg.Nikodym@canada.sun.com>
***************
*** 1295,1300 ****
--- 1301,1307 ----
  	  Anders Stenman <stenman@isy.liu.se>
  	  Jason Stewart <jasons@cs.unm.edu>
  	  Rick Tait <rickt@gnu.ai.mit.edu>
+ 	  Samuel Tardieu <sam@inf.enst.fr>
  	  James Thompson <thompson@wg2.waii.com>
  	  Raymond L. Toy <toy@rtp.ericsson.se>
  	  Remek Trzaska <remek@npac.syr.edu>
***************
*** 1309,1314 ****
--- 1316,1322 ----
  	  Rich Williams <rdw@hplb.hpl.hp.com>
  	  David C Worenklein <dcw@gcm.com>
  	  Takeshi Yamada <yamada@sylvie.kecl.ntt.jp>
+ 	  Katsumi Yamaoka <yamaoka@ga.sony.co.jp>
  	  Jason Yanowitz <yanowitz@eternity.cs.umass.edu>
  	  La Monte Yarroll <piggy@hilbert.maths.utas.edu.au>
  	  Blair Zajac <blair@olympia.gps.caltech.edu>
Index: xemacs-20.0/lisp/utils/facemenu.el
diff -c xemacs-20.0/lisp/utils/facemenu.el:1.4 xemacs-20.0/lisp/utils/facemenu.el:1.5
*** xemacs-20.0/lisp/utils/facemenu.el:1.4	Tue Apr 15 21:08:03 1997
--- xemacs-20.0/lisp/utils/facemenu.el	Wed Apr 16 17:51:34 1997
***************
*** 269,276 ****
    ;; Global bindings:
    (if (string-match "XEmacs" emacs-version)
        (easy-menu-change '("Edit") (car facemenu-menu) (cdr facemenu-menu))
!     (define-key global-map [C-down-mouse-2] 'facemenu-menu))
!   (if facemenu-key (define-key global-map facemenu-key 'facemenu-keymap)))
  
  (fset 'facemenu-region-active-p
        (if (string-match "XEmacs" emacs-version)
--- 269,275 ----
    ;; Global bindings:
    (if (string-match "XEmacs" emacs-version)
        (easy-menu-change '("Edit") (car facemenu-menu) (cdr facemenu-menu))
!     (define-key global-map [C-down-mouse-2] 'facemenu-menu)))
  
  (fset 'facemenu-region-active-p
        (if (string-match "XEmacs" emacs-version)
Index: xemacs-20.0/lisp/vm/vm-autoload.el
diff -c xemacs-20.0/lisp/vm/vm-autoload.el:1.9 xemacs-20.0/lisp/vm/vm-autoload.el:1.10
*** xemacs-20.0/lisp/vm/vm-autoload.el:1.9	Tue Apr 15 21:08:06 1997
--- xemacs-20.0/lisp/vm/vm-autoload.el	Wed Apr 16 17:51:34 1997
***************
*** 2204,2210 ****
  
  (autoload (quote vm-mode) "vm-startup" "Major mode for reading mail.
  
! This is VM 6.26.
  
  Commands:
     h - summarize folder contents
--- 2204,2210 ----
  
  (autoload (quote vm-mode) "vm-startup" "Major mode for reading mail.
  
! This is VM 6.27.
  
  Commands:
     h - summarize folder contents
Index: xemacs-20.0/lisp/vm/vm-menu.el
diff -c xemacs-20.0/lisp/vm/vm-menu.el:1.8 xemacs-20.0/lisp/vm/vm-menu.el:1.9
*** xemacs-20.0/lisp/vm/vm-menu.el:1.8	Tue Apr 15 21:08:08 1997
--- xemacs-20.0/lisp/vm/vm-menu.el	Wed Apr 16 17:51:35 1997
***************
*** 846,852 ****
  	 ;; selection.  This will cause the command loop to
  	 ;; resume which might undo what set-buffer does.
  	 (select-window (event-window event))
! 	 (and (event-point event) (goto-char (event-point event))))
  	((vm-menu-fsfemacs-menus-p)
  	 (set-buffer (window-buffer (posn-window (event-start event))))
  	 (goto-char (posn-point (event-start event))))))
--- 846,853 ----
  	 ;; selection.  This will cause the command loop to
  	 ;; resume which might undo what set-buffer does.
  	 (select-window (event-window event))
! 	 (and (event-closest-point event)
! 	      (goto-char (event-closest-point event))))
  	((vm-menu-fsfemacs-menus-p)
  	 (set-buffer (window-buffer (posn-window (event-start event))))
  	 (goto-char (posn-point (event-start event))))))
Index: xemacs-20.0/lisp/vm/vm-mime.el
diff -c xemacs-20.0/lisp/vm/vm-mime.el:1.10 xemacs-20.0/lisp/vm/vm-mime.el:1.11
*** xemacs-20.0/lisp/vm/vm-mime.el:1.10	Tue Apr 15 21:08:08 1997
--- xemacs-20.0/lisp/vm/vm-mime.el	Wed Apr 16 17:51:35 1997
***************
*** 37,42 ****
--- 37,43 ----
  (defun vm-mm-layout-body-start (e) (aref e 8))
  (defun vm-mm-layout-body-end (e) (aref e 9))
  (defun vm-mm-layout-parts (e) (aref e 10))
+ ;; if display of MIME part fails, error string will be here.
  (defun vm-mm-layout-cache (e) (aref e 11))
  
  (defun vm-set-mm-layout-type (e type) (aset e 0 type))
***************
*** 1248,1254 ****
  		      ;; text/plain.
  		      (vm-mime-display-internal-text/plain layout)))
  		(t (and extent (vm-mime-rewrite-failed-button
! 				extent (vm-mm-layout-cache layout)))
  		   (vm-mime-display-internal-application/octet-stream
  		    (or extent layout))))
  	  (and extent (vm-mime-delete-button-maybe extent)))
--- 1249,1257 ----
  		      ;; text/plain.
  		      (vm-mime-display-internal-text/plain layout)))
  		(t (and extent (vm-mime-rewrite-failed-button
! 				extent
! 				(or (vm-mm-layout-cache layout)
! 				    "no external viewer defined for type")))
  		   (vm-mime-display-internal-application/octet-stream
  		    (or extent layout))))
  	  (and extent (vm-mime-delete-button-maybe extent)))
***************
*** 1259,1283 ****
    (vm-mime-display-button-xxxx layout t))
  
  (defun vm-mime-display-internal-text/html (layout)
!   (let ((buffer-read-only nil)
! 	(work-buffer nil))
!     (message "Inlining text/html, be patient...")
!     ;; w3-region is not as tame as we would like.
!     ;; make sure the yoke is firmly attached.
!     (unwind-protect
! 	(progn
! 	  (save-excursion
! 	    (set-buffer (setq work-buffer
! 			      (generate-new-buffer " *workbuf*")))
! 	    (vm-mime-insert-mime-body layout)
! 	    (vm-mime-transfer-decode-region layout (point-min) (point-max))
! 	    (save-excursion
! 	      (save-window-excursion
! 		(w3-region (point-min) (point-max)))))
! 	  (insert-buffer-substring work-buffer))
!       (and work-buffer (kill-buffer work-buffer)))
!     (message "Inlining text/html... done")
!     t ))
  
  (defun vm-mime-display-internal-text/plain (layout &optional no-highlighting)
    (let ((start (point)) end old-size
--- 1262,1289 ----
    (vm-mime-display-button-xxxx layout t))
  
  (defun vm-mime-display-internal-text/html (layout)
!   (if (fboundp 'w3-region)
!       (let ((buffer-read-only nil)
! 	    (work-buffer nil))
! 	(message "Inlining text/html, be patient...")
! 	;; w3-region is not as tame as we would like.
! 	;; make sure the yoke is firmly attached.
! 	(unwind-protect
! 	    (progn
! 	      (save-excursion
! 		(set-buffer (setq work-buffer
! 				  (generate-new-buffer " *workbuf*")))
! 		(vm-mime-insert-mime-body layout)
! 		(vm-mime-transfer-decode-region layout (point-min) (point-max))
! 		(save-excursion
! 		  (save-window-excursion
! 		    (w3-region (point-min) (point-max)))))
! 	      (insert-buffer-substring work-buffer))
! 	  (and work-buffer (kill-buffer work-buffer)))
! 	(message "Inlining text/html... done")
! 	t )
!     (vm-set-mm-layout-cache layout "Need W3 to inline HTML")
!     nil ))
  
  (defun vm-mime-display-internal-text/plain (layout &optional no-highlighting)
    (let ((start (point)) end old-size
***************
*** 1764,1770 ****
  (defun vm-mime-display-button-xxxx (layout disposable)
    (let ((description (vm-mime-layout-description layout)))
      (vm-mime-insert-button
!      (format "%-35.35s [%s to display]"
  	     description
  	     (if (vm-mouse-support-possible-p) "Click mouse-2" "Press RETURN"))
       (function
--- 1770,1776 ----
  (defun vm-mime-display-button-xxxx (layout disposable)
    (let ((description (vm-mime-layout-description layout)))
      (vm-mime-insert-button
!      (format "%-35.35s [%s to attempt display]"
  	     description
  	     (if (vm-mouse-support-possible-p) "Click mouse-2" "Press RETURN"))
       (function
***************
*** 1875,1881 ****
    (let* ((buffer-read-only nil)
  	 (start (point)))
      (goto-char (vm-extent-start-position button))
!     (insert (format "DISPLAY FAILED -- %s" error-string))
      (vm-set-extent-endpoints button start (vm-extent-end-position button))
      (delete-region (point) (vm-extent-end-position button))))
  
--- 1881,1887 ----
    (let* ((buffer-read-only nil)
  	 (start (point)))
      (goto-char (vm-extent-start-position button))
!     (insert (format "DISPLAY FAILED -- %s\n" error-string))
      (vm-set-extent-endpoints button start (vm-extent-end-position button))
      (delete-region (point) (vm-extent-end-position button))))
  
***************
*** 2454,2462 ****
  	    (narrow-to-region (point) (point-max))
  	    (setq charset (vm-determine-proper-charset (point-min)
  						       (point-max)))
- 	    (if vm-xemacs-mule-p
- 		(encode-coding-region (point-min) (point-max)
- 				      buffer-file-coding-system))
  	    (setq encoding (vm-determine-proper-content-transfer-encoding
  			    (point-min)
  			    (point-max))
--- 2460,2465 ----
***************
*** 2498,2504 ****
  	  (cond ((bufferp object)
  		 (insert-buffer-substring object))
  		((stringp object)
! 		 (let ((coding-system-for-read 'no-conversion))
  		   (insert-file-contents-literally object))))
  	  ;; gather information about the object from the extent.
  	  (if (setq already-mimed (extent-property e 'vm-mime-encoded))
--- 2501,2511 ----
  	  (cond ((bufferp object)
  		 (insert-buffer-substring object))
  		((stringp object)
! 		 (let ((coding-system-for-read 'no-conversion)
! 		       ;; don't let 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 'no-conversion))
  		   (insert-file-contents-literally object))))
  	  ;; gather information about the object from the extent.
  	  (if (setq already-mimed (extent-property e 'vm-mime-encoded))
***************
*** 2638,2646 ****
  	    nil
  	  (setq charset (vm-determine-proper-charset (point)
  						     (point-max)))
- 	  (if vm-xemacs-mule-p
- 	      (encode-coding-region (point-min) (point-max)
- 				    buffer-file-coding-system))
  	  (setq encoding (vm-determine-proper-content-transfer-encoding
  			  (point)
  			  (point-max))
--- 2645,2650 ----
***************
*** 2758,2766 ****
  	    (narrow-to-region (point) (point-max))
  	    (setq charset (vm-determine-proper-charset (point-min)
  						       (point-max)))
- 	    (if vm-xemacs-mule-p
- 		(encode-coding-region (point-min) (point-max)
- 				      file-coding-system))
  	    (setq encoding (vm-determine-proper-content-transfer-encoding
  			    (point-min)
  			    (point-max))
--- 2762,2767 ----
***************
*** 2955,2963 ****
  	    nil
  	  (setq charset (vm-determine-proper-charset (point)
  						     (point-max)))
- 	  (if vm-xemacs-mule-p
- 	      (encode-coding-region (point-min) (point-max)
- 				    file-coding-system))
  	  (setq encoding (vm-determine-proper-content-transfer-encoding
  			  (point)
  			  (point-max))
--- 2956,2961 ----
Index: xemacs-20.0/lisp/vm/vm-startup.el
diff -c xemacs-20.0/lisp/vm/vm-startup.el:1.12 xemacs-20.0/lisp/vm/vm-startup.el:1.13
*** xemacs-20.0/lisp/vm/vm-startup.el:1.12	Tue Apr 15 21:08:10 1997
--- xemacs-20.0/lisp/vm/vm-startup.el	Wed Apr 16 17:51:35 1997
***************
*** 276,282 ****
  (defun vm-mode (&optional read-only)
    "Major mode for reading mail.
  
! This is VM 6.26.
  
  Commands:
     h - summarize folder contents
--- 276,282 ----
  (defun vm-mode (&optional read-only)
    "Major mode for reading mail.
  
! This is VM 6.27.
  
  Commands:
     h - summarize folder contents
Index: xemacs-20.0/lisp/vm/vm-thread.el
diff -c xemacs-20.0/lisp/vm/vm-thread.el:1.4 xemacs-20.0/lisp/vm/vm-thread.el:1.5
*** xemacs-20.0/lisp/vm/vm-thread.el:1.4	Fri Mar 21 22:02:53 1997
--- xemacs-20.0/lisp/vm/vm-thread.el	Wed Apr 16 17:51:36 1997
***************
*** 149,162 ****
  
  (defun vm-thread-mark-for-summary-update (message-list)
    (while message-list
!     (vm-mark-for-summary-update (car message-list) t)
!     (vm-set-thread-list-of (car message-list) nil)
!     (vm-set-thread-indentation-of (car message-list) nil)
!     (vm-thread-mark-for-summary-update
!      (get (intern (vm-su-message-id (car message-list))
! 		  vm-thread-obarray)
! 	  'children))
!     (setq message-list (cdr message-list))))
  
  (defun vm-thread-list (message)
    (let ((done nil)
--- 149,166 ----
  
  (defun vm-thread-mark-for-summary-update (message-list)
    (while message-list
!     ;; if thread-list is null then we've already marked this
!     ;; message, or it doesn't need marking.
!     (if (null (vm-thread-list-of (car message-list)))
! 	nil
!       (vm-mark-for-summary-update (car message-list) t)
!       (vm-set-thread-list-of (car message-list) nil)
!       (vm-set-thread-indentation-of (car message-list) nil)
!       (vm-thread-mark-for-summary-update
!        (get (intern (vm-su-message-id (car message-list))
! 		    vm-thread-obarray)
! 	    'children))
!       (setq message-list (cdr message-list)))))
  
  (defun vm-thread-list (message)
    (let ((done nil)
Index: xemacs-20.0/lisp/vm/vm-version.el
diff -c xemacs-20.0/lisp/vm/vm-version.el:1.11 xemacs-20.0/lisp/vm/vm-version.el:1.12
*** xemacs-20.0/lisp/vm/vm-version.el:1.11	Tue Apr 15 21:08:11 1997
--- xemacs-20.0/lisp/vm/vm-version.el	Wed Apr 16 17:51:36 1997
***************
*** 2,8 ****
  
  (provide 'vm-version)
  
! (defconst vm-version "6.26"
    "Version number of VM.")
  
  (defun vm-version ()
--- 2,8 ----
  
  (provide 'vm-version)
  
! (defconst vm-version "6.27"
    "Version number of VM.")
  
  (defun vm-version ()
