Upgrade to emacs 20.3

PR:     7714

3 files changed, 39 insertions, 109 deletions

diff --git a/editors/emacs20/files/patch-aa b/editors/emacs20/files/patch-aa
index 0dc622db2414..23972af29eb2 100644
--- a/editors/emacs20/files/patch-aa
+++ b/editors/emacs20/files/patch-aa
@@ -109,34 +109,6 @@
  @iftex
  @finalout
  @end iftex
---- ./man/dired-x.texi.org	Thu Jan  4 12:54:19 1996
-+++ ./man/dired-x.texi	Tue May 20 01:25:55 1997
-@@ -18,6 +18,11 @@
- @setfilename ../info/dired-x
- @c dired-x.el REVISION NUMBER
- @settitle Dired Extra Version 2 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Dired-X: (dired-x).		Dired Extra Features.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
---- ./man/ediff.texi.org	Fri Jun 21 20:00:04 1996
-+++ ./man/ediff.texi	Tue May 20 01:26:29 1997
-@@ -10,6 +10,11 @@
- @synindex vr cp
- @synindex fn cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Ediff: (ediff).		A comprehensive visual interface to diff
-+				and patch.
-+@end direntry
- @iftex
- @finalout
- @end iftex
 --- ./man/cc-mode.texi.org	Sun Aug  4 21:56:21 1996
 +++ ./man/cc-mode.texi	Tue May 20 01:27:18 1997
 @@ -9,6 +9,12 @@
@@ -163,84 +135,3 @@
  
  # The makefiles of the directories in $SUBDIR.
  SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
-@@ -357,14 +357,8 @@
- 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
- 	then \
- 	  (cd ${infodir};  \
--	   if [ -f dir ]; then \
--	     if [ ! -f dir.old ]; then mv -f dir dir.old; \
--	     else mv -f dir dir.bak; fi; \
--	   fi; \
- 	   cd ${srcdir}/info ; \
--	   (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
--	   (cd $${thisdir}; chmod a+r ${infodir}/dir); \
--	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
-+	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip*; do \
- 	     (cd $${thisdir}; \
- 	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
- 	      chmod a+r ${infodir}/$$f); \
-@@ -421,7 +415,7 @@
- 	    esac ;					\
- 	  fi ;						\
- 	done
--	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
-+	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* mh-e* sc* vip*)
- 	(cd ${man1dir}  && rm -f emacs.1 etags.1 ctags.1)
- 	(cd ${bindir}  && rm -f emacs-${version} $(EMACS))
- 
---- man/Makefile.in.orig	Mon Apr  7 10:00:34 1997
-+++ man/Makefile.in	Mon Oct 13 17:08:15 1997
-@@ -11,11 +11,11 @@
- 
- 
- # The makeinfo program is part of the Texinfo distribution.
--MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \
--	       ../info/ediff ../info/forms ../info/gnus ../info/info \
-+	       ../info/ediff ../info/forms ../info/gnus \
- 	       ../info/mh-e ../info/sc ../info/vip ../info/viper \
--	       ../info/message ../info/custom ../info/widget
-+	       ../info/message ../info/customize ../info/widget
- DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \
- 		 gnus.dvi mh-e.dvi sc.dvi vip.dvi viper.dvi message.dvi \
- 		 customize.dvi widget.dvi
-@@ -67,6 +67,7 @@
- 	${srcdir}/gnu1.texi \
- 	${srcdir}/glossary.texi
- 
-+all: info
- info: $(INFO_TARGETS)
- 
- dvi: $(DVI_TARGETS)
-@@ -76,12 +77,6 @@
- # to exist in the build directory.
- # In a distribution of Emacs, the Info files should be up to date.
- 
--../info/info: ${INFOSOURCES}
--	cd $(srcdir); $(MAKEINFO) --no-split info.texi
--
--info.dvi: ${INFOSOURCES}
--	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/info.texi
--
- ../info/emacs: ${EMACSSOURCES}
- 	cd $(srcdir); $(MAKEINFO) emacs.texi
- 
-@@ -143,7 +138,7 @@
- widget.dvi: widget.texi
- 	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/widget.texi
- 
--../info/custom: customize.texi
-+../info/customize: customize.texi
- 	cd $(srcdir); $(MAKEINFO) customize.texi
- customize.dvi: customize.texi
- 	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/customize.texi
-@@ -151,7 +146,7 @@
- ../etc/GNU: gnu1.texi gnu.texi
- 	makeinfo --no-headers -o ../etc/GNU gnu1.texi
- 
--../info/viper: viper.texi viper-cmd.texi
-+../info/viper: viper.texi
- 	cd $(srcdir); $(MAKEINFO) viper.texi
- viper.dvi: viper.texi viper-cmd.texi
- 	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/viper.texi
diff --git a/editors/emacs20/files/patch-ag b/editors/emacs20/files/patch-ag
new file mode 100644
index 000000000000..900a101aafaa
--- /dev/null
+++ b/editors/emacs20/files/patch-ag
@@ -0,0 +1,19 @@
+--- man/Makefile.in.orig	Sat May 16 15:00:22 1998
++++ man/Makefile.in	Sun Aug 23 00:27:15 1998
+@@ -11,7 +11,7 @@
+ 
+ 
+ # The makeinfo program is part of the Texinfo distribution.
+-MAKEINFO = makeinfo
++MAKEINFO = makeinfo --no-split
+ INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/customize \
+ 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
+ 		../info/info ../info/message ../info/mh-e ../info/reftex \
+@@ -70,6 +70,7 @@
+ 	${srcdir}/glossary.texi \
+ 	${srcdir}/ack.texi
+ 
++all: info
+ info: $(INFO_TARGETS)
+ 
+ dvi: $(DVI_TARGETS)
diff --git a/editors/emacs20/files/patch-ah b/editors/emacs20/files/patch-ah
new file mode 100644
index 000000000000..2a9dc425ebc6
--- /dev/null
+++ b/editors/emacs20/files/patch-ah
@@ -0,0 +1,20 @@
+--- lib-src/Makefile.in.orig	Sat Aug  1 20:22:55 1998
++++ lib-src/Makefile.in	Mon Aug 31 21:11:22 1998
+@@ -278,7 +278,7 @@
+         if [ `(cd ${archlibdir} && /bin/pwd)` \
+              != `(cd ${srcdir} && /bin/pwd)` ]; then \
+ 	  for file in ${SCRIPTS}; do \
+-	    $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \
++	    $(INSTALL_SCRIPT) ${srcdir}/$$file ${archlibdir}/$$file; \
+ 	  done ; \
+ 	fi
+ 
+@@ -290,7 +290,7 @@
+ 	  chmod a+rx ${bindir}/$${file}; \
+ 	done
+ 	for file in ${INSTALLABLE_SCRIPTS} ; do \
+-	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
++	  $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file} ; \
+ 	  chmod a+rx ${bindir}/$${file}; \
+ 	done
+