#!/bin/sh
#### Patch script - GNU Emacs - version 19.24 to 19.25

#### This file contains patches to turn version 19.24 of GNU Emacs into
#### 19.25.  To apply them, cd to the top of the Emacs source tree, and
#### then type 'sh <this file>'.

#### After you apply the patches, you should run Emacs (an earlier 19 will do)
#### and type M-x byte-compile-file RET lisp/subr.el RET
####          M-x load-file RET lisp/subr.elc RET
####          M-x byte-compile-file RET lisp/mouse.el RET
####          M-x byte-compile-file RET lisp/levents.el RET
####          M-x byte-recompile-directory RET lisp RET
#### to recompile the changed Emacs Lisp files.
#### Then you can build the new Emacs version.

#### We don't include patches for Info files since you can
#### regenerate them from the Texinfo files that we do include.
#### To update the changed info files, do
#### (cd man; makeinfo emacs.texi)

### Patchmaker's checklist:
### - update version numbers in comments and version.el tweak
### - diff -u ls -R listings, and decide on rm's and mv's.
### - apply rm's and mv's, and then do a diff -cprP --exclude=\*.elc 
###   to generate the body.
### - insert the body just before the line saying `end-of-emacs-patch-kit'.

if [ -d lisp ] ; then
  true
else
  if [ -d emacs-19.24/lisp ] ; then
    cd emacs-19.24
  else
    (echo "$0: In order to apply this patch, the current directory"
     echo "must be the top of the Emacs distribution tree.") >&2
    exit 1
  fi
fi

### Put moves and renames here.

patch -p1 << \end-of-emacs-patch-kit

diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/ChangeLog emacs-19.25/ChangeLog
*** emacs-19.24/ChangeLog	Mon May 23 03:34:23 1994
--- emacs-19.25/ChangeLog	Mon May 30 07:55:20 1994
***************
*** 1,2 ****
--- 1,34 ----
+ Mon May 30 04:33:36 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Version 19.25 released.
+ 
+ 	* make-dist (shortversion): Don't assume another period follows.
+ 
+ Fri May 27 01:45:34 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Makefile.in (install-arch-indep): Use /bin/pwd uniformly, not pwd.
+ 	(uninstall): Use /bin/pwd.
+ 
+ 	* Makefile.in (blessmail): Depend on src.
+ 	(all): Don't depend on blessmail.
+ 
+ 	* Makefile.in (src/paths.h): Don't force recomputation.
+ 	(paths-force): New target; force recomputation of paths.h.
+ 	(all): Depend on paths-force.
+ 	(src, lib-src): Depend on src/paths.h.
+ 
+ 	* configure.in (*-sun-sunos4*): Set GCC_TEST_OPTIONS,
+ 	NON_GCC_TEST_OPTIONS.
+ 
+ Thu May 26 05:04:55 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* configure.in: Don't insist on subversions for irix.
+ 
+ Tue May 24 00:03:58 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* configure.in (hppa*-hp-hpux9shr): Move alternative up.
+ 
+ 	* configure.in (i[34]86-next-*): New alternative.
+ 
  Mon May 23 03:07:50 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
  
***************
*** 18,22 ****
  	* configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS): New vars.
  	Use them to set up CC.
! 	(m68k-sun-sunos4.1.3): Set them.
  
  Thu May 19 11:54:43 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
--- 50,54 ----
  	* configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS): New vars.
  	Use them to set up CC.
! 	(*-sun-sunos4.1.3): Set them.
  
  Thu May 19 11:54:43 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/Makefile.in emacs-19.25/Makefile.in
*** emacs-19.24/Makefile.in	Sat May 21 01:56:19 1994
--- emacs-19.25/Makefile.in	Fri May 27 03:46:44 1994
***************
*** 196,204 ****
  COPYDESTS = ${etcdir} ${lispdir}
  
! all:	src/paths.h ${SUBDIR} blessmail
  
  removenullpaths=sed -e 's/^://' -e 's/:$$//' -e 's/::/:/'
  
! # We force the rebuilding of src/paths.h because the user might give
  # make different values for the various directories.  Since we use
  # move-if-change, src/paths.h only actually changes if the user did
--- 196,220 ----
  COPYDESTS = ${etcdir} ${lispdir}
  
! all:	paths-force ${SUBDIR}
  
  removenullpaths=sed -e 's/^://' -e 's/:$$//' -e 's/::/:/'
  
! # Note that sed is not in /bin on 386bsd.
! src/paths.h: Makefile ${srcdir}/src/paths.h.in
! 	@echo "Producing \`src/paths.h' from \`src/paths.h.in'."
! 	@(lisppath=`echo ${lisppath} | ${removenullpaths}` ;		\
! 	  buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ;	\
! 	  sed < ${srcdir}/src/paths.h.in > src/paths.h.tmp		\
! 	  -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";'	\
! 	  -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
! 	  -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'		\
! 	  -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";'			\
! 	  -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'			\
! 	  -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";'			\
! 	  -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";')
! 	@${srcdir}/move-if-change src/paths.h.tmp src/paths.h
! 
! # For `make all',
! # we force the rebuilding of src/paths.h because the user might give
  # make different values for the various directories.  Since we use
  # move-if-change, src/paths.h only actually changes if the user did
***************
*** 206,210 ****
  # src/paths.h.tmp, which isn't much.
  # Note that sed is not in /bin on 386bsd.
! src/paths.h: Makefile ${srcdir}/src/paths.h.in FRC.src.paths.h
  	@echo "Producing \`src/paths.h' from \`src/paths.h.in'."
  	@(lisppath=`echo ${lisppath} | ${removenullpaths}` ;		\
--- 222,226 ----
  # src/paths.h.tmp, which isn't much.
  # Note that sed is not in /bin on 386bsd.
! paths-force: FRC.src.paths.h
  	@echo "Producing \`src/paths.h' from \`src/paths.h.in'."
  	@(lisppath=`echo ${lisppath} | ${removenullpaths}` ;		\
***************
*** 220,224 ****
  	@${srcdir}/move-if-change src/paths.h.tmp src/paths.h
  
! src:	lib-src FRC.src
  
  # This ought to depend on src/paths.h, so that in parallel make
--- 236,240 ----
  	@${srcdir}/move-if-change src/paths.h.tmp src/paths.h
  
! src:	lib-src FRC.src src/paths.h
  
  # This ought to depend on src/paths.h, so that in parallel make
***************
*** 226,230 ****
  # But that causes trouble in `make install' if a different prefix
  # is specified at that time.
! lib-src: FRC.lib-src
  
  .RECURSIVE: ${SUBDIR}
--- 242,246 ----
  # But that causes trouble in `make install' if a different prefix
  # is specified at that time.
! lib-src: FRC.lib-src src/paths.h
  
  .RECURSIVE: ${SUBDIR}
***************
*** 235,239 ****
  	  LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
  
! blessmail: ${SUBDIR_MAKEFILES} FRC
  	cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) MAKE='${MAKE}'
  
--- 251,255 ----
  	  LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
  
! blessmail: ${SUBDIR_MAKEFILES} src FRC
  	cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) MAKE='${MAKE}'
  
***************
*** 290,294 ****
  	-set ${COPYDESTS} ; \
  	 for dir in ${COPYDIR} ; do \
! 	   if [ `(cd $$1 && pwd)` != `(cd $${dir} && pwd)` ] ; then \
  	     rm -rf $$1 ; \
  	   fi ; \
--- 306,310 ----
  	-set ${COPYDESTS} ; \
  	 for dir in ${COPYDIR} ; do \
! 	   if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
  	     rm -rf $$1 ; \
  	   fi ; \
***************
*** 315,319 ****
  	   (cd etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
  	else true; fi
! 	thisdir=`pwd`; \
  	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
  	then \
--- 331,335 ----
  	   (cd etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
  	else true; fi
! 	thisdir=`/bin/pwd`; \
  	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
  	then \
***************
*** 326,330 ****
  	   done); \
  	else true; fi
! 	thisdir=`pwd`; cd ${srcdir}/etc; for page in emacs etags ctags ; do \
  	  (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext}); \
  	done
--- 342,346 ----
  	   done); \
  	else true; fi
! 	thisdir=`/bin/pwd`; cd ${srcdir}/etc; for page in emacs etags ctags ; do \
  	  (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext}); \
  	done
***************
*** 352,357 ****
  	for dir in ${lispdir} ${etcdir} ; do 		\
  	  if [ -d $${dir} ]; then			\
! 	    case `(cd $${dir} ; pwd)` in		\
! 	      `(cd ${srcdir} ; pwd)`* ) ;;		\
  	      * ) rm -rf $${dir} ;;			\
  	    esac ;					\
--- 368,373 ----
  	for dir in ${lispdir} ${etcdir} ; do 		\
  	  if [ -d $${dir} ]; then			\
! 	    case `(cd $${dir} ; /bin/pwd)` in		\
! 	      `(cd ${srcdir} ; /bin/pwd)`* ) ;;		\
  	      * ) rm -rf $${dir} ;;			\
  	    esac ;					\
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/PROBLEMS emacs-19.25/PROBLEMS
*** emacs-19.24/PROBLEMS	Sun May 22 23:34:00 1994
--- emacs-19.25/PROBLEMS	Sat May 28 14:28:04 1994
***************
*** 2,5 ****
--- 2,26 ----
  in compiling, installing and running GNU Emacs.
  
+ * Link failure when using acc on a Sun.
+ 
+ To use acc, you need additional options just before the libraries, such as
+ 
+    /usr/lang/SC2.0.1/values-Xt.o -L/usr/lang/SC2.0.1/cg87 -L/usr/lang/SC2.0.1
+ 
+ and you need to add -lansi just before -lc.
+ 
+ The precise file names depend on the compiler version, so we
+ cannot easily arrange to supply them.
+ 
+ * Link failure on IBM AIX 1.3 ptf 0013.
+ 
+ There is a real duplicate definition of the function `_slibc_free' in
+ the library /lib/libc_s.a (just do nm on it to verify).  The
+ workaround/fix is:
+ 
+     cd /lib
+     ar xv libc_s.a NLtmtime.o
+     ar dv libc_s.a NLtmtime.o
+ 
  * Undefined symbols _dlopen, _dlsym and/or _dlclose on a Sun.
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/README emacs-19.25/README
*** emacs-19.24/README	Mon May 23 05:50:36 1994
--- emacs-19.25/README	Mon May 30 07:55:56 1994
***************
*** 1,3 ****
! This directory tree holds version 19.24 of GNU Emacs, the extensible,
  customizable, self-documenting real-time display editor.
  
--- 1,3 ----
! This directory tree holds version 19.25 of GNU Emacs, the extensible,
  customizable, self-documenting real-time display editor.
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/configure emacs-19.25/configure
*** emacs-19.24/configure	Mon May 23 03:11:39 1994
--- emacs-19.25/configure	Sat May 28 06:55:03 1994
***************
*** 2,5 ****
--- 2,6 ----
  #### Configuration script for GNU Emacs
  #### Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ #### This script requires autoconf version 1.9 or later.
  
  ### Don't edit this script!
***************
*** 8,12 ****
  ### To rebuild it, execute the command
  ###	autoconf
! ### in the this directory.  You must have autoconf version 1.7 or later.
  
  ### This file is part of GNU Emacs.
--- 9,13 ----
  ### To rebuild it, execute the command
  ###	autoconf
! ### in the this directory.
  
  ### This file is part of GNU Emacs.
***************
*** 680,689 ****
      machine=hp800 opsys=hpux8
    ;;
-   hppa*-hp-hpux9* )
-     machine=hp800 opsys=hpux9
-   ;;
    hppa*-hp-hpux9shr* )
      machine=hp800 opsys=hpux9shr
    ;;
  
    ## HP 9000 series 700 and 800, running HP/UX
--- 681,690 ----
      machine=hp800 opsys=hpux8
    ;;
    hppa*-hp-hpux9shr* )
      machine=hp800 opsys=hpux9shr
    ;;
+   hppa*-hp-hpux9* )
+     machine=hp800 opsys=hpux9
+   ;;
  
    ## HP 9000 series 700 and 800, running HP/UX
***************
*** 821,825 ****
  
    ## NeXT
!   m68*-next-* )
      machine=next opsys=mach2
    ;;
--- 822,826 ----
  
    ## NeXT
!   m68*-next-* | i[34]86-next-* )
      machine=next opsys=mach2
    ;;
***************
*** 884,894 ****
    ;;
    ## Iris 4D
!   mips-sgi-irix3.* )
      machine=iris4d opsys=irix3-3
    ;;
!   mips-sgi-irix5.* )
      machine=iris4d opsys=irix5-0
    ;;
!   mips-sgi-irix4.* | mips-sgi-irix* )
      machine=iris4d opsys=irix4-0
    ;;
--- 885,895 ----
    ;;
    ## Iris 4D
!   mips-sgi-irix3* )
      machine=iris4d opsys=irix3-3
    ;;
!   mips-sgi-irix5* )
      machine=iris4d opsys=irix5-0
    ;;
!   mips-sgi-irix4* | mips-sgi-irix* )
      machine=iris4d opsys=irix4-0
    ;;
***************
*** 935,939 ****
  		;;
        *-sunos4shr*	  ) opsys=sunos4shr ;;
!       *-sunos4* | *-sunos ) opsys=sunos4-1 ;;
        *-sunos5.3* | *-solaris2.3* )
  		opsys=sol2-3
--- 936,943 ----
  		;;
        *-sunos4shr*	  ) opsys=sunos4shr ;;
!       *-sunos4* | *-sunos ) opsys=sunos4-1
! 		NON_GCC_TEST_OPTIONS=-Bstatic
! 		GCC_TEST_OPTIONS=-static
! 		;;
        *-sunos5.3* | *-solaris2.3* )
  		opsys=sol2-3
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/configure.in emacs-19.25/configure.in
*** emacs-19.24/configure.in	Mon May 23 03:07:49 1994
--- emacs-19.25/configure.in	Fri May 27 02:57:54 1994
***************
*** 2,13 ****
  dnl To rebuild the `configure' script from this, execute the command
  dnl 	autoconf
! dnl in the directory containing this script.  You must have autoconf
! dnl version 1.9 or later.
! dnl
! dnl The following text appears in the resulting `configure' script,
! dnl explaining how to rebuild it.
  [#!/bin/sh
  #### Configuration script for GNU Emacs
  #### Copyright (C) 1992, 1994 Free Software Foundation, Inc.
  
  ### Don't edit this script!
--- 2,10 ----
  dnl To rebuild the `configure' script from this, execute the command
  dnl 	autoconf
! dnl in the directory containing this script.
  [#!/bin/sh
  #### Configuration script for GNU Emacs
  #### Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+ #### This script requires autoconf version 1.9 or later.
  
  ### Don't edit this script!
***************
*** 16,20 ****
  ### To rebuild it, execute the command
  ###	autoconf
! ### in the this directory.  You must have autoconf version 1.7 or later.
  
  ### This file is part of GNU Emacs.
--- 13,17 ----
  ### To rebuild it, execute the command
  ###	autoconf
! ### in the this directory.
  
  ### This file is part of GNU Emacs.
***************
*** 688,697 ****
      machine=hp800 opsys=hpux8
    ;;
-   hppa*-hp-hpux9* )
-     machine=hp800 opsys=hpux9
-   ;;
    hppa*-hp-hpux9shr* )
      machine=hp800 opsys=hpux9shr
    ;;
  
    ## HP 9000 series 700 and 800, running HP/UX
--- 685,694 ----
      machine=hp800 opsys=hpux8
    ;;
    hppa*-hp-hpux9shr* )
      machine=hp800 opsys=hpux9shr
    ;;
+   hppa*-hp-hpux9* )
+     machine=hp800 opsys=hpux9
+   ;;
  
    ## HP 9000 series 700 and 800, running HP/UX
***************
*** 829,833 ****
  
    ## NeXT
!   m68*-next-* )
      machine=next opsys=mach2
    ;;
--- 826,830 ----
  
    ## NeXT
!   m68*-next-* | i[34]86-next-* )
      machine=next opsys=mach2
    ;;
***************
*** 892,902 ****
    ;;
    ## Iris 4D
!   mips-sgi-irix3.* )
      machine=iris4d opsys=irix3-3
    ;;
!   mips-sgi-irix5.* )
      machine=iris4d opsys=irix5-0
    ;;
!   mips-sgi-irix4.* | mips-sgi-irix* )
      machine=iris4d opsys=irix4-0
    ;;
--- 889,899 ----
    ;;
    ## Iris 4D
!   mips-sgi-irix3* )
      machine=iris4d opsys=irix3-3
    ;;
!   mips-sgi-irix5* )
      machine=iris4d opsys=irix5-0
    ;;
!   mips-sgi-irix4* | mips-sgi-irix* )
      machine=iris4d opsys=irix4-0
    ;;
***************
*** 943,947 ****
  		;;
        *-sunos4shr*	  ) opsys=sunos4shr ;;
!       *-sunos4* | *-sunos ) opsys=sunos4-1 ;;
        *-sunos5.3* | *-solaris2.3* )
  		opsys=sol2-3
--- 940,947 ----
  		;;
        *-sunos4shr*	  ) opsys=sunos4shr ;;
!       *-sunos4* | *-sunos ) opsys=sunos4-1
! 		NON_GCC_TEST_OPTIONS=-Bstatic
! 		GCC_TEST_OPTIONS=-static
! 		;;
        *-sunos5.3* | *-solaris2.3* )
  		opsys=sol2-3
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/etc/ChangeLog emacs-19.25/etc/ChangeLog
*** emacs-19.24/etc/ChangeLog	Mon May 23 03:37:44 1994
--- emacs-19.25/etc/ChangeLog	Mon May 30 07:30:52 1994
***************
*** 1,2 ****
--- 1,6 ----
+ Mon May 30 04:33:36 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Version 19.25 released.
+ 
  Mon May 23 03:32:01 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/etc/FTP emacs-19.25/etc/FTP
*** emacs-19.24/etc/FTP	Sat May 14 23:41:29 1994
--- emacs-19.25/etc/FTP	Sun May 29 15:19:01 1994
***************
*** 151,160 ****
  ftp.sunet.se:/pub/gnu (Sweden 130.238.127.3 daily mirror, ran by
  archive@ftp.sunet.se (also mirros the Mailing List Archives)
! hp4nl.nluug.nl (Netherlands), ftp.win.tue.nl (Netherlands, Internet
! Address 131.155.70.100), ftp.funet.fi:/pub/gnu (Finland 128.214.6.100,
! ran by gnu-adm), ftp.denet.dk (Denmark), ugle.unit.no (Norway
! 129.241.1.97), ftp.eunet.ch or nic.switch.ch:/mirror/gnu
! (Switzerland), irisa.irisa.fr:/pub/gnu or ftp.univ-lyon1.fr:pub/gnu
! (ran by ftpmaint@ftp.univ-lyon1.fr) (France), archive.eu.net (Europe
  192.16.202.1), cair.kaist.ac.kr:/pub/gnu (Korea 143.248.11.170),
  ftp.nectec.or.th:/pub/mirrors/gnu (Thailand 192.150.251.32 daily
--- 151,161 ----
  ftp.sunet.se:/pub/gnu (Sweden 130.238.127.3 daily mirror, ran by
  archive@ftp.sunet.se (also mirros the Mailing List Archives)
! hp4nl.nluug.nl (Netherlands), ftp.win.tue.nl:/pub/gnu (Netherlands
! 131.155.70.100 daily mirror, ran by ftp@win.tue.nl),
! ftp.funet.fi:/pub/gnu (Finland 128.214.6.100, ran by gnu-adm),
! ftp.denet.dk (Denmark), ugle.unit.no (Norway 129.241.1.97),
! ftp.eunet.ch or nic.switch.ch:/mirror/gnu (Switzerland),
! irisa.irisa.fr:/pub/gnu or ftp.univ-lyon1.fr:pub/gnu (ran by
! ftpmaint@ftp.univ-lyon1.fr) (France), archive.eu.net (Europe
  192.16.202.1), cair.kaist.ac.kr:/pub/gnu (Korea 143.248.11.170),
  ftp.nectec.or.th:/pub/mirrors/gnu (Thailand 192.150.251.32 daily
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/etc/MACHINES emacs-19.25/etc/MACHINES
*** emacs-19.24/etc/MACHINES	Mon May 23 03:10:56 1994
--- emacs-19.25/etc/MACHINES	Sat May 28 14:28:23 1994
***************
*** 795,798 ****
--- 795,805 ----
    and `i386' for Sun Roadrunners.  i386 calls for Sunos4.0.
  
+   If you compile with Sun's ANSI compiler acc, you need additional options
+   when linking temacs, such as
+      /usr/lang/SC2.0.1/values-Xt.o -L/usr/lang/SC2.0.1/cg87 -L/usr/lang/SC2.0.1
+   (those should be added just before the libraries) and you need to
+   add -lansi just before -lc.  The precise file names depend on the
+   compiler version, so we cannot easily arrange to supply them.
+ 
    Some people report crashes on SunOS 4.1.3 if SYSTEM_MALLOC is defined.
    Others have reported that Emacs works if SYSTEM_MALLOC is defined, and not
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/etc/NEWS emacs-19.25/etc/NEWS
*** emacs-19.24/etc/NEWS	Mon May 23 19:25:45 1994
--- emacs-19.25/etc/NEWS	Wed May 25 17:38:29 1994
***************
*** 6,9 ****
--- 6,14 ----
  For older news, see the file ONEWS.
  
+ Changes in Emacs 19.25
+ 
+ The variable x-cross-pointer-shape (which didn't really exist) has
+ been renamed to x-sensitive-text-pointer-shape, and now does exist.
+ 
  Changes in Emacs 19.24
  
***************
*** 18,21 ****
--- 23,27 ----
  gnus-uu.el		UUdecode in GNUS buffers.
  ielm.el			Interactively evaluate Lisp.
+ 			 This is a replacement for Lisp Interaction Mode.
  iso-cvt.el		Conversion of beyond-ASCII characters between
  			 various different representations.
***************
*** 24,28 ****
  mail-hist.el		Provides history for headers of outgoing mail.
  rsz-mini.el		Automatically resizing minibuffers.
- 			 This is a replacement for Lisp Interaction Mode.
  s-region.el		Set region by holding shift.
  skeleton.el		Templates for statement insertion.
--- 30,33 ----
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lib-src/ChangeLog emacs-19.25/lib-src/ChangeLog
*** emacs-19.24/lib-src/ChangeLog	Thu May 19 17:04:45 1994
--- emacs-19.25/lib-src/ChangeLog	Mon May 30 07:30:35 1994
***************
*** 1,2 ****
--- 1,18 ----
+ Mon May 30 04:33:36 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Version 19.25 released.
+ 
+ Sat May 28 00:54:39 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Makefile.in.in (distclean): Delete Makefile, Makefile.in, blessmail.
+ 
+ Fri May 27 03:16:56 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Makefile.in.in (blessmail): Don't depend on ../src/emacs.
+ 
+ Mon May 23 00:38:44 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Version 19.24 released.
+ 
  Thu May 19 17:04:36 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lib-src/Makefile.in.in emacs-19.25/lib-src/Makefile.in.in
*** emacs-19.24/lib-src/Makefile.in.in	Mon May 16 18:02:04 1994
--- emacs-19.25/lib-src/Makefile.in.in	Sat May 28 00:54:42 1994
***************
*** 164,168 ****
  
  #ifdef MOVEMAIL_NEEDS_BLESSING
! blessmail: ../src/emacs
  	../src/emacs -batch -l ../lisp/blessmail.el
  	chmod +x blessmail
--- 164,168 ----
  
  #ifdef MOVEMAIL_NEEDS_BLESSING
! blessmail:
  	../src/emacs -batch -l ../lisp/blessmail.el
  	chmod +x blessmail
***************
*** 223,226 ****
--- 223,227 ----
  distclean: clean
  	-rm -f ../etc/DOC* *.tab.c *.tab.h aixcc.c TAGS
+ 	-rm -f Makefile Makefile.in blessmail
  
  realclean: distclean
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/ChangeLog emacs-19.25/lisp/ChangeLog
*** emacs-19.24/lisp/ChangeLog	Mon May 23 18:44:06 1994
--- emacs-19.25/lisp/ChangeLog	Mon May 30 08:26:21 1994
***************
*** 1,2 ****
--- 1,134 ----
+ Mon May 30 04:33:36 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Version 19.25 released.
+ 
+ 	* comint.el (comint-read-input-ring): Make regexp stricter.
+ 
+ 	* info.el (Info-directory-list): Doc fix.
+ 
+ 	* paths.el (Info-default-directory-list): Don't attach ../info.
+ 	So now configure-info-directory comes last.
+ 	Put /usr/local/info second.
+ 
+ 	* bibtex.el (bibtex-clean-entry): Back over close delimiter carefully.
+ 
+ 	* ange-ftp.el (ange-ftp-insert-directory): Expand file name to
+ 	check whether it is really an ftp file name.
+ 
+ 	* compile.el (compilation-error-regexp-alist): Stricter Lucid regexp.
+ 
+ 	* simple.el (completion-list-mode-map): Unbind down-mouse-2.
+ 
+ Mon May 30 03:32:01 1994  Simon Marshall  (Simon.Marshall@mail.esrin.esa.it)
+ 
+ 	* font-lock.el (shell-font-lock-keywords): Removed regexp for commands.
+ 	(rmail-summary-font-lock-keywords): New variable.
+ 	(font-lock-set-defaults): Use it.
+ 
+ Sun May 29 16:05:39 1994  Paul Eggert  (eggert@twinsun.com)
+ 
+ 	* cal-dst.el (calendar-current-time-zone): Fix typo that
+ 	transposed DST-STARTS-TIME and DST-ENDS-TIME.
+ 
+ 	* cal-dst.el (calendar-daylight-savings-ends): Fix typo in put.
+ 
+ Sat May 28 00:11:04 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* gud.el: Use ctl-x-map to bind C-x SPC.
+ 
+ 	* lmenu.el (make-lucid-menu-keymap): Allow any form as the enabler.
+ 
+ 	* info.el (Info-directory-list): Doc fix.
+ 
+ 	* server.el (server-visit-files): Bind last-nonmenu-event.
+ 
+ 	* mailalias.el (build-mail-aliases): Handle source directives.
+ 	Handle MAILRC envvar.
+ 
+ 	* flow-ctrl.el (enable-flow-control): Fix bugs turning off flow ctrl.
+ 
+ 	* files.el (insert-directory): Use expanded file name to find handler.
+ 
+ 	* dired.el (dired-get-filename): Get rid of text props from name.
+ 
+ 	* simple.el (deactivate-mark): Do nothing unless transient-mark-mode.
+ 
+ 	* ispell.el (ispell-command-loop): Fix `q' question.
+ 
+ 	* derived.el (derived-mode-init-mode-variables): Add autoload cookie.
+ 
+ 	* calendar.el (calendar-cursor-to-date): Rename starred-day
+ 	to calendar-starred-day.
+ 
+ 	* cal-menu.el (calendar-mode-map): Define mouse-2 as ignore.
+ 
+ 	* frame.el (make-frame): Doc fix.
+ 
+ 	* hexl.el (hexl-mode-map): Call define-key properly for help-char.
+ 
+ Fri May 27 21:55:28 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* ediff.el (ediff-patch-buffer): Fix autoload cookie.
+ 
+ 	* tcl-mode.el (tcl-mode): Copy syntax table before changing it.
+ 
+ Thu May 26 19:17:44 1994  Michael D. Ernst  (mernst@research.microsoft.com)
+ 
+ 	* dired-x.el (dired-jump): Autoload.
+ 
+ 	* compare-w.el (compare-windows): Make leading whitespace equivalent
+ 	to no leading whitespace, according to IGNORE-WHITESPACE argument.
+ 
+ Thu May 26 18:25:17 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* gnus.el (gnus-summary-catchup): Check gnus-interactive-catchup.
+ 	(gnus-summary-catchup-and-exit): Likewise.
+ 
+ 	* simple.el (completion-setup-function): Fix up the regexp.
+ 
+ 	* menu-bar.el (menu-bar-mode): Fix previous change.
+ 
+ 	* rmail.el (rmail-show-message):
+ 	If transient-mark-mode, deactivate the mark.
+ 
+ 	* edebug.el (edebug-emacs-19-specific): Call x-popup-menu
+ 	to fill in cache of key equivalents.
+ 
+ Thu May 26 17:51:38 1994  Karl Heuer  (kwzh@hal.gnu.ai.mit.edu)
+ 
+ 	* subr.el (posn-col-row): Test for consp, not symbolp.
+ 	Doc fix.
+ 
+ Thu May 26 00:20:11 1994  Stephen A. Wood  (saw@cebaf.gov)
+ 
+         * fortran.el: (fortran-link-matching-do): Ignore DO statements
+         with line numbers.
+ 
+ Thu May 26 13:37:28 1994  Karl Heuer  (kwzh@hal.gnu.ai.mit.edu)
+ 
+ 	* ws-mode.el (ws-search): Fix malformed character constants.
+ 
+ Wed May 25 04:02:00 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* files.el (kill-emacs-query-functions): Doc fix.
+ 
+ 	* simple.el (choose-completion-string): Clear mouse-face property.
+ 
+ 	* files.el: Add more risky-local-variable properties.
+ 
+ 	* fill.el (fill-region-as-paragraph): if left-margin is nonzero,
+ 	do adaptive-fill processing even for one-line paragraphs.
+ 
+ 	* c-mode.el (c-fill-paragraph): Don't include part of comment
+         terminator in the fill-prefix.
+ 
+ 	* server.el (server-kill-emacs-query-function): Ignore killed buffers.
+ 
+ Tue May 24 16:39:01 1994 Kenneth Manheimer (ken.manheimer@nist.gov)
+ 
+ 	* allout.el (outline-chart-subtree): include outline-next-
+ 	heading in loop conditions to detect end-of-buffer (and avoid
+ 	infinite loop).
+ 
  Mon May 23 03:32:01 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/allout.el emacs-19.25/lisp/allout.el
*** emacs-19.24/lisp/allout.el	Sun May 22 17:51:14 1994
--- emacs-19.25/lisp/allout.el	Wed May 25 00:40:25 1994
***************
*** 1454,1460 ****
  			       ;; or no more siblings - proceed to
  			       ;; next heading at lesser depth:
! 			       (while (<= curr-depth
! 					  (outline-recent-depth))
! 				 (outline-next-heading)))
  			 (outline-next-heading)))
  
--- 1454,1460 ----
  			       ;; or no more siblings - proceed to
  			       ;; next heading at lesser depth:
! 			       (while (and (<= curr-depth
! 					       (outline-recent-depth))
! 					   (outline-next-heading))))
  			 (outline-next-heading)))
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/ange-ftp.el emacs-19.25/lisp/ange-ftp.el
*** emacs-19.24/lisp/ange-ftp.el	Mon May 23 18:44:32 1994
--- emacs-19.25/lisp/ange-ftp.el	Mon May 30 06:09:16 1994
***************
*** 852,856 ****
  ;;;; ------------------------------------------------------------
  
! (defconst ange-ftp-version "$Revision: 1.52 $")
  
  (defvar ange-ftp-data-buffer-name " *ftp data*"
--- 852,856 ----
  ;;;; ------------------------------------------------------------
  
! (defconst ange-ftp-version "$Revision: 1.53 $")
  
  (defvar ange-ftp-data-buffer-name " *ftp data*"
***************
*** 3951,3955 ****
  (defun ange-ftp-insert-directory (file switches &optional wildcard full)
    (let ((short (ange-ftp-abbreviate-filename file))
! 	(parsed (ange-ftp-ftp-name file)))
      (if parsed
  	(insert
--- 3951,3955 ----
  (defun ange-ftp-insert-directory (file switches &optional wildcard full)
    (let ((short (ange-ftp-abbreviate-filename file))
! 	(parsed (ange-ftp-ftp-name (expand-file-name file))))
      (if parsed
  	(insert
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/bibtex.el emacs-19.25/lisp/bibtex.el
*** emacs-19.24/lisp/bibtex.el	Tue May  3 19:03:50 1994
--- emacs-19.25/lisp/bibtex.el	Mon May 30 06:30:39 1994
***************
*** 1490,1495 ****
      ;; sct@dcs.edinburgh.ac.uk
      (save-excursion
!       (previous-line 1)
!       (end-of-line)
        (if (eq (preceding-char) ?,)
   	  (backward-delete-char 1)))
--- 1490,1495 ----
      ;; sct@dcs.edinburgh.ac.uk
      (save-excursion
!       (backward-char 1)
!       (skip-syntax-backward " >")
        (if (eq (preceding-char) ?,)
   	  (backward-delete-char 1)))
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/c-mode.el emacs-19.25/lisp/c-mode.el
*** emacs-19.24/lisp/c-mode.el	Tue Mar 29 20:39:06 1994
--- emacs-19.25/lisp/c-mode.el	Wed May 25 04:38:09 1994
***************
*** 387,390 ****
--- 387,395 ----
  			      (beginning-of-line)
  			      (skip-chars-forward " \t*" max-prefix-end)
+ 			      ;; Don't include part of comment terminator
+ 			      ;; in the fill-prefix.
+ 			      (and (eq (following-char) ?/)
+ 				   (eq (preceding-char) ?*)
+ 				   (backward-char 1))
  			      (point)))
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/cal-dst.el emacs-19.25/lisp/cal-dst.el
*** emacs-19.24/lisp/cal-dst.el	Tue May  3 19:12:54 1994
--- emacs-19.25/lisp/cal-dst.el	Mon May 30 06:25:14 1994
***************
*** 247,252 ****
  		(/ (abs (- t0-utc-diff t1-utc-diff)) 60)
  		(if (< t0-utc-diff t1-utc-diff)
! 		    (list t0-name t1-name t1-rules t2-rules t2-time t1-time)
! 		    (list t1-name t0-name t2-rules t1-rules t1-time t2-time)
  		    )))))))))))
  
--- 247,252 ----
  		(/ (abs (- t0-utc-diff t1-utc-diff)) 60)
  		(if (< t0-utc-diff t1-utc-diff)
! 		    (list t0-name t1-name t1-rules t2-rules t1-time t2-time)
! 		    (list t1-name t0-name t2-rules t1-rules t2-time t1-time)
  		    )))))))))))
  
***************
*** 305,309 ****
  
  ;;;###autoload
! (put 'calendar-daylight-savings-starts 'risky-local-variable t)
  (defvar calendar-daylight-savings-ends
    (or (car (nthcdr 5 calendar-current-time-zone-cache))
--- 305,309 ----
  
  ;;;###autoload
! (put 'calendar-daylight-savings-ends 'risky-local-variable t)
  (defvar calendar-daylight-savings-ends
    (or (car (nthcdr 5 calendar-current-time-zone-cache))
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/cal-menu.el emacs-19.25/lisp/cal-menu.el
*** emacs-19.24/lisp/cal-menu.el	Thu May 19 19:17:20 1994
--- emacs-19.25/lisp/cal-menu.el	Sat May 28 00:27:06 1994
***************
*** 38,41 ****
--- 38,42 ----
  
  (define-key calendar-mode-map [down-mouse-2] 'calendar-mouse-2-date-menu)
+ (define-key calendar-mode-map [mouse-2] 'ignore)
  
  (defvar calendar-mouse-3-map (make-sparse-keymap "Calendar"))
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/calendar.el emacs-19.25/lisp/calendar.el
*** emacs-19.24/lisp/calendar.el	Tue May 10 17:57:00 1994
--- emacs-19.25/lisp/calendar.el	Sat May 28 00:31:17 1994
***************
*** 1988,1992 ****
              (re-search-backward "[^*]")
              (if (looking-at ".\\*\\*")
!                 (list month starred-day year)
                (if error (error "Not on a date!"))))
          (if error (error "Not on a date!"))))))
--- 1988,1992 ----
              (re-search-backward "[^*]")
              (if (looking-at ".\\*\\*")
!                 (list month calendar-starred-day year)
                (if error (error "Not on a date!"))))
          (if error (error "Not on a date!"))))))
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/comint.el emacs-19.25/lisp/comint.el
*** emacs-19.24/lisp/comint.el	Wed May  4 23:58:35 1994
--- emacs-19.25/lisp/comint.el	Mon May 30 08:20:50 1994
***************
*** 628,632 ****
  		 (widen)
  		 (goto-char (point-min))
! 		 (while (re-search-forward "^\\s *\\([^#].*\\)\\s *$" nil t)
  		   (let ((history (buffer-substring (match-beginning 1)
  						    (match-end 1))))
--- 628,632 ----
  		 (widen)
  		 (goto-char (point-min))
! 		 (while (re-search-forward "^[ \t]*\\([^#\n].*\\)[ \t]*$" nil t)
  		   (let ((history (buffer-substring (match-beginning 1)
  						    (match-end 1))))
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/compare-w.el emacs-19.25/lisp/compare-w.el
*** emacs-19.24/lisp/compare-w.el	Sat Nov 13 21:56:01 1993
--- emacs-19.25/lisp/compare-w.el	Fri May 27 03:01:16 1994
***************
*** 100,106 ****
  		       (funcall skip-whitespace opoint2)))
  	       (setq p2a (point))
! 	       (and result1 result2 (eq result1 result2)
! 		    (setq p1 p1a
! 			  p2 p2a)))))
  
        ;; Try advancing comparing 1000 chars at a time.
--- 100,107 ----
  		       (funcall skip-whitespace opoint2)))
  	       (setq p2a (point))
! 	       (if (or (stringp skip-whitespace)
! 		       (and result1 result2 (eq result1 result2)))
! 		   (setq p1 p1a
! 			 p2 p2a)))))
  
        ;; Try advancing comparing 1000 chars at a time.
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/compile.el emacs-19.25/lisp/compile.el
*** emacs-19.24/lisp/compile.el	Thu May 19 17:45:21 1994
--- emacs-19.25/lisp/compile.el	Mon May 30 04:42:28 1994
***************
*** 162,166 ****
      ;; Lucid Compiler, lcc 3.x
      ;; E, file.cc(35,52) Illegal operation on pointers
!     ("[A-Z], \\([^(]*\\)(\\([0-9]+\\),[ \t]*\\([0-9]+\\)" 1 2 3)
  
      )
--- 162,166 ----
      ;; Lucid Compiler, lcc 3.x
      ;; E, file.cc(35,52) Illegal operation on pointers
!     ("\n[EW], \\([^(\n]*\\)(\\([0-9]+\\),[ \t]*\\([0-9]+\\)" 1 2 3)
  
      )
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/derived.el emacs-19.25/lisp/derived.el
*** emacs-19.24/lisp/derived.el	Tue Mar  8 13:58:32 1994
--- emacs-19.25/lisp/derived.el	Sat May 28 00:48:13 1994
***************
*** 205,208 ****
--- 205,209 ----
  ;; Utility functions for defining a derived mode.
  
+ ;;;###autoload
  (defun derived-mode-init-mode-variables (mode)
    "Initialise variables for a new mode. 
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/dired-x.el emacs-19.25/lisp/dired-x.el
*** emacs-19.24/lisp/dired-x.el	Fri Apr 29 00:58:55 1994
--- emacs-19.25/lisp/dired-x.el	Fri May 27 02:37:49 1994
***************
*** 388,391 ****
--- 388,392 ----
  ;;;; JUMP.
  
+ ;;;###autoload
  (defun dired-jump (&optional other-window)
    "Jump to dired buffer corresponding to current buffer.
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/dired.el emacs-19.25/lisp/dired.el
*** emacs-19.24/lisp/dired.el	Sat May 21 20:03:26 1994
--- emacs-19.25/lisp/dired.el	Sat May 28 08:11:15 1994
***************
*** 1095,1099 ****
  	  (setq p2 (dired-move-to-end-of-filename no-error-if-not-filep))))
      ;; nil if no file on this line, but no-error-if-not-filep is t:
!     (if (setq file (and p1 p2 (buffer-substring p1 p2)))
  	;; Check if ls quoted the names, and unquote them.
  	;; Using read to unquote is much faster than substituting
--- 1095,1099 ----
  	  (setq p2 (dired-move-to-end-of-filename no-error-if-not-filep))))
      ;; nil if no file on this line, but no-error-if-not-filep is t:
!     (if (setq file (and p1 p2 (format "%s" (buffer-substring p1 p2))))
  	;; Check if ls quoted the names, and unquote them.
  	;; Using read to unquote is much faster than substituting
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/edebug.el emacs-19.25/lisp/edebug.el
*** emacs-19.24/lisp/edebug.el	Sun May 22 18:07:13 1994
--- emacs-19.25/lisp/edebug.el	Thu May 26 20:39:21 1994
***************
*** 9,13 ****
  ;; edebug|Daniel LaLiberte|liberte@cs.uiuc.edu
  ;; |A source level debugger for Emacs Lisp.
! ;; |$Date: 1994/05/22 22:06:54 $|$Revision: 3.5.1.6 $|~/modes/edebug.el|
  
  ;; This file is part of GNU Emacs.
--- 9,13 ----
  ;; edebug|Daniel LaLiberte|liberte@cs.uiuc.edu
  ;; |A source level debugger for Emacs Lisp.
! ;; |$Date: 1994/05/27 00:38:54 $|$Revision: 3.5.1.7 $|~/modes/edebug.el|
  
  ;; This file is part of GNU Emacs.
***************
*** 84,88 ****
  
  (defconst edebug-version
!   (let ((raw-version "$Revision: 3.5.1.6 $"))
      (substring raw-version (string-match "[0-9.]*" raw-version)
  	       (match-end 0))))
--- 84,88 ----
  
  (defconst edebug-version
!   (let ((raw-version "$Revision: 3.5.1.7 $"))
      (substring raw-version (string-match "[0-9.]*" raw-version)
  	       (match-end 0))))
***************
*** 4380,4383 ****
--- 4380,4384 ----
  
    (easy-menu-define 'edebug edebug-mode-map "Edebug menus" edebug-mode-menus)
+   (x-popup-menu nil (lookup-key edebug-mode-map [menu-bar Edebug]))
    )
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/ediff.el emacs-19.25/lisp/ediff.el
*** emacs-19.24/lisp/ediff.el	Sun May 22 17:59:08 1994
--- emacs-19.25/lisp/ediff.el	Fri May 27 21:59:14 1994
***************
*** 1832,1836 ****
  		 )))
  		  
! ;;;;###autoload
  (defun ediff-patch-buffer (buffer-name &optional startup-hooks)		  
    "Run Ediff by patching BUFFER-NAME."
--- 1832,1836 ----
  		 )))
  		  
! ;;;###autoload
  (defun ediff-patch-buffer (buffer-name &optional startup-hooks)		  
    "Run Ediff by patching BUFFER-NAME."
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/files.el emacs-19.25/lisp/files.el
*** emacs-19.24/lisp/files.el	Mon May 23 05:47:17 1994
--- emacs-19.25/lisp/files.el	Sat May 28 08:32:24 1994
***************
*** 1106,1109 ****
--- 1106,1110 ----
  
  ;; Get confirmation before setting these variables as locals in a file.
+ (put 'enable-local-eval 'risky-local-variable t)
  (put 'eval 'risky-local-variable t)
  (put 'file-name-handler-alist 'risky-local-variable t)
***************
*** 1110,1114 ****
  (put 'minor-mode-map-alist 'risky-local-variable t)
  (put 'after-load-alist 'risky-local-variable t)
! 	    
  (defun hack-one-local-variable-quotep (exp)
    (and (consp exp) (eq (car exp) 'quote) (consp (cdr exp))))
--- 1111,1118 ----
  (put 'minor-mode-map-alist 'risky-local-variable t)
  (put 'after-load-alist 'risky-local-variable t)
! (put 'buffer-file-name 'risky-local-variable t)
! (put 'buffer-auto-save-file-name 'risky-local-variable t)
! (put 'buffer-file-truename 'risky-local-variable t)
! 
  (defun hack-one-local-variable-quotep (exp)
    (and (consp exp) (eq (car exp) 'quote) (consp (cdr exp))))
***************
*** 2021,2025 ****
  whose name is in the variable `insert-directory-program'.
  If WILDCARD, it also runs the shell specified by `shell-file-name'."
!   (let ((handler (find-file-name-handler file 'insert-directory)))
      (if handler
  	(funcall handler 'insert-directory file switches
--- 2025,2031 ----
  whose name is in the variable `insert-directory-program'.
  If WILDCARD, it also runs the shell specified by `shell-file-name'."
!   ;; We need the directory in order to find the right handler.
!   (let ((handler (find-file-name-handler (expand-file-name file)
! 					 'insert-directory)))
      (if handler
  	(funcall handler 'insert-directory file switches
***************
*** 2058,2062 ****
  
  (defvar kill-emacs-query-functions nil
!   "Functions to call with no arguments to query about killing Emacs.")
  
  (defun save-buffers-kill-emacs (&optional arg)
--- 2064,2069 ----
  
  (defvar kill-emacs-query-functions nil
!   "Functions to call with no arguments to query about killing Emacs.
! If any of these functions returns nil, killing Emacs is cancelled.")
  
  (defun save-buffers-kill-emacs (&optional arg)
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/fill.el emacs-19.25/lisp/fill.el
*** emacs-19.24/lisp/fill.el	Tue May  3 18:47:43 1994
--- emacs-19.25/lisp/fill.el	Wed May 25 04:41:52 1994
***************
*** 86,94 ****
  	    (goto-char (min from to))
  	    (if (eolp) (forward-line 1))
! 	    ;; If paragraph has only one line, don't assume
  	    ;; that additional lines would have the same starting
  	    ;; decoration.  Assume no indentation.
! ;;	    (re-search-forward adaptive-fill-regexp)
! ;;	    (setq fill-prefix (make-string (current-column) ?\ ))
  	    )))
  
--- 86,98 ----
  	    (goto-char (min from to))
  	    (if (eolp) (forward-line 1))
! 	    ;; If paragraph has only one line, don't assume in general
  	    ;; that additional lines would have the same starting
  	    ;; decoration.  Assume no indentation.
! 	    ;; But if left-margin is nonzero, we can assume ordinary
! 	    ;; lines do have indentation.
! 	    (if (> left-margin 0)
! 		(progn
! 		  (re-search-forward adaptive-fill-regexp)
! 		  (setq fill-prefix (make-string (current-column) ?\ ))))
  	    )))
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/flow-ctrl.el emacs-19.25/lisp/flow-ctrl.el
*** emacs-19.24/lisp/flow-ctrl.el	Tue May  3 18:35:47 1994
--- emacs-19.25/lisp/flow-ctrl.el	Sat May 28 08:53:20 1994
***************
*** 63,70 ****
  	;; Turn flow control off, and stop exchanging chars.
  	(set-input-mode t nil (nth 2 (current-input-mode)))
! 	(aset keyboard-translate-table flow-control-c-s-replacement nil)
! 	(aset keyboard-translate-table ?\^s nil)
! 	(aset keyboard-translate-table flow-control-c-q-replacement nil)
! 	(aset keyboard-translate-table ?\^q nil))
      ;; Turn flow control on.
      ;; Tell emacs to pass C-s and C-q to OS.
--- 63,74 ----
  	;; Turn flow control off, and stop exchanging chars.
  	(set-input-mode t nil (nth 2 (current-input-mode)))
! 	(if keyboard-translate-table
! 	    (progn
! 	      (aset keyboard-translate-table flow-control-c-s-replacement
! 		    flow-control-c-s-replacement)
! 	      (aset keyboard-translate-table ?\^s ?\^s)
! 	      (aset keyboard-translate-table flow-control-c-q-replacement
! 		    flow-control-c-q-replacement)
! 	      (aset keyboard-translate-table ?\^q ?\^q))))
      ;; Turn flow control on.
      ;; Tell emacs to pass C-s and C-q to OS.
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/font-lock.el emacs-19.25/lisp/font-lock.el
*** emacs-19.24/lisp/font-lock.el	Wed May 18 19:35:21 1994
--- emacs-19.25/lisp/font-lock.el	Mon May 30 06:39:30 1994
***************
*** 663,668 ****
  (defvar shell-font-lock-keywords
    (list (cons shell-prompt-pattern 'font-lock-keyword-face)
- 	(list (concat shell-prompt-pattern "\\([^ \t]+\\)")
- 	      1 'font-lock-function-name-face)
  	'("[ \t]\\([+-][^ \t\n]+\\)" 1 font-lock-comment-face)
  	'("^[^ \t]+:.*$" . font-lock-string-face)
--- 663,666 ----
***************
*** 688,691 ****
--- 686,694 ----
    "Additional expressions to highlight in Rmail mode.")
  
+ (defvar rmail-summary-font-lock-keywords
+   '(("^\\s *[0-9]+D.*$" . font-lock-doc-string-face)
+     ("^\\s *[0-9]+-.*$" . font-lock-keyword-face))
+   "Additional expressions to highlight in Rmail Summary mode.")
+ 
  (defvar compilation-mode-font-lock-keywords
    '(("^\\([^\n:]*:\\([0-9]+:\\)+\\)\\(.*\\)$" 1 font-lock-function-name-face))
***************
*** 710,713 ****
--- 713,718 ----
  		  ((eq major-mode 'dired-mode)      dired-font-lock-keywords)
  		  ((eq major-mode 'rmail-mode)      rmail-font-lock-keywords)
+ 		  ((eq major-mode 'rmail-summary-mode)
+ 		   rmail-summary-font-lock-keywords)
  		  ((eq major-mode 'compilation-mode)
  		   compilation-mode-font-lock-keywords)
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/fortran.el emacs-19.25/lisp/fortran.el
*** emacs-19.24/lisp/fortran.el	Mon Apr  4 16:12:52 1994
--- emacs-19.25/lisp/fortran.el	Thu May 26 16:34:33 1994
***************
*** 5,9 ****
  ;; Author: Michael D. Prange <prange@erl.mit.edu>
  ;; Maintainer: bug-fortran-mode@erl.mit.edu
! ;; Version 1.30.4 (January 20, 1994)
  ;; Keywords: languages
  
--- 5,9 ----
  ;; Author: Michael D. Prange <prange@erl.mit.edu>
  ;; Maintainer: bug-fortran-mode@erl.mit.edu
! ;; Version 1.30.5 (May 20, 1994)
  ;; Keywords: languages
  
***************
*** 47,51 ****
  ;;; Bugs to bug-fortran-mode@erl.mit.edu
  
! (defconst fortran-mode-version "version 1.30.4")
  
  ;;; Code:
--- 47,51 ----
  ;;; Bugs to bug-fortran-mode@erl.mit.edu
  
! (defconst fortran-mode-version "version 1.30.5")
  
  ;;; Code:
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/frame.el emacs-19.25/lisp/frame.el
*** emacs-19.24/lisp/frame.el	Mon May 23 05:10:47 1994
--- emacs-19.25/lisp/frame.el	Sat May 28 00:14:06 1994
***************
*** 355,362 ****
  \(minibuffer . nil) - the frame should have no minibuffer
  \(minibuffer . only) - the frame should contain only a minibuffer
! \(minibuffer . WINDOW) - the frame should use WINDOW as its minibuffer window.
! 
! The documentation for the function `x-create-frame' describes
! additional frame parameters that Emacs recognizes for X window frames."
    (interactive)
    (let ((nframe))
--- 355,359 ----
  \(minibuffer . nil) - the frame should have no minibuffer
  \(minibuffer . only) - the frame should contain only a minibuffer
! \(minibuffer . WINDOW) - the frame should use WINDOW as its minibuffer window."
    (interactive)
    (let ((nframe))
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/gnus.el emacs-19.25/lisp/gnus.el
*** emacs-19.24/lisp/gnus.el	Sun May 22 17:59:37 1994
--- emacs-19.25/lisp/gnus.el	Fri May 27 05:09:59 1994
***************
*** 3941,3944 ****
--- 3941,3945 ----
    (interactive "P")
    (if (or quietly
+ 	  (not gnus-interactive-catchup) ;Without confirmation?
  	  (y-or-n-p
  	   (if all
***************
*** 3967,3970 ****
--- 3968,3972 ----
    (interactive "P")
    (if (or quietly
+ 	  (not gnus-interactive-catchup) ;Without confirmation?
  	  (y-or-n-p
  	   (if all
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/gud.el emacs-19.25/lisp/gud.el
*** emacs-19.24/lisp/gud.el	Wed May 11 19:34:38 1994
--- emacs-19.25/lisp/gud.el	Sat May 28 17:49:35 1994
***************
*** 48,52 ****
  
  (global-set-key (concat gud-key-prefix "\C-l") 'gud-refresh)
! (global-set-key "\C-x " 'gud-break)	;; backward compatibility hack
  
  ;; ======================================================================
--- 48,52 ----
  
  (global-set-key (concat gud-key-prefix "\C-l") 'gud-refresh)
! (define-key ctl-x-map " " 'gud-break)	;; backward compatibility hack
  
  ;; ======================================================================
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/hexl.el emacs-19.25/lisp/hexl.el
*** emacs-19.24/lisp/hexl.el	Sat May  7 17:54:26 1994
--- emacs-19.25/lisp/hexl.el	Sat May 28 00:11:09 1994
***************
*** 615,619 ****
  
      (if (not (eq (key-binding (char-to-string help-char)) 'help-command))
! 	(define-key hexl-mode-map help-char 'undefined))
  
      (define-key hexl-mode-map "\C-i" 'hexl-self-insert-command)
--- 615,619 ----
  
      (if (not (eq (key-binding (char-to-string help-char)) 'help-command))
! 	(define-key hexl-mode-map (char-to-string help-char) 'undefined))
  
      (define-key hexl-mode-map "\C-i" 'hexl-self-insert-command)
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/info.el emacs-19.25/lisp/info.el
*** emacs-19.24/lisp/info.el	Thu May 19 18:41:29 1994
--- emacs-19.25/lisp/info.el	Mon May 30 07:46:45 1994
***************
*** 70,74 ****
  nil means not yet initialized.  In this case, Info uses the environment
  variable INFOPATH to initialize it, or `Info-default-directory-list'
! if there is no INFOPATH variable in the environment.")
  
  (defvar Info-current-file nil
--- 70,78 ----
  nil means not yet initialized.  In this case, Info uses the environment
  variable INFOPATH to initialize it, or `Info-default-directory-list'
! if there is no INFOPATH variable in the environment.
! The last element of `Info-default-directory-list' is the directory
! where Emacs installs the Info files that come with it.
! If Emacs finds it has been installed elsewhere, or not yet installed,
! it replaces that element with the directory that its Info files are in.")
  
  (defvar Info-current-file nil
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/ispell.el emacs-19.25/lisp/ispell.el
*** emacs-19.24/lisp/ispell.el	Sun May 22 18:00:13 1994
--- emacs-19.25/lisp/ispell.el	Sat May 28 03:22:11 1994
***************
*** 1005,1009 ****
  		    nil)
  		   ((= char ?q)
! 		    (if (y-or-n-p "Really quit ignoring changes? ")
  			(progn
  			  (ispell-kill-ispell t) ; terminate process.
--- 1005,1009 ----
  		    nil)
  		   ((= char ?q)
! 		    (if (y-or-n-p "Really kill Ispell process? ")
  			(progn
  			  (ispell-kill-ispell t) ; terminate process.
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/lmenu.el emacs-19.25/lisp/lmenu.el
*** emacs-19.24/lisp/lmenu.el	Mon May 23 03:41:05 1994
--- emacs-19.25/lisp/lmenu.el	Sat May 28 16:28:34 1994
***************
*** 63,67 ****
        (let* ((item (car menu-items))
  	     (callback (if (vectorp item) (aref item 1)))
! 	     command enabler name)
  	(cond ((stringp item)
  	       (setq command nil)
--- 63,67 ----
        (let* ((item (car menu-items))
  	     (callback (if (vectorp item) (aref item 1)))
! 	     command name)
  	(cond ((stringp item)
  	       (setq command nil)
***************
*** 73,81 ****
  	       (setq command (make-symbol (format "menu-function-%d"
  						  add-menu-item-count)))
- 	       (setq enabler (make-symbol (format "menu-function-%d-enabler"
- 						  add-menu-item-count)))
  	       (setq add-menu-item-count (1+ add-menu-item-count))
! 	       (put command 'menu-enable enabler)
! 	       (set enabler (aref item 2))
  	       (setq name (aref item 0))	       
  	       (if (symbolp callback)
--- 73,78 ----
  	       (setq command (make-symbol (format "menu-function-%d"
  						  add-menu-item-count)))
  	       (setq add-menu-item-count (1+ add-menu-item-count))
! 	       (put command 'menu-enable (aref item 2))
  	       (setq name (aref item 0))	       
  	       (if (symbolp callback)
***************
*** 309,314 ****
  		    (setq rest2 (cdr rest2)))
  		  (setcdr rest2
! 		  (nconc (list (setq menu (list (car rest))))
! 			 (cdr rest2)))))
  	    (setq so-far menu)
  	    (setq rest (cdr rest)))))
--- 306,311 ----
  		    (setq rest2 (cdr rest2)))
  		  (setcdr rest2
! 			  (nconc (list (setq menu (list (car rest))))
! 				 (cdr rest2)))))
  	    (setq so-far menu)
  	    (setq rest (cdr rest)))))
***************
*** 422,426 ****
     - a string, the name of the menu item;
     - a symbol naming a command, or a form to evaluate;
!    - and t or nil, whether this item is selectable.
  BEFORE, if provided, is the name of a menu before which this menu should
   be added, if this menu is not on its parent already.  If the menu is already
--- 419,423 ----
     - a string, the name of the menu item;
     - a symbol naming a command, or a form to evaluate;
!    - and a form whose value determines whether this item is selectable.
  BEFORE, if provided, is the name of a menu before which this menu should
   be added, if this menu is not on its parent already.  If the menu is already
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/loaddefs.el emacs-19.25/lisp/loaddefs.el
*** emacs-19.24/lisp/loaddefs.el	Sat May 14 04:54:04 1994
--- emacs-19.25/lisp/loaddefs.el	Sat May 28 00:48:51 1994
***************
*** 326,329 ****
--- 326,344 ----
  ;; (define-key global-map [kp-equal]	'function-key-error)
  
+ ;; X11R6 distinguishes these keys from the non-kp keys.
+ ;; Make them behave like the non-kp keys unless otherwise bound.
+ (define-key function-key-map [kp-home] [home])
+ (define-key function-key-map [kp-left] [left])
+ (define-key function-key-map [kp-up] [up])
+ (define-key function-key-map [kp-right] [right])
+ (define-key function-key-map [kp-down] [down])
+ (define-key function-key-map [kp-prior] [prior])
+ (define-key function-key-map [kp-next] [next])
+ (define-key function-key-map [M-kp-next] [M-next])
+ (define-key function-key-map [kp-end] [end])
+ (define-key function-key-map [kp-begin] [begin])
+ (define-key function-key-map [kp-insert] [insert])
+ (define-key function-key-map [kp-delete] [delete])
+ 
  (define-key global-map [mouse-movement] 'ignore)
  
***************
*** 2078,2082 ****
  ;;;***
  
! ;;;### (autoloads (define-derived-mode) "derived" "derived.el" (11644 51928))
  ;;; Generated autoloads from derived.el
  
--- 2093,2097 ----
  ;;;***
  
! ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode) "derived" "derived.el" (11750 52493))
  ;;; Generated autoloads from derived.el
  
***************
*** 2112,2115 ****
--- 2127,2135 ----
  been generated automatically, with a reference to the keymap." nil (quote macro))
  
+ (autoload (quote derived-mode-init-mode-variables) "derived" "\
+ Initialise variables for a new mode. 
+ Right now, if they don't already exist, set up a blank keymap, an
+ empty syntax table, and an empty abbrev table -- these will be merged
+ the first time the mode is used." nil nil)
  
  ;;;***
***************
*** 2425,2428 ****
--- 2445,2460 ----
  ;;;***
  
+ ;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (11749 38205))
+ ;;; Generated autoloads from dired-x.el
+ 
+ (autoload (quote dired-jump) "dired-x" "\
+ Jump to dired buffer corresponding to current buffer.
+ If in a file, dired the current directory and move to file's line.
+ If in dired already, pop up a level and goto old directory's line.
+ In case the proper dired file line cannot be found, refresh the dired
+ buffer and try again." t nil)
+ 
+ ;;;***
+ 
  ;;;### (autoloads (disassemble) "disass" "disass.el" (11426 2298))
  ;;; Generated autoloads from disass.el
***************
*** 2606,2610 ****
  ;;;***
  
! ;;;### (autoloads (ediff-files-remote rcs-ediff vc-ediff ediff-buffers ediff-files ediff-patch-file) "ediff" "ediff.el" (11732 37272))
  ;;; Generated autoloads from ediff.el
  
--- 2638,2642 ----
  ;;;***
  
! ;;;### (autoloads (ediff-files-remote rcs-ediff vc-ediff ediff-patch-buffer ediff-buffers ediff-files ediff-patch-file) "ediff" "ediff.el" (11750 42354))
  ;;; Generated autoloads from ediff.el
  
***************
*** 2623,2626 ****
--- 2655,2661 ----
  (autoload (quote ediff-buffers) "ediff" "\
  Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B." t nil)
+ 
+ (autoload (quote ediff-patch-buffer) "ediff" "\
+ Run Ediff by patching BUFFER-NAME." t nil)
  
  (autoload (quote vc-ediff) "ediff" "\
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/mailalias.el emacs-19.25/lisp/mailalias.el
*** emacs-19.24/lisp/mailalias.el	Tue Jun 15 16:50:50 1993
--- emacs-19.25/lisp/mailalias.el	Sat May 28 09:06:16 1994
***************
*** 106,110 ****
  (defun build-mail-aliases (&optional file)
    "Read mail aliases from `~/.mailrc' and set `mail-aliases'."
!   (setq file (expand-file-name (or file "~/.mailrc")))
    (let ((buffer nil)
  	(obuf (current-buffer)))
--- 106,110 ----
  (defun build-mail-aliases (&optional file)
    "Read mail aliases from `~/.mailrc' and set `mail-aliases'."
!   (setq file (expand-file-name (or file (or (getenv "MAILRC") "~/.mailrc"))))
    (let ((buffer nil)
  	(obuf (current-buffer)))
***************
*** 114,133 ****
  	  (buffer-disable-undo buffer)
  	  (set-buffer buffer)
! 	  (cond ((get-file-buffer file)
! 		 (insert (save-excursion
! 			   (set-buffer (get-file-buffer file))
! 			   (buffer-substring (point-min) (point-max)))))
! 		((not (file-exists-p file)))
! 		(t (insert-file-contents file)))
! 	  ;; Don't lose if no final newline.
! 	  (goto-char (point-max))
! 	  (or (eq (preceding-char) ?\n) (newline))
! 	  (goto-char (point-min))
! 	  ;; handle "\\\n" continuation lines
! 	  (while (not (eobp))
! 	    (end-of-line)
! 	    (if (= (preceding-char) ?\\)
! 		(progn (delete-char -1) (delete-char 1) (insert ?\ ))
  	        (forward-char 1)))
  	  (goto-char (point-min))
  	  (while (or (re-search-forward "^a\\(lias\\|\\)[ \t]+" nil t)
--- 114,146 ----
  	  (buffer-disable-undo buffer)
  	  (set-buffer buffer)
! 	  (while file
! 	    (cond ((get-file-buffer file)
! 		   (insert (save-excursion
! 			     (set-buffer (get-file-buffer file))
! 			     (buffer-substring (point-min) (point-max)))))
! 		  ((file-exists-p file) (insert-file-contents file))
! 		  ((file-exists-p (setq file (concat "~/" file)))
! 		   (insert-file-contents file))
! 		  (t (setq file nil)))
! 	    ;; Don't lose if no final newline.
! 	    (goto-char (point-max))
! 	    (or (eq (preceding-char) ?\n) (newline))
! 	    (goto-char (point-min))
! 	    ;; handle "\\\n" continuation lines
! 	    (while (not (eobp))
! 	      (end-of-line)
! 	      (if (= (preceding-char) ?\\)
! 		  (progn (delete-char -1) (delete-char 1) (insert ?\ ))
  	        (forward-char 1)))
+ 	    (goto-char (point-min))
+ 	    ;; handle `source' directives -- Eddy/1994/May/25
+ 	    (cond ((re-search-forward "^source[ \t]+" nil t)
+ 		   (re-search-forward "\\S-+")
+ 		   (setq file
+ 			 (buffer-substring (match-beginning 0) (match-end 0)))
+ 		   (beginning-of-line)
+ 		   (insert "# ") ; to ensure we don't re-process this file
+ 		   (beginning-of-line))
+ 		  (t (setq file nil))))
  	  (goto-char (point-min))
  	  (while (or (re-search-forward "^a\\(lias\\|\\)[ \t]+" nil t)
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/menu-bar.el emacs-19.25/lisp/menu-bar.el
*** emacs-19.24/lisp/menu-bar.el	Thu May 19 18:03:01 1994
--- emacs-19.25/lisp/menu-bar.el	Mon May 30 05:16:03 1994
***************
*** 417,421 ****
     (let ((frames (frame-list)))
       (while frames
!        (let ((height (cdr (assq 'height (frame-parameters (selected-frame))))))
  	 (modify-frame-parameters (car frames)
  				  (list (cons 'menu-bar-lines
--- 417,421 ----
     (let ((frames (frame-list)))
       (while frames
!        (let ((height (cdr (assq 'height (frame-parameters (car frames))))))
  	 (modify-frame-parameters (car frames)
  				  (list (cons 'menu-bar-lines
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/paths.el emacs-19.25/lisp/paths.el
*** emacs-19.24/lisp/paths.el	Sun May 22 16:36:22 1994
--- emacs-19.25/lisp/paths.el	Mon May 30 07:42:04 1994
***************
*** 33,45 ****
  
  (defvar Info-default-directory-list
!   (let ((start (list "/usr/local/info/"
! 		     "/usr/local/lib/info/"))
  	(configdir (file-name-as-directory configure-info-directory)))
!     (or (member configdir start)
! 	(setq start (nconc start (list configdir))))
!     (or (member (expand-file-name "../info/" data-directory) start)
! 	(setq start
! 	      (nconc start
! 		     (list (expand-file-name "../info/" data-directory)))))
      start)
    "List of directories to search for Info documentation files.
--- 33,46 ----
  
  (defvar Info-default-directory-list
!   (let ((start (list "/usr/local/lib/info/"
! 		     ;; This comes second so that, if it is the same
! 		     ;; as configure-info-directory (which is usually true)
! 		     ;; and Emacs has been installed (also usually true)
! 		     ;; then the list will end with two copies of this;
! 		     ;; which means that the last dir file Info-insert-dir
! 		     ;; finds will be the one in this directory.
! 		     "/usr/local/info/"))
  	(configdir (file-name-as-directory configure-info-directory)))
!     (setq start (nconc start (list configdir)))
      start)
    "List of directories to search for Info documentation files.
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/rmail.el emacs-19.25/lisp/rmail.el
*** emacs-19.24/lisp/rmail.el	Thu May 19 16:47:41 1994
--- emacs-19.25/lisp/rmail.el	Thu May 26 19:05:57 1994
***************
*** 1390,1393 ****
--- 1390,1394 ----
  	(rmail-display-labels)
  	(rmail-highlight-headers)
+ 	(if transient-mark-mode (deactivate-mark))
  	(run-hooks 'rmail-show-message-hook)
  	;; If there is a summary buffer, try to move to this message
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/server.el emacs-19.25/lisp/server.el
*** emacs-19.24/lisp/server.el	Fri May 20 19:47:00 1994
--- emacs-19.25/lisp/server.el	Sat May 28 13:20:08 1994
***************
*** 93,97 ****
  (defvar server-clients nil
    "List of current server clients.
! Each element is (CLIENTID FILES...) where CLIENTID is a string
  that can be given to the server process to identify a client.
  When a buffer is marked as \"done\", it is removed from this list.")
--- 93,97 ----
  (defvar server-clients nil
    "List of current server clients.
! Each element is (CLIENTID BUFFERS...) where CLIENTID is a string
  that can be given to the server process to identify a client.
  When a buffer is marked as \"done\", it is removed from this list.")
***************
*** 198,202 ****
    "Finds FILES and returns the list CLIENT with the buffers nconc'd.
  FILES is an alist whose elements are (FILENAME LINENUMBER)."
!   (let (client-record (obuf (current-buffer)))
      ;; Restore the current buffer afterward, but not using save-excursion,
      ;; because we don't want to save point in this buffer
--- 198,203 ----
    "Finds FILES and returns the list CLIENT with the buffers nconc'd.
  FILES is an alist whose elements are (FILENAME LINENUMBER)."
!   ;; Bind last-nonmenu-event to force use of keyboard, not mouse, for queries.
!   (let (client-record (last-nonmenu-event t) (obuf (current-buffer)))
      ;; Restore the current buffer afterward, but not using save-excursion,
      ;; because we don't want to save point in this buffer
***************
*** 300,305 ****
  
  (defun server-kill-emacs-query-function ()
!   (or (not server-clients)
!       (yes-or-no-p "Server buffers still have clients; exit anyway? ")))
  
  (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function)
--- 301,313 ----
  
  (defun server-kill-emacs-query-function ()
!   (let (live-client
! 	(tail server-clients))
!     ;; See if any clients have any buffers that are still alive.
!     (while tail
!       (if (memq t (mapcar 'stringp (mapcar 'buffer-name (cdr (car tail)))))
! 	  (setq live-client t))
!       (setq tail (cdr tail)))
!     (or (not live-client)
! 	(yes-or-no-p "Server buffers still have clients; exit anyway? "))))
  
  (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function)
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/simple.el emacs-19.25/lisp/simple.el
*** emacs-19.24/lisp/simple.el	Fri May 20 18:23:06 1994
--- emacs-19.25/lisp/simple.el	Mon May 30 04:33:39 1994
***************
*** 1306,1311 ****
  \(That makes a difference only in Transient Mark mode.)
  Also runs the hook `deactivate-mark-hook'."
!   (setq mark-active nil)
!   (run-hooks 'deactivate-mark-hook))
  
  (defun set-mark (pos)
--- 1306,1313 ----
  \(That makes a difference only in Transient Mark mode.)
  Also runs the hook `deactivate-mark-hook'."
!   (if transient-mark-mode
!       (progn
! 	(setq mark-active nil)
! 	(run-hooks 'deactivate-mark-hook))))
  
  (defun set-mark (pos)
***************
*** 2424,2427 ****
--- 2426,2430 ----
      (let ((map (make-sparse-keymap)))
        (define-key map [mouse-2] 'mouse-choose-completion)
+       (define-key map [down-mouse-2] nil)
        (define-key map "\C-m" 'choose-completion)
        (define-key map [return] 'choose-completion)
***************
*** 2483,2486 ****
--- 2486,2491 ----
        (choose-completion-delete-max-match choice)
        (insert choice)
+       (remove-text-properties (- (point) (length choice)) (point)
+ 			      '(mouse-face nil))
        ;; Update point in the window that BUFFER is showing in.
        (let ((window (get-buffer-window buffer t)))
***************
*** 2519,2523 ****
        (forward-line 1)
        (if window-system
! 	  (while (re-search-forward "[^ \t\n]+\\( [^\t\n]+\\)*" nil t)
  	    (put-text-property (match-beginning 0) (point)
  			       'mouse-face 'highlight))))))
--- 2524,2528 ----
        (forward-line 1)
        (if window-system
! 	  (while (re-search-forward "[^ \t\n]+\\( [^ \t\n]+\\)*" nil t)
  	    (put-text-property (match-beginning 0) (point)
  			       'mouse-face 'highlight))))))
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/subr.el emacs-19.25/lisp/subr.el
*** emacs-19.24/lisp/subr.el	Sun May 22 23:15:15 1994
--- emacs-19.25/lisp/subr.el	Thu May 26 17:51:25 1994
***************
*** 422,426 ****
  
  (defun posn-col-row (position)
!   "Return the row and column in POSITION, measured in characters.
  POSITION should be a list of the form
     (WINDOW BUFFER-POSITION (X . Y) TIMESTAMP)
--- 422,426 ----
  
  (defun posn-col-row (position)
!   "Return the column and row in POSITION, measured in characters.
  POSITION should be a list of the form
     (WINDOW BUFFER-POSITION (X . Y) TIMESTAMP)
***************
*** 430,439 ****
    (let ((pair   (nth 2 position))
  	(window (posn-window position)))
!     (if (eq (if (symbolp (nth 1 position)) (nth 1 position)
! 	      (car (nth 1 position)))
  	    'vertical-scroll-bar)
  	(cons 0 (scroll-bar-scale pair (1- (window-height window))))
!       (if (eq (if (symbolp (nth 1 position)) (nth 1 position)
! 		(car (nth 1 position)))
  	      'horizontal-scroll-bar)
  	  (cons (scroll-bar-scale pair (window-width window)) 0)
--- 430,441 ----
    (let ((pair   (nth 2 position))
  	(window (posn-window position)))
!     (if (eq (if (consp (nth 1 position))
! 		(car (nth 1 position))
! 	      (nth 1 position))
  	    'vertical-scroll-bar)
  	(cons 0 (scroll-bar-scale pair (1- (window-height window))))
!       (if (eq (if (consp (nth 1 position))
! 		  (car (nth 1 position))
! 		(nth 1 position))
  	      'horizontal-scroll-bar)
  	  (cons (scroll-bar-scale pair (window-width window)) 0)
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/tcl-mode.el emacs-19.25/lisp/tcl-mode.el
*** emacs-19.24/lisp/tcl-mode.el	Wed Feb 23 11:27:57 1994
--- emacs-19.25/lisp/tcl-mode.el	Fri May 27 20:53:16 1994
***************
*** 149,152 ****
--- 149,153 ----
  	(tcl-setup-keymap))
      (use-local-map tcl-mode-map)
+     (set-syntax-table (copy-syntax-table))
      (modify-syntax-entry ?# "<")
      (modify-syntax-entry ?\n ">")
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/version.el emacs-19.25/lisp/version.el
*** emacs-19.24/lisp/version.el	Mon May 23 05:49:38 1994
--- emacs-19.25/lisp/version.el	Sat May 28 18:01:45 1994
***************
*** 24,28 ****
  ;;; Code:
  
! (defconst emacs-version "19.24" "\
  Version numbers of this version of Emacs.")
  
--- 24,28 ----
  ;;; Code:
  
! (defconst emacs-version "19.25" "\
  Version numbers of this version of Emacs.")
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lisp/ws-mode.el emacs-19.25/lisp/ws-mode.el
*** emacs-19.24/lisp/ws-mode.el	Sun May 22 18:01:07 1994
--- emacs-19.25/lisp/ws-mode.el	Thu May 26 13:37:28 1994
***************
*** 647,651 ****
    (let ((direction
  	 (read-char)))
!     (cond ((equal (upcase direction) \070)
  	   (setq ws-search-string string)
  	   (setq ws-search-direction t)
--- 647,651 ----
    (let ((direction
  	 (read-char)))
!     (cond ((equal (upcase direction) ?F)
  	   (setq ws-search-string string)
  	   (setq ws-search-direction t)
***************
*** 652,656 ****
  	   (setq ws-last-cursorposition (point-marker))
  	   (search-forward string))
! 	  ((equal (upcase direction) \066)
  	   (setq ws-search-string string)
  	   (setq ws-search-direction nil)
--- 652,656 ----
  	   (setq ws-last-cursorposition (point-marker))
  	   (search-forward string))
! 	  ((equal (upcase direction) ?B)
  	   (setq ws-search-string string)
  	   (setq ws-search-direction nil)
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lwlib/ChangeLog emacs-19.25/lwlib/ChangeLog
*** emacs-19.24/lwlib/ChangeLog	Mon May 23 03:32:09 1994
--- emacs-19.25/lwlib/ChangeLog	Mon May 30 07:30:10 1994
***************
*** 1,2 ****
--- 1,11 ----
+ Mon May 30 04:33:36 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Version 19.25 released.
+ 
+ Wed May 25 04:19:01 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* lwlib.c (max): Function deleted.  Define as macro instead,
+ 	but only if not already defined.
+ 
  Mon May 23 03:32:01 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/lwlib/lwlib.c emacs-19.25/lwlib/lwlib.c
*** emacs-19.24/lwlib/lwlib.c	Mon May 16 17:29:03 1994
--- emacs-19.25/lwlib/lwlib.c	Wed May 25 04:19:04 1994
***************
*** 54,57 ****
--- 54,61 ----
  #endif
  
+ #ifndef max
+ #define max(x, y) ((x) > (y) ? (x) : (y))
+ #endif
+ 
  /* List of all widgets managed by the library. */
  static widget_info*
***************
*** 396,407 ****
    if (!!s1 ^ !!s2) return True;
    return (s1 && s2) ? strcmp (s1, s2) : s1 ? False : !!s2;
- }
- 
- static int
- max (i1, i2)
-      int i1;
-      int i2;
- {
-   return i1 > i2 ? i1 : i2;
  }
  
--- 400,403 ----
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/make-dist emacs-19.25/make-dist
*** emacs-19.24/make-dist	Wed May  4 15:50:59 1994
--- emacs-19.25/make-dist	Mon May 30 07:54:42 1994
***************
*** 64,68 ****
  ### Find out which version of Emacs this is.
  shortversion=`grep 'defconst[	 ]*emacs-version' lisp/version.el \
! 	 | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\)\..*$/\1/'`
  version=`grep 'defconst[	 ]*emacs-version' lisp/version.el \
  	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
--- 64,68 ----
  ### Find out which version of Emacs this is.
  shortversion=`grep 'defconst[	 ]*emacs-version' lisp/version.el \
! 	 | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
  version=`grep 'defconst[	 ]*emacs-version' lisp/version.el \
  	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
***************
*** 71,74 ****
--- 71,76 ----
    exit 1
  fi
+ 
+ echo $version and $shortversion
  
  if grep -s "GNU Emacs version ${shortversion}" ./man/emacs.texi > /dev/null; then
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/man/ChangeLog emacs-19.25/man/ChangeLog
*** emacs-19.24/man/ChangeLog	Mon May 23 03:37:06 1994
--- emacs-19.25/man/ChangeLog	Mon May 30 07:31:07 1994
***************
*** 1,2 ****
--- 1,6 ----
+ Mon May 30 04:33:36 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Version 19.25 released.
+ 
  Mon May 23 03:32:01 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/man/cmdargs.texi emacs-19.25/man/cmdargs.texi
*** emacs-19.24/man/cmdargs.texi	Sat May 21 20:25:24 1994
--- emacs-19.25/man/cmdargs.texi	Wed May 25 16:58:48 1994
***************
*** 321,328 ****
  
  Some of the variables that Emacs uses make little or no sense in an
! single-user setting as provided by MsDos machines.  Nevertheless parts
! of Emacs need those variables so many of them have defaults for MsDos.
  
! The standard command interpreter (``shell'') for MsDos disregards case
  of environment variables and only lets you set and delete variables with
  upper case names.  For this reason it is possible that some existing
--- 321,328 ----
  
  Some of the variables that Emacs uses make little or no sense in an
! single-user setting as provided by MS-DOS machines.  Nevertheless parts
! of Emacs need those variables so many of them have defaults for MS-DOS.
  
! The standard command interpreter (``shell'') for MS-DOS disregards case
  of environment variables and only lets you set and delete variables with
  upper case names.  For this reason it is possible that some existing
***************
*** 332,336 ****
  this rule is the use of variables @code{_argc}, @code{_argv0},
  @code{_argv1}, @dots{} to work around the 127 character limit on the
! command line imposed by MsDos.  Emacs, when built with the Gnu C
  compiler, understands this method and uses it when running other GCC
  compiled programs.
--- 332,336 ----
  this rule is the use of variables @code{_argc}, @code{_argv0},
  @code{_argv1}, @dots{} to work around the 127 character limit on the
! command line imposed by MS-DOS.  Emacs, when built with the Gnu C
  compiler, understands this method and uses it when running other GCC
  compiled programs.
***************
*** 339,343 ****
  @table @code
  @item COMSPEC
! The name of the MsDos command interpreter in use.  This is used to make
  a default value for the @code{SHELL} environment variable.
  @item EMACSPATH
--- 339,343 ----
  @table @code
  @item COMSPEC
! The name of the MS-DOS command interpreter in use.  This is used to make
  a default value for the @code{SHELL} environment variable.
  @item EMACSPATH
***************
*** 361,369 ****
  needed.
  @item TZ
! This variable defaults to an estimate derived from the MsDos country
  code.  See the file @file{msdos.c} for details.
  @item USER
! The variable defaults to @file{root} because all MsDos users have root
! priviledges on their system.
  @end table
  
--- 361,369 ----
  needed.
  @item TZ
! This variable defaults to an estimate derived from the MS-DOS country
  code.  See the file @file{msdos.c} for details.
  @item USER
! The variable defaults to @file{root} because all MS-DOS users have root
! privileges on their system.
  @end table
  
***************
*** 734,738 ****
  
    If you specify the option @samp{-name @var{name}}, Emacs uses
! @var{name} instead of @samp{Emacs} to look up all of its option values
  in the X resource file.  This option also specifies the title for the
  initial frame.  The option @samp{-rn @var{name}} specifies just the name
--- 734,738 ----
  
    If you specify the option @samp{-name @var{name}}, Emacs uses
! @var{name} instead of @samp{emacs} to look up all of its option values
  in the X resource file.  This option also specifies the title for the
  initial frame.  The option @samp{-rn @var{name}} specifies just the name
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/man/custom.texi emacs-19.25/man/custom.texi
*** emacs-19.24/man/custom.texi	Sun May 15 01:07:13 1994
--- emacs-19.25/man/custom.texi	Sat May 28 17:31:09 1994
***************
*** 549,552 ****
--- 549,554 ----
  @item M-x insert-kbd-macro
  Insert in the buffer a keyboard macro's definition, as Lisp code.
+ @item C-x C-k
+ Edit a previously defined keyboard macro (@code{edit-kbd-macro}).
  @end table
  
***************
*** 630,633 ****
--- 632,645 ----
  invoked the keyboard macro, it also necessarily exits the keyboard macro
  as part of the process.
+ 
+ @findex edit-kbd-macro
+ @kindex C-x C-k
+   You can edit a keyboard macro already defined by typing @kbd{C-x C-k}
+ (@code{edit-kbd-macro}).  Follow that with the keyboard input that you
+ would use to invoke the macro---@kbd{C-x e} or @kbd{M-x @var{name}} or
+ some other key sequence.  This formats the macro definition in a buffer
+ and enters a specialized major mode for editing it.  Type @kbd{C-h m}
+ once in that buffer to display details of how to edit the macro.  When
+ you are finished editing, type @kbd{C-c C-c}.
  
  @node Save Kbd Macro
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/man/dired.texi emacs-19.25/man/dired.texi
*** emacs-19.24/man/dired.texi	Fri Feb  4 14:42:44 1994
--- emacs-19.25/man/dired.texi	Wed May 25 01:07:59 1994
***************
*** 518,525 ****
  
    The commands match each ``old'' file name against the regular
! expression @var{from}, and then replace the matching part with
! @var{to}.  You can use @samp{\&} and @samp{\@var{digit}} in @var{to} to
! refer to all or part of the old file name, as in @code{query-replace}
! (@pxref{Query Replace}).
  
    For example, @kbd{% R ^.*$ @key{RET} x-\& @key{RET}} renames each
--- 518,525 ----
  
    The commands match each ``old'' file name against the regular
! expression @var{from}, and then replace the matching part with @var{to}.
! You can use @samp{\&} and @samp{\@var{digit}} in @var{to} to refer to
! all or part of what the pattern matched in the old file name, as in
! @code{query-replace} (@pxref{Query Replace}).
  
    For example, @kbd{% R ^.*$ @key{RET} x-\& @key{RET}} renames each
***************
*** 526,531 ****
  selected file by prepending @samp{x-} to its name.  The inverse of this,
  removing @samp{x-} from the front of each file name, is also possible:
! one method is @kbd{% R ^x-.*$ @key{RET} \& @key{RET}}; another is @kbd{%
! R ^x- @key{RET} @key{RET}}.  (Use @samp{^} and @samp{$} to anchor
  matches that should span the whole filename.)
  
--- 526,531 ----
  selected file by prepending @samp{x-} to its name.  The inverse of this,
  removing @samp{x-} from the front of each file name, is also possible:
! one method is @kbd{% R ^x-\(.*\)$ @key{RET} \1 @key{RET}}; another is
! @kbd{% R ^x- @key{RET} @key{RET}}.  (Use @samp{^} and @samp{$} to anchor
  matches that should span the whole filename.)
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/man/emacs.texi emacs-19.25/man/emacs.texi
*** emacs-19.24/man/emacs.texi	Fri May 20 05:57:51 1994
--- emacs-19.25/man/emacs.texi	Sat May 28 18:02:57 1994
***************
*** 4,8 ****
  @c The edition number appears in several places in this file
  This corresponds to the ninth edition of the @cite{GNU Emacs Manual},
! for Emacs Version 19; but it has been updated for Emacs 19.24.
  @c Please REMEMBER to update edition number in *three* places in this file.
  
--- 4,8 ----
  @c The edition number appears in several places in this file
  This corresponds to the ninth edition of the @cite{GNU Emacs Manual},
! for Emacs Version 19; but it has been updated for Emacs 19.25.
  @c Please REMEMBER to update edition number in *three* places in this file.
  
***************
*** 64,68 ****
  @center @titlefont{GNU Emacs Manual}
  @sp 4
! @center Ninth Edition, Updated for Emacs version 19.24
  @sp 1
  @center for Unix Users
--- 64,68 ----
  @center @titlefont{GNU Emacs Manual}
  @sp 4
! @center Ninth Edition, Updated for Emacs version 19.25
  @sp 1
  @center for Unix Users
***************
*** 74,78 ****
  @sp 2
  Ninth Edition @*
! Updated for Emacs Version 19.24, @*
  May 1994
  
--- 74,78 ----
  @sp 2
  Ninth Edition @*
! Updated for Emacs Version 19.25, @*
  May 1994
  
***************
*** 113,117 ****
  display editor.  This Info file describes how to edit with Emacs
  and some of how to customize it, but not how to extend it.  It
! corresponds to GNU Emacs version 19.24.
  
  @end ifinfo
--- 113,117 ----
  display editor.  This Info file describes how to edit with Emacs
  and some of how to customize it, but not how to extend it.  It
! corresponds to GNU Emacs version 19.25.
  
  @end ifinfo
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/msdos/ChangeLog emacs-19.25/msdos/ChangeLog
*** emacs-19.24/msdos/ChangeLog	Sun May 22 12:25:25 1994
--- emacs-19.25/msdos/ChangeLog	Mon May 30 07:32:14 1994
***************
*** 1,2 ****
--- 1,6 ----
+ Mon May 30 04:33:36 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Version 19.25 released.
+ 
  Sun May 22 17:12:14 1994  Morten Welinder  (terra@diku.dk)
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/oldXMenu/ChangeLog emacs-19.25/oldXMenu/ChangeLog
*** emacs-19.24/oldXMenu/ChangeLog	Mon May 23 03:32:38 1994
--- emacs-19.25/oldXMenu/ChangeLog	Mon May 30 07:31:28 1994
***************
*** 1,2 ****
--- 1,6 ----
+ Mon May 30 04:33:36 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Version 19.25 released.
+ 
  Mon May 23 03:32:01 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/ChangeLog emacs-19.25/src/ChangeLog
*** emacs-19.24/src/ChangeLog	Mon May 23 16:09:31 1994
--- emacs-19.25/src/ChangeLog	Mon May 30 08:35:24 1994
***************
*** 1,2 ****
--- 1,129 ----
+ Mon May 30 06:16:48 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* Version 19.25 released.
+ 
+ 	* xdisp.c (redisplay): Limit prev change to pause != 0.
+ 
+ 	* keyboard.c (command_loop_1): Allow direct output for insert
+ 	if have display table but it says nothing for this char code.
+ 	Don't allow it if char code has a glyph with a face code.
+ 
+ 	* process.c (create_process): Get a pty for any non-nil
+ 	Vprocess_connection_type value.
+ 
+ Sat May 28 00:33:16 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* s/bsd386.h (TABDLY, TAB3): Defined.
+ 	(SYSV_SYSTEM_DIR): Defined.
+ 
+ 	* unexhp9k800.c (roundup): Undef before defining.
+ 
+ 	* xdisp.c (redisplay): If have window change at end, redisplay again.
+ 
+ 	* lread.c (defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro): 
+ 	Delete third arg DOC.
+ 
+ 	* s/hpux8.h (LD_SWITCH_SYSTEM): Delete the -L options.
+ 	(LD_SWITCH_X_DEFAULT): Put them here instead.
+ 
+ 	* Makefile.in.in (LD_SWITCH_X_DEFAULT): Define if not defined.
+ 	(LIBX): Use LD_SWITCH_X_DEFAULT.
+ 
+ 	* xterm.c (x_iconify_frame): Call x_set_offset,
+ 	if x_make_frame_visible would do so.
+ 	(x_make_frame_visible): Don't call x_set_offset if frame is iconic.
+ 	(XTread_socket): For ConfigureNotify, if wm decorations exist,
+ 	set NorthWestGravity.
+ 
+ 	* Makefile.in.in (mostlyclean): Don't mention xmakefile*.
+ 
+ 	* emacs.c (main): In batch mode, don't set the pgrp.
+ 
+ Fri May 27 06:32:24 1994  Paul Eggert  (eggert@twinsun.com)
+ 
+ 	* callproc.c (child_setup): If PWD is set, set it in the child so that
+ 	it points at the child's working directory.
+ 
+ Fri May 27 03:59:59 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* m/mips4.h (C_DEBUG_SWITCH) [not __GNUC__]: Add -Wf option.
+ 
+ 	* s/hpux9.h (C_SWITCH_SYSTEM): Defined.
+ 
+ 	* keyboard.c [HAVE_X_WINDOWS]: Include xterm.h.
+ 
+ 	* xterm.c (x_is_vendor_fkey): Function deleted.
+ 	(XTread_socket, case KeyPressed): Don't clear the vendor-specific bit.
+ 	Pass thru almost any vendor-specific keysym.
+ 
+ 	* s/linux.h (HAVE_XRMSETDATABASE): Define if not defined.
+ 
+ Fri May 27 06:52:13 1994  Paul Eggert  (eggert@twinsun.com)
+ 
+ 	* editfns.c (difftm): Don't store a long value into an int variable.
+ 
+ Thu May 26 18:29:17 1994  Karl Heuer  (kwzh@hal.gnu.ai.mit.edu)
+ 
+ 	* fileio.c (Finsert_file_contents): Check for beginning of file.
+ 
+ Thu May 26 18:13:31 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* systime.h: Make previous change limited to HPUX.
+ 
+ Thu May 26 14:46:35 1994  Karl Heuer  (kwzh@hal.gnu.ai.mit.edu)
+ 
+ 	* systime.h: If _STRUCT_TIMEVAL is defined, also define __TIMEVAL__.
+ 
+ Wed May 25 20:20:53 1994  Morten Welinder  (terra@diku.dk)
+ 
+ 	* msdos.c (output_string): New function.
+ 	(internal_flush): Use output_string for faster screen update.
+ 	(internal_flush): Clear to end of line by writing a string of
+ 	spaces.
+ 
+ Wed May 25 00:36:35 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* xfns.c (Vx_sensitive_text_pointer_shape):
+ 	Renamed from Vx_cross_pointer_shape.
+ 	(syms_of_xfns): Provide Lisp var x-sensitive-text-pointer-shape.
+ 
+ 	* xmenu.c (menu_item_equiv_key): Look for equiv keys both before
+ 	and after one stage of symbol function indirection.
+ 
+ 	* xterm.c (note_mouse_movement): Use frame's window in XQueryPointer.
+ 	Special case if mouse isn't on that window.
+ 	(note_mouse_highlight): Handle negative args and too-large args.
+ 
+ 	* lread.c (openp): Don't use O_RDONLY.
+ 
+ Tue May 24 22:20:01 1994  Karl Heuer  (kwzh@hal.gnu.ai.mit.edu)
+ 
+ 	* search.c (Freplace_match): Improve capitalization heuristics.
+ 
+ 	* minibuf.c (Fminibuffer_complete_word): GCPRO completion and tem.
+ 
+ 	* undo.c (Fprimitive_undo): GCPRO next and list.
+ 	Check argument type before calling XINT.
+ 
+ Tue May 24 17:14:49 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+ 
+ 	* buffer.c (verify_overlay_modification): GCPRO tail and overlay.
+ 	Avoid copying tail twice.
+ 
+ Tue May 24 17:11:38 1994  Andreas Schwab  (schwab@informatik.uni-dortmund.de)
+ 
+ 	* keymap.c (describe_map): Fix the call to Fequal.
+ 
+ Tue May 24 16:50:42 1994  Morten Welinder  (terra@diku.dk)
+ 
+ 	* msdos.c (do_visible_bell): Renamed from visible_bell to avoid
+ 	potential conflict with variable of the same name.  Caller changed.
+ 	(internal_flush): Code for audio bell inserted.
+ 	* s/msdos.h (INTERNAL_TERMINAL): Allow audio bell.
+ 
+ 	* msdos.c (dos_rawgetc): Doc fix.  Make C-, S-, and M- modifiers
+ 	independent.  Make modifiers work with mouse.  Improve C-S-<ascii>
+ 	handling by using look-up tables.  Fix kp-decimal problem.
+ 
  Mon May 23 00:38:44 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/Makefile.in.in emacs-19.25/src/Makefile.in.in
*** emacs-19.24/src/Makefile.in.in	Mon May 23 05:25:14 1994
--- emacs-19.25/src/Makefile.in.in	Sat May 28 06:39:44 1994
***************
*** 164,167 ****
--- 164,171 ----
  #endif
  
+ #ifndef LD_SWITCH_X_DEFAULT
+ #define LD_SWITCH_X_DEFAULT
+ #endif
+ 
  /* These can be passed in from config.h to define special load and
     compile switches needed by individual sites */
***************
*** 322,326 ****
  
  #ifdef HAVE_X11
! LIBX= $(LIBXMENU) LD_SWITCH_X_SITE $(LIBXT) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
  #else /* not HAVE_X11 */
  LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
--- 326,332 ----
  
  #ifdef HAVE_X11
! /* LD_SWITCH_X_DEFAULT comes after everything else that specifies
!    options for where to find X libraries, but before those libraries.  */
! LIBX= $(LIBXMENU) LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT $(LIBXT) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
  #else /* not HAVE_X11 */
  LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
***************
*** 872,876 ****
  	cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool
  mostlyclean:
! 	rm -f temacs prefix-args xmakefile* core \#* *.o libXMenu11.a liblw.a
  	rm -f ../etc/DOC
  clean: mostlyclean
--- 878,882 ----
  	cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool
  mostlyclean:
! 	rm -f temacs prefix-args core \#* *.o libXMenu11.a liblw.a
  	rm -f ../etc/DOC
  clean: mostlyclean
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/buffer.c emacs-19.25/src/buffer.c
*** emacs-19.24/src/buffer.c	Mon May 16 23:23:12 1994
--- emacs-19.25/src/buffer.c	Tue May 24 14:47:27 1994
***************
*** 2135,2139 ****
--- 2135,2146 ----
    Lisp_Object prop, overlay, tail;
    int insertion = EQ (start, end);
+   int tail_copied;
+   struct gcpro gcpro1, gcpro2;
  
+   overlay = Qnil;
+   tail = Qnil;
+   GCPRO2 (overlay, tail);
+ 
+   tail_copied = 0;
    for (tail = current_buffer->overlays_before;
         CONSP (tail);
***************
*** 2157,2161 ****
  	    {
  	      /* Copy TAIL in case the hook recenters the overlay lists.  */
! 	      tail = Fcopy_sequence (tail);
  	      call_overlay_mod_hooks (prop, overlay, start, end);
  	    }
--- 2164,2170 ----
  	    {
  	      /* Copy TAIL in case the hook recenters the overlay lists.  */
! 	      if (!tail_copied)
! 		tail = Fcopy_sequence (tail);
! 	      tail_copied = 1;
  	      call_overlay_mod_hooks (prop, overlay, start, end);
  	    }
***************
*** 2166,2170 ****
  	  if (!NILP (prop))
  	    {
! 	      tail = Fcopy_sequence (tail);
  	      call_overlay_mod_hooks (prop, overlay, start, end);
  	    }
--- 2175,2181 ----
  	  if (!NILP (prop))
  	    {
! 	      if (!tail_copied)
! 		tail = Fcopy_sequence (tail);
! 	      tail_copied = 1;
  	      call_overlay_mod_hooks (prop, overlay, start, end);
  	    }
***************
*** 2177,2181 ****
  	  if (!NILP (prop))
  	    {
! 	      tail = Fcopy_sequence (tail);
  	      call_overlay_mod_hooks (prop, overlay, start, end);
  	    }
--- 2188,2194 ----
  	  if (!NILP (prop))
  	    {
! 	      if (!tail_copied)
! 		tail = Fcopy_sequence (tail);
! 	      tail_copied = 1;
  	      call_overlay_mod_hooks (prop, overlay, start, end);
  	    }
***************
*** 2183,2186 ****
--- 2196,2200 ----
      }
  
+   tail_copied = 0;
    for (tail = current_buffer->overlays_after;
         CONSP (tail);
***************
*** 2203,2207 ****
  	  if (!NILP (prop))
  	    {
! 	      tail = Fcopy_sequence (tail);
  	      call_overlay_mod_hooks (prop, overlay, start, end);
  	    }
--- 2217,2223 ----
  	  if (!NILP (prop))
  	    {
! 	      if (!tail_copied)
! 		tail = Fcopy_sequence (tail);
! 	      tail_copied = 1;
  	      call_overlay_mod_hooks (prop, overlay, start, end);
  	    }
***************
*** 2212,2216 ****
  	  if (!NILP (prop))
  	    {
! 	      tail = Fcopy_sequence (tail);
  	      call_overlay_mod_hooks (prop, overlay, start, end);
  	    }
--- 2228,2234 ----
  	  if (!NILP (prop))
  	    {
! 	      if (!tail_copied)
! 		tail = Fcopy_sequence (tail);
! 	      tail_copied = 1;
  	      call_overlay_mod_hooks (prop, overlay, start, end);
  	    }
***************
*** 2223,2227 ****
  	  if (!NILP (prop))
  	    {
! 	      tail = Fcopy_sequence (tail);
  	      call_overlay_mod_hooks (prop, overlay, start, end);
  	    }
--- 2241,2247 ----
  	  if (!NILP (prop))
  	    {
! 	      if (!tail_copied)
! 		tail = Fcopy_sequence (tail);
! 	      tail_copied = 1;
  	      call_overlay_mod_hooks (prop, overlay, start, end);
  	    }
***************
*** 2228,2231 ****
--- 2248,2253 ----
  	}
      }
+ 
+   UNGCPRO;
  }
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/callproc.c emacs-19.25/src/callproc.c
*** emacs-19.24/src/callproc.c	Fri May 13 03:17:32 1994
--- emacs-19.25/src/callproc.c	Sat May 28 04:29:04 1994
***************
*** 572,575 ****
--- 572,576 ----
  #else /* not MSDOS */
    char **env;
+   char *pwd_var;
  
    int pid = getpid ();
***************
*** 596,604 ****
       and will be cleaned up in the usual way.  */
    {
!     register unsigned char *temp;
      register int i;
  
      i = XSTRING (current_dir)->size;
!     temp = (unsigned char *) alloca (i + 2);
      bcopy (XSTRING (current_dir)->data, temp, i);
      if (temp[i - 1] != '/') temp[i++] = '/';
--- 597,607 ----
       and will be cleaned up in the usual way.  */
    {
!     register char *temp;
      register int i;
  
      i = XSTRING (current_dir)->size;
!     pwd_var = (char *) alloca (i + 6);
!     temp = pwd_var + 4;
!     bcopy ("PWD=", pwd_var, 4);
      bcopy (XSTRING (current_dir)->data, temp, i);
      if (temp[i - 1] != '/') temp[i++] = '/';
***************
*** 612,615 ****
--- 615,622 ----
      if (chdir (temp) < 0)
        exit (errno);
+ 
+     /* Strip trailing slashes for PWD, but leave "/" and "//" alone.  */
+     while (i > 2 && temp[i - 1] == '/')
+       temp[--i] = 0;
    }
  
***************
*** 627,632 ****
        new_length++;
  
!     /* new_length + 1 to include terminating 0.  */
!     env = new_env = (char **) alloca ((new_length + 1) * sizeof (char *));
  
      /* Copy the Vprocess_environment strings into new_env.  */
--- 634,644 ----
        new_length++;
  
!     /* new_length + 2 to include PWD and terminating 0.  */
!     env = new_env = (char **) alloca ((new_length + 2) * sizeof (char *));
! 
!     /* If we have a PWD envvar, pass one down,
!        but with corrected value.  */
!     if (getenv ("PWD"))
!       *new_env++ = pwd_var;
  
      /* Copy the Vprocess_environment strings into new_env.  */
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/editfns.c emacs-19.25/src/editfns.c
*** emacs-19.24/src/editfns.c	Mon May 16 23:24:47 1994
--- emacs-19.25/src/editfns.c	Fri May 27 22:06:20 1994
***************
*** 630,634 ****
    int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
    /* Some compilers can't handle this as a single return statement.  */
!   int days = (
  	      /* difference in day of year */
  	      a->tm_yday - b->tm_yday
--- 630,634 ----
    int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
    /* Some compilers can't handle this as a single return statement.  */
!   long days = (
  	      /* difference in day of year */
  	      a->tm_yday - b->tm_yday
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/emacs.c emacs-19.25/src/emacs.c
*** emacs-19.24/src/emacs.c	Wed May 18 01:36:48 1994
--- emacs-19.25/src/emacs.c	Sat May 28 00:44:47 1994
***************
*** 410,425 ****
    clearerr (stdin);
  
! #ifdef BSD_PGRPS
!   if (initialized)
      {
!       inherited_pgroup = EMACS_GETPGRP (0);
!       setpgrp (0, getpid ());
!     }
  #else
  #if defined (USG5) && defined (INTERRUPT_INPUT)
!   setpgrp ();
  #endif
  #endif
! 
  
  #ifdef APOLLO
--- 410,427 ----
    clearerr (stdin);
  
!   if (! noninteractive1)
      {
! #ifdef BSD_PGRPS
!       if (initialized)
! 	{
! 	  inherited_pgroup = EMACS_GETPGRP (0);
! 	  setpgrp (0, getpid ());
! 	}
  #else
  #if defined (USG5) && defined (INTERRUPT_INPUT)
!       setpgrp ();
  #endif
  #endif
!     }
  
  #ifdef APOLLO
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/fileio.c emacs-19.25/src/fileio.c
*** emacs-19.24/src/fileio.c	Sat May 21 21:40:43 1994
--- emacs-19.25/src/fileio.c	Thu May 26 18:28:57 1994
***************
*** 2713,2716 ****
--- 2713,2719 ----
  	  /* At what file position are we now scanning?  */
  	  curpos = st.st_size - (ZV - same_at_end);
+ 	  /* If the entire file matches the buffer tail, stop the scan.  */
+ 	  if (curpos == 0)
+ 	    break;
  	  /* How much can we scan in the next step?  */
  	  trial = min (curpos, sizeof buffer);
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/keyboard.c emacs-19.25/src/keyboard.c
*** emacs-19.24/src/keyboard.c	Mon May 23 02:32:38 1994
--- emacs-19.25/src/keyboard.c	Mon May 30 07:02:53 1994
***************
*** 54,57 ****
--- 54,62 ----
  #include "systime.h"
  
+ /* This is to get the definitions of the XK_ symbols.  */
+ #ifdef HAVE_X_WINDOWS
+ #include "xterm.h"
+ #endif
+ 
  extern int errno;
  
***************
*** 1158,1167 ****
  
  			  obj = DISP_CHAR_VECTOR (dp, lose);
! 			  if (XTYPE (obj) == Lisp_Vector
! 			      && XVECTOR (obj)->size == 1
! 			      && (XTYPE (obj = XVECTOR (obj)->contents[0])
! 				  == Lisp_Int))
! 			    no_redisplay =
! 			      direct_output_for_insert (XINT (obj));
  			}
  		      else
--- 1163,1175 ----
  
  			  obj = DISP_CHAR_VECTOR (dp, lose);
! 			  if (NILP (obj)
! 			      || (XTYPE (obj) == Lisp_Vector
! 				  && XVECTOR (obj)->size == 1
! 				  && (XTYPE (obj = XVECTOR (obj)->contents[0])
! 				      == Lisp_Int)
! 				  /* Insist face not specified in glyph.  */
! 				  && (XINT (obj) & ((-1) << 8)) == 0))
! 			    no_redisplay
! 			      = direct_output_for_insert (XINT (obj));
  			}
  		      else
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/keymap.c emacs-19.25/src/keymap.c
*** emacs-19.24/src/keymap.c	Thu May  5 15:46:06 1994
--- emacs-19.25/src/keymap.c	Tue May 24 17:11:41 1994
***************
*** 2127,2131 ****
  	     encountered.  */
  	  tem = Fassq (tail, *seen);
! 	  if (CONSP (tem) && Fequal (XCONS (tem)->car, keys))
  	    break;
  	  *seen = Fcons (Fcons (tail, keys), *seen);
--- 2127,2131 ----
  	     encountered.  */
  	  tem = Fassq (tail, *seen);
! 	  if (CONSP (tem) && !NILP (Fequal (XCONS (tem)->car, keys)))
  	    break;
  	  *seen = Fcons (Fcons (tail, keys), *seen);
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/lread.c emacs-19.25/src/lread.c
*** emacs-19.24/src/lread.c	Fri May 20 12:15:53 1994
--- emacs-19.25/src/lread.c	Sat May 28 10:33:47 1994
***************
*** 563,567 ****
  		fd = (access (fn, X_OK) == 0) ? 1 : -1;
  	      else
! 		fd = open (fn, O_RDONLY, 0);
  
  	      if (fd >= 0)
--- 563,567 ----
  		fd = (access (fn, X_OK) == 0) ? 1 : -1;
  	      else
! 		fd = open (fn, 0, 0);
  
  	      if (fd >= 0)
***************
*** 1753,1758 ****
  #endif /* NOTDEF */
  
- /* New replacement for DefIntVar; it ignores the doc string argument
-    on the assumption that make-docfile will handle that.  */
  /* Define an "integer variable"; a symbol whose value is forwarded
   to a C variable of type int.  Sample call: */
--- 1753,1756 ----
***************
*** 1760,1767 ****
  
  void
! defvar_int (namestring, address, doc)
       char *namestring;
       int *address;
-      char *doc;
  {
    Lisp_Object sym;
--- 1758,1764 ----
  
  void
! defvar_int (namestring, address)
       char *namestring;
       int *address;
  {
    Lisp_Object sym;
***************
*** 1774,1781 ****
  
  void
! defvar_bool (namestring, address, doc)
       char *namestring;
       int *address;
-      char *doc;
  {
    Lisp_Object sym;
--- 1771,1777 ----
  
  void
! defvar_bool (namestring, address)
       char *namestring;
       int *address;
  {
    Lisp_Object sym;
***************
*** 1787,1794 ****
  
  void
! defvar_lisp (namestring, address, doc)
       char *namestring;
       Lisp_Object *address;
-      char *doc;
  {
    Lisp_Object sym;
--- 1783,1789 ----
  
  void
! defvar_lisp (namestring, address)
       char *namestring;
       Lisp_Object *address;
  {
    Lisp_Object sym;
***************
*** 1803,1810 ****
  
  void
! defvar_lisp_nopro (namestring, address, doc)
       char *namestring;
       Lisp_Object *address;
-      char *doc;
  {
    Lisp_Object sym;
--- 1798,1804 ----
  
  void
! defvar_lisp_nopro (namestring, address)
       char *namestring;
       Lisp_Object *address;
  {
    Lisp_Object sym;
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/m/mips4.h emacs-19.25/src/m/mips4.h
*** emacs-19.24/src/m/mips4.h	Wed Dec 22 21:09:02 1993
--- emacs-19.25/src/m/mips4.h	Fri May 27 19:21:23 1994
***************
*** 23,29 ****
     now takes care of that option.  */
  #ifdef MIPS2
! #define C_DEBUG_SWITCH -DMips -g3 -O -Olimit 2000 -mips2
  #else
! #define C_DEBUG_SWITCH -DMips -g3 -O -Olimit 2000
  #endif
  #endif
--- 23,29 ----
     now takes care of that option.  */
  #ifdef MIPS2
! #define C_DEBUG_SWITCH -DMips -g3 -Wf,-XNd4000 -O -Olimit 2000 -mips2
  #else
! #define C_DEBUG_SWITCH -DMips -g3 -Wf,-XNd4000 -O -Olimit 2000
  #endif
  #endif
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/minibuf.c emacs-19.25/src/minibuf.c
*** emacs-19.24/src/minibuf.c	Tue May  3 21:54:25 1994
--- emacs-19.25/src/minibuf.c	Tue May 24 22:31:14 1994
***************
*** 1275,1279 ****
    register int i;
    register unsigned char *completion_string;
!   struct gcpro gcpro1;
  
    /* We keep calling Fbuffer_string rather than arrange for GC to
--- 1275,1279 ----
    register int i;
    register unsigned char *completion_string;
!   struct gcpro gcpro1, gcpro2;
  
    /* We keep calling Fbuffer_string rather than arrange for GC to
***************
*** 1313,1316 ****
--- 1313,1317 ----
  
      tem = Fbuffer_string ();
+     GCPRO2 (completion, tem);
      /* If reading a file name,
         expand any $ENVVAR refs in the buffer and in TEM.  */
***************
*** 1344,1347 ****
--- 1345,1349 ----
  	SET_PT (ZV);
        }
+     UNGCPRO;
    }
  #endif /* Rewritten code */
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/msdos.c emacs-19.25/src/msdos.c
*** emacs-19.24/src/msdos.c	Tue May 17 03:23:11 1994
--- emacs-19.25/src/msdos.c	Mon May 30 05:14:49 1994
***************
*** 1,4 ****
! /* MS-DOS specific C utilities.  Coded by Morten Welinder 1993
!    Copyright (C) 1993 Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
--- 1,4 ----
! /* MS-DOS specific C utilities.
!    Copyright (C) 1993, 1994 Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
***************
*** 18,21 ****
--- 18,23 ----
  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
+ /* Contributed by Morten Welinder */
+ 
  /* Note: some of the stuff here was taken from end of sysdep.c in demacs. */
  
***************
*** 259,262 ****
--- 261,267 ----
    ctrl_p = ((regs.h.al & 4) != 0);
    shift_p = ((regs.h.al & 3) != 0);
+   /* Please be very careful here not to break international keyboard support.
+      When Keyb.Com is loaded, the key marked `Alt Gr' is used for accessing
+      characters like { and } if their positions are overlaid.  */
    alt_p = ((extended_kbd ? (regs.h.ah & 2) : (regs.h.al & 8)) != 0);
  
***************
*** 275,278 ****
--- 280,288 ----
        if (c >= '0' && c <= '9' && sc > 0xb)
  	sc = (c == '0') ? 0xb : (c - '0' + 1), c = 0;
+       else if (sc == 0x53 && c != 0xe0)
+ 	{
+ 	  code = 0xffae; /* Keypad decimal point/comma.  */
+ 	  goto nonascii;
+ 	}
        else if (sc == 0xe0)
  	{
***************
*** 283,290 ****
  	      sc = 0x1c;
  	      break;
- 	    case '.': /* Decimal point or decimal comma */
- 	    case ',':
- 	      sc = 0x53;
- 	      break;
  	    case '/':
  	      sc = 0x35;
--- 293,296 ----
***************
*** 314,317 ****
--- 320,324 ----
  	    if (code >= 0x100)
  	      {
+ 	      nonascii:
  		event.kind = non_ascii_keystroke;
  		event.code = (code & 0xff) + 0xff00;
***************
*** 319,326 ****
  	    else
  	      {
! 		/* Don't return S- if we don't have to.  */
! 		if (code >= 'a' && code <= 'z')
  		  {
! 		    c = shift_p ? toupper (code) : code;
  		    shift_p = 0;
  		  }
--- 326,343 ----
  	    else
  	      {
! 		/* Don't return S- if we don't have to.  `shifted' is
! 		   supposed to be the shifted versions of the characters
! 		   in `unshifted'.  Unfortunately, this is only true for
! 		   US keyboard layout.  If anyone knows how to do this
! 		   right, please tell us.  */
! 		static char *unshifted
! 		  = "abcdefghijklmnopqrstuvwxyz,./=;[\\]'-`0123456789";
! 		static char *shifted
! 		  = "ABCDEFGHIJKLMNOPQRSTUVWXYZ<>?+:{|}\"_~)!@#$%^&*(";
! 		char *pos;
! 
! 		if (shift_p && (pos = strchr (unshifted, code)))
  		  {
! 		    c = shifted[pos - unshifted];
  		    shift_p = 0;
  		  }
***************
*** 331,337 ****
  	      }
  	    event.modifiers
! 	      = (shift_p ? shift_modifier : 0
! 		 + (ctrl_p ? ctrl_modifier : 0
! 		    + (alt_p ? meta_modifier : 0)));
  	    /* EMACS == Enter Meta Alt Control Shift */
  	    event.frame_or_window = selected_frame;
--- 348,354 ----
  	      }
  	    event.modifiers
! 	      = (shift_p ? shift_modifier : 0)
! 		+ (ctrl_p ? ctrl_modifier : 0)
! 		  + (alt_p ? meta_modifier : 0);
  	    /* EMACS == Enter Meta Alt Control Shift */
  	    event.frame_or_window = selected_frame;
***************
*** 363,370 ****
  		event.code = but;
  		event.modifiers
! 		  = (shift_p ? shift_modifier : 0
! 		     + (ctrl_p ? ctrl_modifier : 0
! 			+ (alt_p ? meta_modifier : 0
! 			   + (press ? down_modifier : up_modifier))));
  		event.x = x;
  		event.y = y;
--- 380,387 ----
  		event.code = but;
  		event.modifiers
! 		  = (shift_p ? shift_modifier : 0)
! 		    + (ctrl_p ? ctrl_modifier : 0)
! 		      + (alt_p ? meta_modifier : 0)
! 			+ (press ? down_modifier : up_modifier);
  		event.x = x;
  		event.y = y;
***************
*** 748,752 ****
  
  static void
! visible_bell (xorattr)
       unsigned char xorattr;
  {
--- 765,769 ----
  
  static void
! do_visible_bell (xorattr)
       unsigned char xorattr;
  {
***************
*** 793,796 ****
--- 810,842 ----
  }
  
+ /* At screen position (X,Y), output C characters from string S with
+    attribute A.  Do it fast!  */
+ 
+ static void
+ output_string (x, y, s, c, a)
+      int x, y, c;
+      unsigned char *s;
+      unsigned char a;
+ {
+   char *t = (char *)ScreenPrimary + 2 * (x + ScreenCols () * y);
+   asm volatile
+     ("  movl   %1,%%eax
+         call   dosmemsetup
+         movl   %%eax,%%edi
+         movb   %0,%%ah
+         movl   %2,%%ecx
+         movl   %3,%%esi
+ output_string1:
+         movb   (%%esi),%%al
+         movw   %%ax,%%gs:(%%edi)
+         addl   $2,%%edi
+         incl   %%esi
+         decl   %%ecx
+         jne    output_string1"
+      : /* no output */
+      : "m" (a), "g" (t), "g" (c), "g" (s)
+      : "%eax", "%ecx", /* "%gs",*/ "%esi", "%edi");
+ }
+ 
  static int internal_terminal = 0;
  #undef fflush
***************
*** 800,807 ****
       FILE *f;
  {
    static int x;
    static int y;
!   char c, *cp;
!   int count, i;
  
    if (internal_terminal && f == stdout)
--- 846,854 ----
       FILE *f;
  {
+   static char spaces[] = "                                                                                ";
    static int x;
    static int y;
!   unsigned char *cp, *cp0;
!   int count, i, j;
  
    if (internal_terminal && f == stdout)
***************
*** 812,816 ****
        while (count > 0)
  	{
! 	  switch (c = *cp++)
  	    {
  	    case 27:
--- 859,863 ----
        while (count > 0)
  	{
! 	  switch (*cp++)
  	    {
  	    case 27:
***************
*** 827,831 ****
  		  break;
  		case 'B':
! 		  visible_bell (*cp++);
  		  count -= 3;
  		  break;
--- 874,878 ----
  		  break;
  		case 'B':
! 		  do_visible_bell (*cp++);
  		  count -= 3;
  		  break;
***************
*** 836,841 ****
  		  break;
  		case 'E':
! 		  for (i = ScreenCols () - 1; i >= x; i--)
! 		    ScreenPutChar (' ', ScreenAttrib, i, y);
  		  count -= 2;
  		  break;
--- 883,897 ----
  		  break;
  		case 'E':
! 		  i = ScreenCols () - x;
! 		  j = x;
! 		  while (i >= sizeof spaces)
! 		    {
! 		      output_string (j, y, spaces, sizeof spaces,
! 				     ScreenAttrib);
! 		      j += sizeof spaces;
! 		      i -= sizeof spaces;
! 		    }
! 		  if (i > 0)
! 		    output_string (j, y, spaces, i, ScreenAttrib);
  		  count -= 2;
  		  break;
***************
*** 856,859 ****
--- 912,919 ----
  		}
  	      break;
+ 	    case 7:
+ 	      write (1, "\007", 1);
+ 	      count--;
+ 	      break;
  	    case 8:
  	      x--;
***************
*** 869,874 ****
  	      break;
  	    default:
! 	      ScreenPutChar (c, ScreenAttrib, x++, y);
  	      count--;
  	    }
  	}
--- 929,938 ----
  	      break;
  	    default:
! 	      cp0 = cp - 1;
  	      count--;
+ 	      while (count > 0 && *cp >= ' ')
+ 		cp++, count--;
+ 	      output_string (x, y, cp0, cp - cp0, ScreenAttrib);
+ 	      x += (cp - cp0);
  	    }
  	}
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/process.c emacs-19.25/src/process.c
*** emacs-19.24/src/process.c	Sat May 21 03:29:04 1994
--- emacs-19.25/src/process.c	Mon May 30 06:16:37 1994
***************
*** 1160,1164 ****
  
  #ifdef HAVE_PTYS
!   if (EQ (Vprocess_connection_type, Qt))
      outchannel = inchannel = allocate_pty ();
  
--- 1160,1164 ----
  
  #ifdef HAVE_PTYS
!   if (!NILP (Vprocess_connection_type))
      outchannel = inchannel = allocate_pty ();
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/s/bsd386.h emacs-19.25/src/s/bsd386.h
*** emacs-19.24/src/s/bsd386.h	Sun May 15 01:28:26 1994
--- emacs-19.25/src/s/bsd386.h	Sat May 28 17:58:00 1994
***************
*** 19,20 ****
--- 19,27 ----
  /* The dumped Emacs records the timezone it was dumped in.  */
  #define LOCALTIME_CACHE
+ 
+ /* System uses OXTABS instead of the expected TAB3.
+    (Copied from netbsd.h.)  */
+ #define TABDLY OXTABS
+ #define TAB3 OXTABS
+ 
+ #define SYSV_SYSTEM_DIR
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/s/gnu.h emacs-19.25/src/s/gnu.h
*** emacs-19.24/src/s/gnu.h	Wed May 11 18:18:39 1994
--- emacs-19.25/src/s/gnu.h	Wed May 11 18:18:39 1994
***************
*** 35,46 ****
  #define ORDINARY_LINK
  
- /* The system malloc is GNU malloc (or will eventually be).
-    It won't work to compile GNU malloc as for Unix (using sbrk).  */
- #define SYSTEM_MALLOC
- 
- /* For the time being, GNU malloc does not work on Mach,
-    so we cannot using the relocating allocator.  */
- #undef REL_ALLOC
- 
  /* Until mib finishes the terminal driver.  */
  #define BROKEN_SIGIO
--- 35,38 ----
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/s/hpux8.h emacs-19.25/src/s/hpux8.h
*** emacs-19.24/src/s/hpux8.h	Mon May 23 12:07:41 1994
--- emacs-19.25/src/s/hpux8.h	Sat May 28 06:29:02 1994
***************
*** 14,17 ****
--- 14,18 ----
  #define LIB_X11_LIB -L/usr/lib/X11R5 -L/usr/lib/X11R4 -lX11
  #define C_SWITCH_X_SYSTEM -I/usr/include/X11R5 -I/usr/include/X11R4
+ #define LD_SWITCH_X_DEFAULT -L/usr/lib/X11R5 -L/usr/lib/X11R4
  
  /* Don't use shared libraries.  unexec doesn't handle them.
***************
*** 23,29 ****
  
  #ifdef HPUX_USE_SHLIBS
! #define LD_SWITCH_SYSTEM -L/usr/lib/X11R5 -L/usr/lib/X11R4
  #else
! #define LD_SWITCH_SYSTEM -Xlinker -a -Xlinker archive -L/usr/lib/X11R5 -L/usr/lib/X11R4
  #endif
  
--- 24,30 ----
  
  #ifdef HPUX_USE_SHLIBS
! #define LD_SWITCH_SYSTEM
  #else
! #define LD_SWITCH_SYSTEM -Xlinker -a -Xlinker archive
  #endif
  
***************
*** 31,43 ****
  #if (defined(hp9000s700) || defined(__hp9000s700))
  #ifdef HPUX_USE_SHLIBS
! #define LD_SWITCH_SYSTEM -L/lib/pa1.1 -L/usr/lib/X11R5 -L/usr/lib/X11R4
  #else
! #define LD_SWITCH_SYSTEM -a archive -L/lib/pa1.1 -L/usr/lib/X11R5 -L/usr/lib/X11R4
  #endif
  #else /* not (defined(hp9000s700) || defined(__hp9000s700)) */
  #ifdef HPUX_USE_SHLIBS
! #define LD_SWITCH_SYSTEM -L/usr/lib/X11R5 -L/usr/lib/X11R4
  #else
! #define LD_SWITCH_SYSTEM -a archive -L/usr/lib/X11R5 -L/usr/lib/X11R4
  #endif
  #endif /* not (defined(hp9000s700) || defined(__hp9000s700)) */
--- 32,44 ----
  #if (defined(hp9000s700) || defined(__hp9000s700))
  #ifdef HPUX_USE_SHLIBS
! #define LD_SWITCH_SYSTEM -L/lib/pa1.1
  #else
! #define LD_SWITCH_SYSTEM -a archive -L/lib/pa1.1
  #endif
  #else /* not (defined(hp9000s700) || defined(__hp9000s700)) */
  #ifdef HPUX_USE_SHLIBS
! #define LD_SWITCH_SYSTEM
  #else
! #define LD_SWITCH_SYSTEM -a archive
  #endif
  #endif /* not (defined(hp9000s700) || defined(__hp9000s700)) */
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/s/hpux9.h emacs-19.25/src/s/hpux9.h
*** emacs-19.24/src/s/hpux9.h	Wed Jul 28 14:57:37 1993
--- emacs-19.25/src/s/hpux9.h	Fri May 27 18:51:26 1994
***************
*** 13,14 ****
--- 13,17 ----
  #undef REL_ALLOC
  #endif
+ 
+ /* Make room for enough symbols, so dispnew.c does not fail.  */
+ #define C_SWITCH_SYSTEM -Wp,-H200000
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/s/linux.h emacs-19.25/src/s/linux.h
*** emacs-19.24/src/s/linux.h	Sun May 22 16:16:23 1994
--- emacs-19.25/src/s/linux.h	Fri May 27 04:00:41 1994
***************
*** 256,257 ****
--- 256,260 ----
  #define HAVE_XSCREENNUMBEROFSCREEN
  #endif
+ #ifndef HAVE_XRMSETDATABASE
+ #define HAVE_XRMSETDATABASE
+ #endif
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/s/msdos.h emacs-19.25/src/s/msdos.h
*** emacs-19.24/src/s/msdos.h	Fri May  6 14:13:13 1994
--- emacs-19.25/src/s/msdos.h	Tue May 24 15:48:42 1994
***************
*** 210,214 ****
  :ms:mb=\EX\200:md=\EX\010:mk=\EA\161:me=\EA\027:\
  :cl=\EC:ce=\EE:\
! :vb=\EB\140:bl=:"
  #define fflush internal_flush
  
--- 210,214 ----
  :ms:mb=\EX\200:md=\EX\010:mk=\EA\161:me=\EA\027:\
  :cl=\EC:ce=\EE:\
! :vb=\EB\140:bl=\007:"
  #define fflush internal_flush
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/search.c emacs-19.25/src/search.c
*** emacs-19.24/src/search.c	Sun May 22 23:57:24 1994
--- emacs-19.25/src/search.c	Tue May 24 23:55:19 1994
***************
*** 1175,1178 ****
--- 1175,1179 ----
    int some_multiletter_word;
    int some_lowercase;
+   int some_uppercase;
    int some_lowercase_initial;
    register int c, prevc;
***************
*** 1206,1209 ****
--- 1207,1211 ----
        some_lowercase = 0;
        some_lowercase_initial = 0;
+       some_uppercase = 0;
  
        for (pos = search_regs.start[0]; pos < last; pos++)
***************
*** 1222,1225 ****
--- 1224,1228 ----
  	  else if (!NOCASEP (c))
  	    {
+ 	      some_uppercase = 1;
  	      if (SYNTAX (prevc) != Sword)
  		;
***************
*** 1236,1244 ****
  	case_action = all_caps;
        /* Capitalize each word, if the old text has all capitalized words.  */
!       /* We used to insist on some_multiletter_word here,
! 	 but that screwed query replacing x with y, acting on X.
! 	 Even what we have now is more strict than what 19.22 had.  */
!       else if (!some_lowercase_initial)
  	case_action = cap_initial;
        else
  	case_action = nochange;
--- 1239,1248 ----
  	case_action = all_caps;
        /* Capitalize each word, if the old text has all capitalized words.  */
!       else if (!some_lowercase_initial && some_multiletter_word)
  	case_action = cap_initial;
+       else if (!some_lowercase_initial && some_uppercase)
+ 	/* Should x -> yz, operating on X, give Yz or YZ?
+ 	   We'll assume the latter.  */
+ 	case_action = all_caps;
        else
  	case_action = nochange;
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/systime.h emacs-19.25/src/systime.h
*** emacs-19.24/src/systime.h	Wed May 18 02:46:04 1994
--- emacs-19.25/src/systime.h	Thu May 26 18:14:50 1994
***************
*** 46,49 ****
--- 46,58 ----
  #endif
  
+ /* On some configurations (hpux8.0, X11R4), sys/time.h and X11/Xos.h
+    disagree about the name of the guard symbol.  */
+ #ifdef HPUX
+ #ifdef _STRUCT_TIMEVAL
+ #ifndef __TIMEVAL__
+ #define __TIMEVAL__
+ #endif
+ #endif
+ #endif
  
  /* EMACS_TIME is the type to use to represent temporal intervals -
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/termcap.c emacs-19.25/src/termcap.c
*** emacs-19.24/src/termcap.c	Tue May  3 22:16:49 1994
--- emacs-19.25/src/termcap.c	Wed May 25 19:06:05 1994
***************
*** 47,50 ****
--- 47,54 ----
  #endif
  
+ #ifndef O_RDONLY
+ #define O_RDONLY 0
+ #endif
+ 
  /* BUFSIZE is the initial size allocated for the buffer
     for reading the termcap file.
***************
*** 460,466 ****
  
  #ifdef MSDOS
!   fd = open (termcap_name, O_TEXT, 0);
  #else
!   fd = open (termcap_name, 0, 0);
  #endif
    if (fd < 0)
--- 464,470 ----
  
  #ifdef MSDOS
!   fd = open (termcap_name, O_RDONLY|O_TEXT, 0);
  #else
!   fd = open (termcap_name, O_RDONLY, 0);
  #endif
    if (fd < 0)
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/undo.c emacs-19.25/src/undo.c
*** emacs-19.24/src/undo.c	Sat May  7 04:38:30 1994
--- emacs-19.25/src/undo.c	Tue May 24 22:19:02 1994
***************
*** 336,341 ****
       Lisp_Object n, list;
  {
    int count = specpdl_ptr - specpdl;
!   register int arg = XINT (n);
  #if 0  /* This is a good feature, but would make undo-start
  	  unable to do what is expected.  */
--- 336,343 ----
       Lisp_Object n, list;
  {
+   struct gcpro gcpro1, gcpro2;
+   Lisp_Object next;
    int count = specpdl_ptr - specpdl;
!   register int arg;
  #if 0  /* This is a good feature, but would make undo-start
  	  unable to do what is expected.  */
***************
*** 349,352 ****
--- 351,359 ----
  #endif
  
+   CHECK_NUMBER (n, 0);
+   arg = XINT (n);
+   next = Qnil;
+   GCPRO2 (next, list);
+ 
    /* Don't let read-only properties interfere with undo.  */
    if (NILP (current_buffer->read_only))
***************
*** 357,361 ****
        while (1)
  	{
- 	  Lisp_Object next;
  	  next = Fcar (list);
  	  list = Fcdr (list);
--- 364,367 ----
***************
*** 456,459 ****
--- 462,466 ----
      }
  
+   UNGCPRO;
    return unbind_to (count, list);
  }
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/unexec.c emacs-19.25/src/unexec.c
*** emacs-19.24/src/unexec.c	Sun May 22 15:50:06 1994
--- emacs-19.25/src/unexec.c	Wed May 25 18:41:06 1994
***************
*** 138,142 ****
  
  If defined, this macro specifies the number of bytes to seek into the
! a.out file before starting to write the text segment.a
  
  * EXEC_MAGIC
--- 138,142 ----
  
  If defined, this macro specifies the number of bytes to seek into the
! a.out file before starting to write the text segment.
  
  * EXEC_MAGIC
***************
*** 215,218 ****
--- 215,232 ----
  #include <errno.h>
  
+ #include <sys/file.h>	/* Must be after sys/types.h for USG and BSD4_1*/
+ 
+ #ifdef USG5
+ #include <fcntl.h>
+ #endif
+ 
+ #ifndef O_RDONLY
+ #define O_RDONLY 0
+ #endif
+ #ifndef O_RDWR
+ #define O_RDWR 2
+ #endif
+ 
+ 
  extern char *start_of_text ();		/* Start of text */
  extern char *start_of_data ();		/* Start of initialized data */
***************
*** 312,315 ****
--- 326,331 ----
  #ifdef emacs
  
+ #include "lisp.h"
+ 
  static
  report_error (file, fd)
***************
*** 319,323 ****
    if (fd)
      close (fd);
!   error ("Failure operating on %s\n", file);
  }
  #endif /* emacs */
--- 335,339 ----
    if (fd)
      close (fd);
!   report_file_error ("Cannot unexec", Fcons (build_string (file), Qnil));
  }
  #endif /* emacs */
***************
*** 358,362 ****
    int new, a_out = -1;
  
!   if (a_name && (a_out = open (a_name, 0)) < 0)
      {
        PERROR (a_name);
--- 374,378 ----
    int new, a_out = -1;
  
!   if (a_name && (a_out = open (a_name, O_RDONLY)) < 0)
      {
        PERROR (a_name);
***************
*** 1056,1060 ****
    if ((new = writedesc) < 0)
  #else
!   if ((new = open (new_name, 2)) < 0)
  #endif
      {
--- 1072,1076 ----
    if ((new = writedesc) < 0)
  #else
!   if ((new = open (new_name, O_RDWR)) < 0)
  #endif
      {
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/unexhp9k800.c emacs-19.25/src/unexhp9k800.c
*** emacs-19.24/src/unexhp9k800.c	Sun May 22 05:10:13 1994
--- emacs-19.25/src/unexhp9k800.c	Sat May 28 17:46:32 1994
***************
*** 64,67 ****
--- 64,68 ----
  }
  
+ #undef roundup
  #define roundup(x,n) (((x) + ((n) - 1)) & ~((n) - 1))  /* n is power of 2 */
  #define min(x,y)  (((x) < (y)) ? (x) : (y))
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/xdisp.c emacs-19.25/src/xdisp.c
*** emacs-19.24/src/xdisp.c	Thu May 19 01:23:54 1994
--- emacs-19.25/src/xdisp.c	Mon May 30 08:34:35 1994
***************
*** 842,845 ****
--- 842,850 ----
    /* Change frame size now if a change is pending.  */
    do_pending_window_change ();
+ 
+   /* If we just did a pending size change, redisplay again
+      for the new size.  */
+   if (windows_or_buffers_changed && !pause)
+     redisplay ();
  }
  
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/xfns.c emacs-19.25/src/xfns.c
*** emacs-19.24/src/xfns.c	Fri May 20 21:10:15 1994
--- emacs-19.25/src/xfns.c	Wed May 25 18:01:32 1994
***************
*** 104,108 ****
     over text or in the modeline. */
  Lisp_Object Vx_pointer_shape, Vx_nontext_pointer_shape, Vx_mode_pointer_shape;
! Lisp_Object Vx_cross_pointer_shape;
  
  /* Color of chars displayed in cursor box. */
--- 104,109 ----
     over text or in the modeline. */
  Lisp_Object Vx_pointer_shape, Vx_nontext_pointer_shape, Vx_mode_pointer_shape;
! /* The shape when over mouse-sensitive text.  */
! Lisp_Object Vx_sensitive_text_pointer_shape;
  
  /* Color of chars displayed in cursor box. */
***************
*** 804,812 ****
    x_check_errors ("bad modeline pointer cursor: %s");
  
!   if (!EQ (Qnil, Vx_cross_pointer_shape))
      {
!       CHECK_NUMBER (Vx_cross_pointer_shape, 0);
!       cross_cursor = XCreateFontCursor (x_current_display,
!                                           XINT (Vx_cross_pointer_shape));
      }
    else
--- 805,814 ----
    x_check_errors ("bad modeline pointer cursor: %s");
  
!   if (!EQ (Qnil, Vx_sensitive_text_pointer_shape))
      {
!       CHECK_NUMBER (Vx_sensitive_text_pointer_shape, 0);
!       cross_cursor
! 	= XCreateFontCursor (x_current_display,
! 			     XINT (Vx_sensitive_text_pointer_shape));
      }
    else
***************
*** 4335,4351 ****
    Vx_resource_name = Qnil;
  
! #if 0
    DEFVAR_INT ("x-nontext-pointer-shape", &Vx_nontext_pointer_shape,
! 	      "The shape of the pointer when not over text.");
  #endif
    Vx_nontext_pointer_shape = Qnil;
  
! #if 0
    DEFVAR_INT ("x-mode-pointer-shape", &Vx_mode_pointer_shape,
! 	      "The shape of the pointer when over the mode line.");
  #endif
    Vx_mode_pointer_shape = Qnil;
  
!   Vx_cross_pointer_shape = Qnil;
  
    DEFVAR_LISP ("x-cursor-fore-pixel", &Vx_cursor_fore_pixel,
--- 4337,4362 ----
    Vx_resource_name = Qnil;
  
! #if 0 /* This doesn't really do anything.  */
    DEFVAR_INT ("x-nontext-pointer-shape", &Vx_nontext_pointer_shape,
! 	      "The shape of the pointer when not over text.\n\
! This variable takes effect when you create a new frame\n\
! or when you set the mouse color.");
  #endif
    Vx_nontext_pointer_shape = Qnil;
  
! #if 0 /* This doesn't really do anything.  */
    DEFVAR_INT ("x-mode-pointer-shape", &Vx_mode_pointer_shape,
! 	      "The shape of the pointer when over the mode line.\n\
! This variable takes effect when you create a new frame\n\
! or when you set the mouse color.");
  #endif
    Vx_mode_pointer_shape = Qnil;
  
!   DEFVAR_INT ("x-sensitive-text-pointer-shape",
! 	      &Vx_sensitive_text_pointer_shape,
! 	      "The shape of the pointer when over mouse-sensitive text.\n\
! This variable takes effect when you create a new frame\n\
! or when you set the mouse color.");
!   Vx_sensitive_text_pointer_shape = Qnil;
  
    DEFVAR_LISP ("x-cursor-fore-pixel", &Vx_cursor_fore_pixel,
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/xmenu.c emacs-19.25/src/xmenu.c
*** emacs-19.24/src/xmenu.c	Mon May 23 02:24:08 1994
--- emacs-19.25/src/xmenu.c	Wed May 25 05:04:40 1994
***************
*** 332,335 ****
--- 332,342 ----
        descrip = Qnil;
        savedkey = Fwhere_is_internal (def, Qnil, Qt, Qnil);
+       /* If the command is an alias for another
+ 	 (such as easymenu.el and lmenu.el set it up),
+ 	 see if the original command name has equivalent keys.  */
+       if (SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function))
+ 	savedkey = Fwhere_is_internal (XSYMBOL (def)->function,
+ 				       Qnil, Qt, Qnil);
+ 
        if (VECTORP (savedkey)
  	  && EQ (XVECTOR (savedkey)->contents[0], Qmenu_bar))
diff -rc2P --exclude-from=/gd2/gnu/emacs/exceptions emacs-19.24/src/xterm.c emacs-19.25/src/xterm.c
*** emacs-19.24/src/xterm.c	Sun May 22 17:30:16 1994
--- emacs-19.25/src/xterm.c	Sat May 28 04:24:01 1994
***************
*** 293,297 ****
  static int mouse_face_deferred_gc;
  
! /* FRAME and X, Y position of mouse when last checked for highlighting.  */
  static FRAME_PTR mouse_face_mouse_frame;
  static int mouse_face_mouse_x, mouse_face_mouse_y;
--- 293,298 ----
  static int mouse_face_deferred_gc;
  
! /* FRAME and X, Y position of mouse when last checked for
!    highlighting.  X and Y can be negative or out of range for the frame.  */
  static FRAME_PTR mouse_face_mouse_frame;
  static int mouse_face_mouse_x, mouse_face_mouse_y;
***************
*** 1919,1938 ****
  	  | ((state & meta_modifier)		? x_meta_mod_mask  : 0));
  }
- 
- /* Return true iff KEYSYM is a vendor-specific keysym that we should
-    return as a function key.  If you add a keysym to this, you should
-    make sure that the tables make_lispy_event uses contain a suitable
-    name for it.  */
- static int
- x_is_vendor_fkey (sym)
-      KeySym sym;
- {
-   return 0
- #ifdef DXK_Remove
-     || (sym == DXK_Remove)
- #endif
-       ;
- }
- 
  
  /* Mouse clicks and mouse movement.  Rah.  */
--- 1920,1923 ----
***************
*** 2086,2094 ****
    last_mouse_movement_time = event->time;
  
    /* Has the mouse moved off the glyph it was on at the last sighting?  */
!   if (event->x < last_mouse_glyph.x
!       || event->x >= last_mouse_glyph.x + last_mouse_glyph.width
!       || event->y < last_mouse_glyph.y
!       || event->y >= last_mouse_glyph.y + last_mouse_glyph.height)
      {
        mouse_moved = 1;
--- 2071,2097 ----
    last_mouse_movement_time = event->time;
  
+   if (event->window != FRAME_X_WINDOW (frame))
+     {
+       mouse_moved = 1;
+       last_mouse_scroll_bar = Qnil;
+ 
+       note_mouse_highlight (frame, -1, -1);
+ 
+       /* Ask for another mouse motion event.  */
+       {
+ 	int dummy;
+ 
+ 	XQueryPointer (event->display, FRAME_X_WINDOW (frame),
+ 		       (Window *) &dummy, (Window *) &dummy,
+ 		       &dummy, &dummy, &dummy, &dummy,
+ 		       (unsigned int *) &dummy);
+       }
+     }
+ 
    /* Has the mouse moved off the glyph it was on at the last sighting?  */
!   else if (event->x < last_mouse_glyph.x
! 	   || event->x >= last_mouse_glyph.x + last_mouse_glyph.width
! 	   || event->y < last_mouse_glyph.y
! 	   || event->y >= last_mouse_glyph.y + last_mouse_glyph.height)
      {
        mouse_moved = 1;
***************
*** 2101,2105 ****
  	int dummy;
  
! 	XQueryPointer (event->display, event->window,
  		       (Window *) &dummy, (Window *) &dummy,
  		       &dummy, &dummy, &dummy, &dummy,
--- 2104,2108 ----
  	int dummy;
  
! 	XQueryPointer (event->display, FRAME_X_WINDOW (frame),
  		       (Window *) &dummy, (Window *) &dummy,
  		       &dummy, &dummy, &dummy, &dummy,
***************
*** 2114,2118 ****
        int dummy;
        
!       XQueryPointer (event->display, event->window,
  		     (Window *) &dummy, (Window *) &dummy,
  		     &dummy, &dummy, &dummy, &dummy,
--- 2117,2121 ----
        int dummy;
        
!       XQueryPointer (event->display, FRAME_X_WINDOW (frame),
  		     (Window *) &dummy, (Window *) &dummy,
  		     &dummy, &dummy, &dummy, &dummy,
***************
*** 2126,2130 ****
  /* Take proper action when the mouse has moved to position X, Y on frame F
     as regards highlighting characters that have mouse-face properties.
!    Also dehighlighting chars where the mouse was before.  */
  
  static void
--- 2129,2134 ----
  /* Take proper action when the mouse has moved to position X, Y on frame F
     as regards highlighting characters that have mouse-face properties.
!    Also dehighlighting chars where the mouse was before.
!    X and Y can be negative or out of range.  */
  
  static void
***************
*** 2167,2171 ****
    /* Are we in a window whose display is up to date?
       And verify the buffer's text has not changed.  */
!   if (WINDOWP (window) && portion == 0
        && EQ (w->window_end_valid, w->buffer)
        && w->last_modified == BUF_MODIFF (XBUFFER (w->buffer)))
--- 2171,2176 ----
    /* Are we in a window whose display is up to date?
       And verify the buffer's text has not changed.  */
!   if (WINDOWP (window) && portion == 0 && row >= 0 && column >= 0
!       && row < FRAME_HEIGHT (f) && column < FRAME_WIDTH (f)
        && EQ (w->window_end_valid, w->buffer)
        && w->last_modified == BUF_MODIFF (XBUFFER (w->buffer)))
***************
*** 3735,3743 ****
  			       &compose_status);
  
- 	      /* Strip off the vendor-specific keysym bit, and take a shot
- 		 at recognizing the codes.  HP servers have extra keysyms
- 		 that fit into the MiscFunctionKey category.  */
  	      orig_keysym = keysym;
- 	      keysym &= ~(1<<28);
  
  	      if (numchars > 1)
--- 3740,3744 ----
***************
*** 3796,3800 ****
  		       || IsKeypadKey (keysym) /* 0xff80 <= x < 0xffbe */
  		       || IsFunctionKey (keysym) /* 0xffbe <= x < 0xffe1 */
! 		       || x_is_vendor_fkey (orig_keysym))
  		      && ! (IsModifierKey (orig_keysym)
  #ifndef HAVE_X11R5
--- 3797,3802 ----
  		       || IsKeypadKey (keysym) /* 0xff80 <= x < 0xffbe */
  		       || IsFunctionKey (keysym) /* 0xffbe <= x < 0xffe1 */
! 		       /* Any "vendor-specific" key is ok.  */
! 		       || (orig_keysym & (1 << 28)))
  		      && ! (IsModifierKey (orig_keysym)
  #ifndef HAVE_X11R5
***************
*** 4155,4158 ****
--- 4157,4167 ----
  		f->display.x->left_pos = x;
  		f->display.x->top_pos = y;
+ 		if (y != event.xconfigure.y)
+ 		  {
+ 		    /* Since the WM decorations come below top_pos now,
+ 		       we must put them below top_pos in the future.  */
+ 		    f->display.x->win_gravity = NorthWestGravity;
+ 		    x_wm_set_size_hint (f, 0, 0);
+ 		  }
  	      }
  	    }
***************
*** 5475,5479 ****
  
  
! /* Change from withdrawn state to mapped state. */
  
  x_make_frame_visible (f)
--- 5484,5489 ----
  
  
! /* Change from withdrawn state to mapped state,
!    or deiconify. */
  
  x_make_frame_visible (f)
***************
*** 5488,5492 ****
  #ifdef HAVE_X11
  #ifndef USE_X_TOOLKIT
!       x_set_offset (f, f->display.x->left_pos, f->display.x->top_pos, 0);
  #endif
  
--- 5498,5503 ----
  #ifdef HAVE_X11
  #ifndef USE_X_TOOLKIT
!       if (! FRAME_ICONIFIED_P (f))
! 	x_set_offset (f, f->display.x->left_pos, f->display.x->top_pos, 0);
  #endif
  
***************
*** 5660,5663 ****
--- 5671,5679 ----
  
  #ifdef HAVE_X11
+   /* Make sure the X server knows where the window should be positioned,
+      in case the user deiconifies with the window manager.  */
+   if (! FRAME_VISIBLE_P (f) && !FRAME_ICONIFIED_P (f))
+     x_set_offset (f, f->display.x->left_pos, f->display.x->top_pos, 0);
+ 
    /* Since we don't know which revision of X we're running, we'll use both
       the X11R3 and X11R4 techniques.  I don't know if this is a good idea.  */
end-of-emacs-patch-kit