emacs/emacs-22.0.99.dif

--- .pkgextract
+++ .pkgextract	2007-05-15 18:47:54.250121000 +0200
@@ -0,0 +1,13 @@
+patch -s -p0 --suffix=.axp   < ../emacs-22.0.99-linkscr.patch
+patch -s -p0 --suffix=.glibc < ../emacs-22.0.99-glibc.patch
+patch -s -p0 --suffix=.decl  < ../emacs-22.0.99-decl.dif
+patch -s -p0 --suffix=.print < ../emacs-21.1-asian-print.patch
+patch -s -p0 --suffix=.psbdf < ../emacs-22.0.99-ps-bdf.patch
+patch -s -p0 --suffix=.ppc64 < ../emacs-22.0.99-ppc64.patch
+patch -s -p0 --suffix=.psmu  < ../emacs-22.0.99-ps-mule.patch
+patch -s -p0 --suffix=.nvoid < ../emacs-22.0.99-nonvoid.patch
+patch -s -p0 --suffix=.snd   < ../emacs-22.0.99-sendmail-path.patch
+patch -s -p0 --suffix=.gcc4  < ../emacs-22.0.99-sentinel.patch
+patch -s -p0 --suffix=.xim   < ../emacs-22.0.99-xim.patch
+patch -s -p0 --suffix=.x11r7 < ../emacs-22.0.99-x11r7.patch
+patch -s -p0 --suffix=.s390x < ../emacs-22.0.99-s390x.dif
--- Makefile.in
+++ Makefile.in	2007-05-16 11:50:24.711789000 +0200
@@ -384,10 +384,8 @@ install-arch-dep: mkdir
 	    exec_prefix=${exec_prefix} bindir=${bindir} \
 	    libexecdir=${libexecdir} archlibdir=${archlibdir} \
 	    INSTALL_STRIP=${INSTALL_STRIP})
-	${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL)
-	-chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL)
-	rm -f $(DESTDIR)${bindir}/$(EMACS)
-	-ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS)
+	${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACS)
+	-chmod 1755 $(DESTDIR)${bindir}/$(EMACS)
 	-unset CDPATH; \
 	for f in `cd lib-src && echo fns-*.el`; do \
 	  if test -r lib-src/$$f ; then \
@@ -525,15 +523,19 @@ install-arch-indep: mkdir info
 	  for elt in $(INFO_FILES); do \
 	    (cd $${thisdir}; \
 	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
+	     chmod a+r $(DESTDIR)${infodir}/$$elt; \
+	     gzip -f9  $(DESTDIR)${infodir}/$$elt; \
 	  done; \
 	else true; fi
 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
 	thisdir=`/bin/pwd`; \
 	cd ${srcdir}/etc; \
-	for page in emacs emacsclient etags ctags ; do \
+	cp ctags.1 gnuctags.1; \
+	for page in emacs emacsclient ; do \
 	  (cd $${thisdir}; \
 	   ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \
 	   chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \
+	   gzip -f9  $(DESTDIR)${man1dir}/$${page}${manext}; \
 	done
 
 ### Install LEIM files.  Although they are machine-independent, we
@@ -595,8 +597,8 @@ uninstall:
 	      rm -f $$f; \
 	    done; \
 	  done;)
-	(cd $(DESTDIR)${man1dir}  && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext})
-	(cd $(DESTDIR)${bindir}  && rm -f $(EMACSFULL) $(EMACS))
+	(cd $(DESTDIR)${man1dir}  && rm -f emacs${manext} emacsclient${manext})
+	(cd $(DESTDIR)${bindir}  && rm -f $(EMACS))
 
 
 FRC:
--- configure.in
+++ configure.in	2007-05-15 18:49:52.630666000 +0200
@@ -363,11 +363,11 @@ dnl see the `changequote' comment above.
     esac
   ;;
 
-  alpha*-*-linux-gnu* )
+  alpha*-*-linux* )
     machine=alpha opsys=gnu-linux
   ;;
 
-  arm*-*-linux-gnu* )
+  arm*-*-linux* )
     machine=arm opsys=gnu-linux
   ;;
 
@@ -646,7 +646,7 @@ dnl see the `changequote' comment above.
     CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
   ;;
 
-  hppa*-*-linux-gnu* )
+  hppa*-*-linux* )
     machine=hp800 opsys=gnu-linux
   ;;
 
@@ -666,6 +666,11 @@ dnl see the `changequote' comment above.
     machine=hp800 opsys=nextstep
   ;;
 
+  ## HP 9000 series 700 and 800, running Linux
+  hppa*-*-linux* )
+    machine=hp800 opsys=gnu-linux
+  ;;
+
   ## Orion machines
   orion-orion-bsd* )
     machine=orion opsys=bsd4-2
@@ -684,10 +689,10 @@ dnl see the `changequote' comment above.
   i370-ibm-aix*)
     machine=ibm370aix opsys=usg5-3
   ;;
-  s390-*-linux-gnu* )
+  s390-*-linux* )
     machine=ibms390 opsys=gnu-linux
   ;;
-  s390x-*-linux-gnu* )
+  s390x-*-linux* )
     machine=ibms390x opsys=gnu-linux
   ;;
   rs6000-ibm-aix3.1* | powerpc-ibm-aix3.1*  )
@@ -970,7 +975,7 @@ dnl see the `changequote' comment above.
   ;;
 
   ## Suns
-  sparc-*-linux-gnu* | sparc64-*-linux-gnu* )
+  sparc-*-linux* | sparc64-*-linux* )
     machine=sparc opsys=gnu-linux
   ;;
 
@@ -1152,7 +1157,7 @@ dnl see the `changequote' comment above.
       *-esix5* )		opsys=esix5r4; NON_GNU_CPP=/usr/lib/cpp ;;
       *-esix* )			opsys=esix ;;
       *-xenix* )		opsys=xenix ;;
-      *-linux-gnu* )		opsys=gnu-linux ;;
+      *-linux* )		opsys=gnu-linux ;;
       *-sco3.2v4* )		opsys=sco4 ; NON_GNU_CPP=/lib/cpp  ;;
       *-sco3.2v5* )		opsys=sco5
 				NON_GNU_CPP=/lib/cpp
@@ -1170,12 +1175,12 @@ dnl see the `changequote' comment above.
   ;;
 
   ## m68k Linux-based GNU system
-  m68k-*-linux-gnu* )
+  m68k-*-linux* )
     machine=m68k opsys=gnu-linux
   ;;
 
   ## Mips Linux-based GNU system
-  mips-*-linux-gnu* | mipsel-*-linux-gnu* )
+  mips-*-linux* | mipsel-*-linux* )
     machine=mips opsys=gnu-linux
   ;;
 
@@ -1192,12 +1197,12 @@ dnl see the `changequote' comment above.
   ;;
 
   ## AMD x86-64 Linux-based GNU system
-  x86_64-*-linux-gnu* )
+  x86_64-*-linux* )
     machine=amdx86-64 opsys=gnu-linux
   ;;
 
   ## Tensilica Xtensa Linux-based GNU system    
-  xtensa-*-linux-gnu* )
+  xtensa-*-linux* )
     machine=xtensa opsys=gnu-linux
     ;;
 
@@ -1214,7 +1219,7 @@ esac
 ### above.
 if test x"${opsys}" = x; then
   case "${canonical}" in
-    *-gnu* )				opsys=gnu ;;
+    ** )				opsys=gnu ;;
     *-bsd4.[01] )			opsys=bsd4-1 ;;
     *-bsd4.2 )				opsys=bsd4-2 ;;
     *-bsd4.3 )				opsys=bsd4-3 ;;
@@ -1520,7 +1525,7 @@ AC_SYS_LARGEFILE
 ### The standard library on x86-64 GNU/Linux distributions can 
 ### be located in either /usr/lib64 or /usr/lib.
 case "${canonical}" in
-  x86_64-*-linux-gnu* )
+  x86_64-*-linux* )
     if test -d /usr/lib64; then
       AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1,
         [Define to 1 if the file /usr/lib64 exists.])
--- etc/MACHINES
+++ etc/MACHINES	2007-05-15 18:50:36.035268000 +0200
@@ -74,7 +74,7 @@ Alliant FX/2800 (i860-alliant-bsd)
 
   Known to work with 19.26 and OS version 2.2, compiler version 1.3.
 
-Alpha (DEC) running OSF/1 or GNU/Linux (alpha-dec-osf1, alpha-dec-linux-gnu)
+Alpha (DEC) running OSF/1 or Linux (alpha-dec-osf1, alpha-dec-linux)
 
   For OSF/1 (aka Digital Unix) version 4.0, update 386,
   it is reported that you need to run configure this way:
@@ -617,7 +617,7 @@ IBM RT/PC (romp-ibm-bsd or romp-ibm-aix)
 
   window.c must not be compiled with -O on AIX.
 
-IBM System/390 running GNU/Linux (s390-*-linux-gnu)
+IBM System/390 running GNU/Linux (s390-*-linux)
 
   As of Emacs 21.2, a 31-bit only version is supported on this
   system.
@@ -639,7 +639,7 @@ Integrated Solutions `Optimum V' (m68k-i
   indicates the Umax operating system).
 
 Intel 386 (i386-*-isc, 		i386-*-esix,	 i386-*-bsdi2,
-	   i386-*-xenix,	i386-*-freebsd,  i386-*-linux-gnu,
+	   i386-*-xenix,	i386-*-freebsd,  i386-*-linux,
 	   i386-*-sol2.4,	i386-*-sysv3,    i386-intsys-sysv,
 	   i386-*-sysv4,	i386-*-sysv4.2,
 	   i386-*-sysv5.3,	i386-*-bsd4.2,   i386-*-cygwin,
@@ -655,7 +655,7 @@ Intel 386 (i386-*-isc, 		i386-*-esix,	 i
 	version number - for example, if you're running ISC 3.0, use
 	i386-unknown-isc3.0 as your configuration name.
   Use i386-*-esix for Esix; Emacs runs as of version 19.6.
-  Use i386-*-linux-gnu for GNU/Linux systems; Emacs runs as of version 19.26.
+  Use i386-*-linux for GNU/Linux systems; Emacs runs as of version 19.26.
   Use i386-*-cygwin for Cygwin; Emacs builds as of version 22.1, in both X11
   and non-X11 modes.  (The Cygwin site has source and binaries for 21.2.)
   Use i386-intsys-sysv for Integrated Solutions 386 machines.
@@ -1018,7 +1018,7 @@ Stride (m68k-stride-sysv)
 
 Sun 3, Sun 4 (sparc), Sun 386 (m68k-sun-sunos, sparc-sun-sunos, i386-sun-sunos,
 			       sparc-sun-sunos4.1.3noshr, sparc-sun-solaris2.*,
-			       i386-sun-solaris2.*, sparc*-*-linux-gnu)
+			       i386-sun-solaris2.*, sparc*-*-linux)
 
   To build a 32-bit Emacs (i.e. if you are having any sort of problem
   bootstrapping a 64-bit version), you can use the Sun Studio compiler
@@ -1479,7 +1479,7 @@ X86_64 GNU/Linux
   build a 32-bit Emacs, first ensure that the necessary 32-bit system
   libraries and include files are installed.  Then use:
 
-    env CC="gcc -m32" ./configure --build=i386-linux-gnu \
+    env CC="gcc -m32" ./configure --build=i386-linux \
       --x-libraries=/usr/X11R6/lib
 
   (using the location of the 32-bit X libraries on your system).
--- etc/etags.1
+++ etc/etags.1	2007-05-15 18:52:17.870077000 +0200
@@ -9,7 +9,7 @@
 ..
 
 .SH NAME
-etags, ctags \- generate tag file for Emacs, vi
+etags, gnuctags \- generate tag file for Emacs, vi
 .SH SYNOPSIS
 .hy 0
 .na
@@ -26,7 +26,7 @@ etags, ctags \- generate tag file for Em
 [\|\-\-help\|] [\|\-\-version\|]
 \fIfile\fP .\|.\|.
 
-\fBctags\fP [\|\-aCdgIRVh\|] [\|\-BtTuvwx\|] [\|\-l \fIlanguage\fP\|]
+\fBgnuctags\fP [\|\-aCdgIRVh\|] [\|\-BtTuvwx\|] [\|\-l \fIlanguage\fP\|]
 .if n .br
 [\|\-o \fItagfile\fP\|] [\|\-r \fIregexp\fP\|]
 [\|\-\-parse\-stdin=\fIfile\fP\|]
@@ -46,7 +46,7 @@ etags, ctags \- generate tag file for Em
 The \|\fBetags\fP\| program is used to create a tag table file, in a format
 understood by
 .BR emacs ( 1 )\c
-\&; the \|\fBctags\fP\| program is used to create a similar table in a
+\&; the \|\fBgnuctags\fP\| program is used to create a similar table in a
 format understood by
 .BR vi ( 1 )\c
 \&.  Both forms of the program understand
@@ -56,7 +56,7 @@ Python, Prolog, Scheme and
 most assembler\-like syntaxes.
 Both forms read the files specified on the command line, and write a tag
 table (defaults: \fBTAGS\fP for \fBetags\fP, \fBtags\fP for
-\fBctags\fP) in the current working directory.
+\fBgnuctags\fP) in the current working directory.
 Files specified with relative file names will be recorded in the tag
 table with file names relative to the directory where the tag table
 resides.  If the tag table is in /dev, however, the file names are made
@@ -71,7 +71,7 @@ parsing of the file names following the 
 language, overriding guesses based on filename extensions.
 .SH OPTIONS
 Some options make sense only for the \fBvi\fP style tag files produced
-by ctags;
+by gnuctags;
 \fBetags\fP does not recognize them.
 The programs accept unambiguous abbreviations for long option names.
 .TP
@@ -85,7 +85,7 @@ expression search instructions; the \fB\
 the delimiter `\|\fB?\fP\|', to search \fIbackwards\fP through files.
 The default is to use the delimiter `\|\fB/\fP\|', to search \fIforwards\fP
 through files.
-Only \fBctags\fP accepts this option.
+Only \fBgnuctags\fP accepts this option.
 .TP
 .B \-\-declarations
 In C and derived languages, create tags for function declarations,
@@ -94,24 +94,24 @@ and create tags for extern variables unl
 .B \-d, \-\-defines
 Create tag entries for C preprocessor constant definitions
 and enum constants, too.  Since this is the default behavior of
-\fBetags\fP, only \fBctags\fP accepts this option.
+\fBetags\fP, only \fBgnuctags\fP accepts this option.
 .TP
 .B \-D, \-\-no\-defines
 Do not create tag entries for C preprocessor constant definitions
 and enum constants.
 This may make the tags file much smaller if many header files are tagged.
-Since this is the default behavior of \fBctags\fP, only \fBetags\fP
+Since this is the default behavior of \fBgnuctags\fP, only \fBetags\fP
 accepts this option.
 .TP
 .B \-\-globals
 Create tag entries for global variables in C, C++, Objective C, Java,
 and Perl.
-Since this is the default behavior of \fBetags\fP, only \fBctags\fP
+Since this is the default behavior of \fBetags\fP, only \fBgnuctags\fP
 accepts this option.
 .TP
 .B \-\-no\-globals
 Do not tag global variables.  Typically this reduces the file size by
-one fourth.  Since this is the default behavior of \fBctags\fP, only
+one fourth.  Since this is the default behavior of \fBgnuctags\fP, only
 \fBetags\fP accepts this option.
 .TP
 \fB\-i\fP \fIfile\fP, \fB\-\-include=\fIfile\fP
@@ -138,7 +138,7 @@ Create tag entries for variables that ar
 constructs in C++, Objective C, Java.  This is the default for etags.
 .TP
 .B \-\-no\-members
-Do not tag member variables.  This is the default for ctags.
+Do not tag member variables.  This is the default for gnuctags.
 .TP
 .B \-\-packages\-only
 Only tag packages in Ada files.
@@ -168,7 +168,7 @@ the previous ones.  The regexps are of o
 where \fItagregexp\fP is used to match the tag.  It should not match
 useless characters.  If the match is such that more characters than
 needed are unavoidably matched by \fItagregexp\fP, it may be useful to
-add a \fInameregexp\fP, to narrow down the tag scope.  \fBctags\fP
+add a \fInameregexp\fP, to narrow down the tag scope.  \fBgnuctags\fP
 ignores regexps without a \fInameregexp\fP.  The syntax of regexps is
 the same as in emacs.  The following character escape sequences are
 supported: \\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which
@@ -243,12 +243,12 @@ freely intermixed with filenames and the
 .TP
 .B \-t, \-\-typedefs
 Record typedefs in C code as tags.  Since this is the default behavior
-of \fBetags\fP, only \fBctags\fP accepts this option.
+of \fBetags\fP, only \fBgnuctags\fP accepts this option.
 .TP
 .B \-T, \-\-typedefs\-and\-c++
 Generate tag entries for typedefs, struct, enum, and union tags, and
 C++ member functions.  Since this is the default behavior
-of \fBetags\fP, only \fBctags\fP accepts this option.
+of \fBetags\fP, only \fBgnuctags\fP accepts this option.
 .TP
 .B \-u, \-\-update
 Update tag entries for \fIfiles\fP specified on command line, leaving
@@ -256,15 +256,15 @@ tag entries for other files in place.  C
 by deleting the existing entries for the given files and then
 rewriting the new entries at the end of the tags file.  It is often
 faster to simply rebuild the entire tag file than to use this.
-Only \fBctags\fP accepts this option.
+Only \fBgnuctags\fP accepts this option.
 .TP
 .B \-v, \-\-vgrind
 Instead of generating a tag file, write index (in \fBvgrind\fP format)
-to standard output.  Only \fBctags\fP accepts this option.
+to standard output.  Only \fBgnuctags\fP accepts this option.
 .TP
 .B \-x, \-\-cxref
 Instead of generating a tag file, write a cross reference (in
-\fBcxref\fP format) to standard output.  Only \fBctags\fP accepts this option.
+\fBcxref\fP format) to standard output.  Only \fBgnuctags\fP accepts this option.
 .TP
 .B \-h, \-H, \-\-help
 Print usage information.  Followed by one or more \-\-language=LANG
--- leim/Makefile.in
+++ leim/Makefile.in	2007-05-22 15:58:18.686951000 +0200
@@ -216,6 +216,9 @@ leim-list.el: ${SUBDIRS} ${TIT-MISC} cha
 	fi
 	sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
 
+${WORLD}: %.elc: %.el
+	${RUN-EMACS} -f batch-byte-compile $<
+
 install: all
 	if [ ! -d ${INSTALLDIR} ] ; then \
           ${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \
--- lib-src/Makefile.in
+++ lib-src/Makefile.in	2007-05-15 18:54:25.327601000 +0200
@@ -106,7 +106,7 @@ INSTALL_STRIP =
 
 # Things that a user might actually run,
 # which should be installed in bindir.
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT}
+INSTALLABLES = emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT}
 INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
@@ -427,8 +427,8 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(
 
 /* We depend on etags to assure that parallel makes don\'t write two
    etags.o files on top of each other.  */
-ctags${EXEEXT}: etags${EXEEXT}
-	$(CC) ${ETAGS_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
+gnuctags${EXEEXT}: etags${EXEEXT}
+	$(CC) ${ETAGS_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o gnuctags
 
 profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
 	$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
--- lib-src/vcdiff
+++ lib-src/vcdiff	2003-07-23 18:08:55.000000000 +0200
@@ -74,6 +74,17 @@ esac
 
 
 rev1= rev2= status=0
+rev1=/tmp/geta$$
+rev2=/tmp/getb$$
+rm -f $rev1 $rev2
+if test -e $rev1 -o -e $rev2 ; then
+	echo "$0: temporaray files exists." 1>&2
+	exit 1
+fi
+if test -n "`type -p mktemp`" ; then
+	rev1="`mktemp ${rev1}.XXXXXX`" || exit 1
+	rev2="`mktemp ${rev2}.XXXXXX`" || exit 1
+fi
 trap 'status=2; exit' 1 2 13 15
 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
 
@@ -84,14 +95,12 @@ do
 	case $f in
 	s.* | */s.*)
 		if
-			rev1=/tmp/geta$$
 			get -s -p -k $sid1 "$f" > $rev1 &&
 			case $sid2 in
 			'')
 				workfile=`expr " /$f" : '.*/s.\(.*\)'`
 				;;
 			*)
-				rev2=/tmp/getb$$
 				get -s -p -k $sid2 "$f" > $rev2
 				workfile=$rev2
 			esac
--- lisp/bookmark.el
+++ lisp/bookmark.el	2003-07-23 18:08:55.000000000 +0200
@@ -1905,7 +1905,10 @@ With a prefix arg, prompts for a file to
 (defun bookmark-bmenu-other-window ()
   "Select this line's bookmark in other window, leaving bookmark menu visible."
   (interactive)
-  (let ((bookmark (bookmark-bmenu-bookmark)))
+  (let ((bookmark (bookmark-bmenu-bookmark))
+	(pop-up-windows t)
+	same-window-buffer-names 
+	same-window-regexps)
     (if (bookmark-bmenu-check-position)
 	(let* ((pair (bookmark-jump-noselect bookmark))
                (buff (car pair))
--- lisp/cmuscheme.el
+++ lisp/cmuscheme.el	2003-07-23 18:08:55.000000000 +0200
@@ -256,7 +256,8 @@ is run).
 			 (read-string "Run Scheme: " scheme-program-name)
 			 scheme-program-name)))
   (if (not (comint-check-proc "*scheme*"))
-      (let ((cmdlist (scheme-args-to-list cmd)))
+      (let ((cmdlist (scheme-args-to-list cmd))
+	     process-connection-type)
 	(set-buffer (apply 'make-comint "scheme" (car cmdlist)
 			   (scheme-start-file (car cmdlist)) (cdr cmdlist)))
 	(inferior-scheme-mode)))
--- lisp/dired.el
+++ lisp/dired.el	2007-05-15 18:55:29.522418000 +0200
@@ -70,7 +70,7 @@ If nil, `dired-listing-switches' is used
 
 ;;;###autoload
 (defvar dired-chown-program
-  (if (memq system-type '(hpux dgux usg-unix-v irix linux gnu/linux cygwin))
+  (if (memq system-type '(hpux dgux usg-unix-v irix gnu/linux linux lignux cygwin))
       "chown"
     (if (file-exists-p "/usr/sbin/chown")
 	"/usr/sbin/chown"
--- lisp/help.el
+++ lisp/help.el	2007-05-15 18:57:08.520930000 +0200
@@ -38,6 +38,9 @@
 (add-hook 'temp-buffer-setup-hook 'help-mode-setup)
 (add-hook 'temp-buffer-show-hook 'help-mode-finish)
 
+(defvar help-mode-hook nil
+    "Normal hook run when entering Help mode.")
+
 (defvar help-map
   (let ((map (make-sparse-keymap)))
     (define-key map (char-to-string help-char) 'help-for-help)
--- lisp/ldefs-boot.el
+++ lisp/ldefs-boot.el	2007-05-15 18:58:09.723427000 +0200
@@ -6862,7 +6862,7 @@ some of the `ls' switches are not suppor
 
 (custom-autoload (quote dired-listing-switches) "dired" t)
 
-(defvar dired-chown-program (if (memq system-type (quote (hpux dgux usg-unix-v irix linux gnu/linux cygwin))) "chown" (if (file-exists-p "/usr/sbin/chown") "/usr/sbin/chown" "/etc/chown")) "\
+(defvar dired-chown-program (if (memq system-type (quote (hpux dgux usg-unix-v irix gnu/linux linux lignux cygwin))) "chown" (if (file-exists-p "/usr/sbin/chown") "/usr/sbin/chown" "/etc/chown")) "\
 Name of chown command (usually `chown' or `/etc/chown').")
 
 (defvar dired-ls-F-marks-symlinks nil "\
--- lisp/site-load.el
+++ lisp/site-load.el	2003-07-23 18:08:56.000000000 +0200
@@ -0,0 +1,79 @@
+;;;;
+;;; emacs20.xx/lisp/site-load.el
+;;; Copyright (c) 1995,96,98,99 SuSE Gmbh Nuernberg, Germany.  All rights reserved.
+;;;
+;;; Autor: Werner Fink  <werner@suse.de>, No warranty of any kind
+;;;;
+;; CONFIGURATION (under bash):
+;; (export CC=gcc; \
+;;  export CFLAGS="-O2 $(arch dependent flags) -pipe \
+;;          -DSYSTEM_PURESIZE_EXTRA=25000 -DSITELOAD_PURESIZE_EXTRA=10000" ; \
+;;  ./configure $(arch)-suse-linux --with-x --with-x-toolkit=lucid \
+;;              --with-gcc --with-pop --with-system-malloc --prefix=/usr \
+;;		--exec-prefix=/usr \
+;;              --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib )
+;;
+;; include bug fixes you have
+;;
+;; MAKE:
+;;   make LDFLAGS=-s CC=gcc CFLAGS="-O2 $(arch dependent flags) -pipe \
+;;    -DSYSTEM_PURESIZE_EXTRA=25000 -DSITELOAD_PURESIZE_EXTRA=10000"
+;;
+;; DOC:
+;;   lisp/emacs-lisp/backquote.elc lisp/disp-table.elc lisp/delsel.elc
+;;   lisp/lpr.elc added to src/Makefile.in for DOCumentation
+;;
+;;;;
+(garbage-collect)
+
+(if (fboundp 'delete-frame)
+    (progn
+      (garbage-collect) ; Erg"anzt
+      (load "emacs-lisp/backquote"); Erg"anzt
+    ))
+
+(garbage-collect)
+
+(load "delsel")    ; Erg"anzt
+(garbage-collect)  ; Erg"anzt
+(load "disp-table"); Erg"anzt
+(garbage-collect)  ; Erg"anzt
+(load "lpr")       ; Erg"anzt
+; Apsfilter setzt den Kopf, apsfilter is setting the header
+(setq lpr-headers-switches (list "-h"))
+(setq lpr-add-switches t)
+
+;; Scrollbar was always on the `right' side
+(custom-set-variables '(scroll-bar-mode (quote right)))
+
+(garbage-collect)
+;; Nur innerhalb von term/funct-keys.el im `site-lisp'-Pfad
+;; voll wirksam
+;(standard-display-european 1)
+;(set-input-mode (car   (current-input-mode))
+;                (nth 1 (current-input-mode))
+;                  0
+;                (nth 3 (current-input-mode)))
+;
+(garbage-collect)
+
+(transient-mark-mode 1)
+;; Overwrite `load delsel'
+;; Choose `t' in your ~/.emacs
+(delete-selection-mode nil)
+(custom-set-variables '(delete-selection-mode nil))
+(setq mark-even-if-inactive t)
+
+(garbage-collect)
+
+(setq news-inews-program "/usr/lib/news/inews")
+(setq gnus-default-nntp-server "news")
+(defvar gnus-local-domain nil)
+
+(garbage-collect)
+(garbage-collect)
+(garbage-collect)
+(garbage-collect)
+(garbage-collect)
+
+;;; site-load.el ends here
--- lisp/speedbar.el
+++ lisp/speedbar.el	2003-07-23 18:08:56.000000000 +0200
@@ -793,6 +793,7 @@ to toggle this value.")
 
   ;; navigation
   (define-key speedbar-key-map "n" 'speedbar-next)
+  (define-key speedbar-key-map [tab] 'speedbar-next)
   (define-key speedbar-key-map "p" 'speedbar-prev)
   (define-key speedbar-key-map "\M-n" 'speedbar-restricted-next)
   (define-key speedbar-key-map "\M-p" 'speedbar-restricted-prev)
--- lisp/international/mule-cmds.el
+++ lisp/international/mule-cmds.el	2003-07-23 18:08:56.000000000 +0200
@@ -45,6 +45,7 @@
 ;; Keep "C-x C-m ..." for mule specific commands.
 (define-key ctl-x-map "\C-m" mule-keymap)
 
+(define-key mule-keymap "m" 'toggle-enable-multibyte-characters)
 (define-key mule-keymap "f" 'set-buffer-file-coding-system)
 (define-key mule-keymap "r" 'revert-buffer-with-coding-system)
 (define-key mule-keymap "F" 'set-file-name-coding-system)
--- lisp/mh-e/mh-e.el
+++ lisp/mh-e/mh-e.el	2007-05-21 14:27:40.379538854 +0200
@@ -143,6 +143,9 @@
     "/usr/local/mh/"
     "/usr/bin/mh/"                      ; Ultrix 4.2, Linux
     "/usr/new/mh/"                      ; Ultrix < 4.2
+    "/usr/bin/"				; SuSE Linux
+    "/etc/nmh/"				; SuSE Linux
+    "/usr/lib/nmh/"			; SuSE Linux
     "/usr/contrib/mh/bin/"              ; BSDI
     "/usr/pkg/bin/"                     ; NetBSD
     "/usr/local/bin/"
@@ -163,20 +166,20 @@ Use the function `mh-variants' instead."
 This differs from `mh-variant' when the latter is set to
 \"autodetect\".")
 
-(defvar mh-progs nil
+(defvar mh-progs "/usr/bin/"
   "Directory containing MH commands, such as inc, repl, and rmm.")
 
 ;;;###autoload
 (put 'mh-progs 'risky-local-variable t)
 
-(defvar mh-lib nil
+(defvar mh-lib "/etc/nmh/"
   "Directory containing the MH library.
 This directory contains, among other things, the components file.")
 
 ;;;###autoload
 (put 'mh-lib 'risky-local-variable t)
 
-(defvar mh-lib-progs nil
+(defvar mh-lib-progs "/usr/lib/nmh/"
   "Directory containing MH helper programs.
 This directory contains, among other things, the mhl program.")
 
--- lisp/net/ange-ftp.el
+++ lisp/net/ange-ftp.el	2003-07-23 18:08:56.000000000 +0200
@@ -4873,7 +4873,7 @@ NEWNAME should be the name to give the n
 ;  "If a host matches this regexp then it is assumed to be running VOS.")
 ;
 ;(defun ange-ftp-vos-host (host)
-;  (and ange-ftp-vos-host-regexp
+;  (and host ange-ftp-vos-host-regexp
 ;       (save-match-data
 ;	 (string-match ange-ftp-vos-host-regexp host))))
 ;
@@ -4984,7 +4984,7 @@ NEWNAME should be the name to give the n
 
 ;; Return non-nil if HOST is running VMS.
 (defun ange-ftp-vms-host (host)
-  (and ange-ftp-vms-host-regexp
+  (and host ange-ftp-vms-host-regexp
        (save-match-data
 	 (string-match ange-ftp-vms-host-regexp host))))
 
@@ -5493,7 +5493,7 @@ Other orders of $ and _ seem to all work
 
 ;; Return non-nil if HOST is running MTS.
 (defun ange-ftp-mts-host (host)
-  (and ange-ftp-mts-host-regexp
+  (and host ange-ftp-mts-host-regexp
        (save-match-data
 	 (string-match ange-ftp-mts-host-regexp host))))
 
@@ -5692,7 +5692,7 @@ Other orders of $ and _ seem to all work
 
 ;; Return non-nil if HOST is running CMS.
 (defun ange-ftp-cms-host (host)
-  (and ange-ftp-cms-host-regexp
+  (and host ange-ftp-cms-host-regexp
        (save-match-data
 	 (string-match ange-ftp-cms-host-regexp host))))
 
--- lisp/obsolete/uncompress.el
+++ lisp/obsolete/uncompress.el	2003-07-23 18:08:56.000000000 +0200
@@ -74,12 +74,7 @@ It then selects a major mode from the un
           (set-visited-file-name
            (concat (substring buffer-file-name 0 (match-beginning 0)) ".tar")))))
   (message "Uncompressing...")
-  (let ((buffer-read-only nil)
-	(coding-system-for-write 'no-conversion)
-	(coding-system-for-read
-	 (car (find-operation-coding-system
-	       'insert-file-contents
-	       buffer-file-name t))))
+  (let ((buffer-read-only nil))
     (shell-command-on-region (point-min) (point-max) uncompress-program t))
   (goto-char (point-min))
   (message "Uncompressing...done")
@@ -102,9 +97,7 @@ It then selects a major mode from the un
 	(progn
 	  (insert-file-contents buffer-file-name t)
 	  (goto-char (point-min))
-	  ;; No need for this, because error won't be set to t
-	  ;; if this function returns t.
-	  ;; (setq error nil)
+	  (setq error nil)
 	  t))))
 
 (message "The uncompress package is obsolete; use M-x auto-compression-mode")
--- lisp/textmodes/ispell.el
+++ lisp/textmodes/ispell.el	2007-05-22 10:48:36.408268131 +0200
@@ -305,8 +305,11 @@ Must be greater than 1."
   :group 'ispell)
 
 (defcustom ispell-program-name
-  (or (locate-file "aspell" exec-path exec-suffixes 'file-executable-p)
-      "ispell")
+  (progn
+    (if (and (functionp 'append-ispell-dict-alist))
+	"ispell"
+      (or (locate-file "aspell" exec-path exec-suffixes 'file-executable-p)
+	"ispell")))
   "Program invoked by \\[ispell-word] and \\[ispell-region] commands."
   :type 'string
   :group 'ispell)
@@ -519,7 +522,7 @@ re-start Emacs."
 
 ;;; First part of dictionary, shortened for loaddefs.el
 ;;;###autoload
-(setq
+(defvar
  ispell-dictionary-alist-1
  '((nil					; default (English.aff)
     "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)
@@ -543,7 +546,7 @@ re-start Emacs."
 
 ;;; Second part of dictionary, shortened for loaddefs.el
 ;;;###autoload
-(setq
+(defvar
  ispell-dictionary-alist-2
  '(("czech"
     "[A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]"
@@ -564,7 +567,7 @@ re-start Emacs."
 
 ;;; Third part of dictionary, shortened for loaddefs.el
 ;;;###autoload
-(setq
+(defvar
  ispell-dictionary-alist-3
  '(("esperanto"
     "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]"
@@ -587,7 +590,7 @@ re-start Emacs."
 
 ;;; Fourth part of dictionary, shortened for loaddefs.el
 ;;;###autoload
-(setq
+(defvar
  ispell-dictionary-alist-4
  '(("german"				; german.aff
     "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1)
@@ -611,7 +614,7 @@ re-start Emacs."
 
 ;;; Fifth part of dictionary, shortened for loaddefs.el
 ;;;###autoload
-(setq
+(defvar
  ispell-dictionary-alist-5
  '(("norsk"				; 8 bit Norwegian mode
     "[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]"
@@ -632,7 +635,7 @@ re-start Emacs."
 
 ;;; Sixth part of dictionary, shortened for loaddefs.el
 ;;;###autoload
-(setq
+(defvar
  ispell-dictionary-alist-6
  ;; include Russian iso coding system too?
  ;;   "[']" t ("-d" "russian") "~latin1" iso-8859-1
@@ -1046,6 +1049,56 @@ The variable `ispell-library-directory' 
 (if ispell-menu-map-needed
     (progn
       (setq ispell-menu-map (make-sparse-keymap "Spell"))
+      ;; Begin adding list for ispell dictonaries installed on SuSE
+      (if (and (functionp 'append-ispell-dict-alist)
+	       (symbolp 'ispell-program-name)
+	       (string-match "ispell" ispell-program-name))
+	(let ((dicts (reverse (cons (cons "default" nil)
+		       (append ispell-local-dictionary-alist ispell-dictionary-alist))))
+	      (path (and (boundp 'ispell-library-path) ispell-library-path))
+	      name load-dict)
+	  (dolist (dict dicts)
+	    (setq name (car dict)
+		  load-dict (car (cdr (member "-d" (nth 5 dict)))))
+	    (cond ((not (stringp name))
+		   (define-key ispell-menu-map (vector 'default)
+		     (cons "Select Default Dict"
+			   (cons "Dictionary for which Ispell was configured"
+				 (list 'lambda () '(interactive)
+				       (list 'ispell-change-dictionary "default"))))))
+		  ((or (not path)           ; load all if library dir not defined
+		       (file-exists-p (concat path "/" name ".hash"))
+		       (file-exists-p (concat path "/" name ".has"))
+		       (and load-dict
+			    (or (file-exists-p(concat path "/" load-dict ".hash"))
+				(file-exists-p(concat path "/" load-dict ".has")))))
+		   (define-key ispell-menu-map (vector (intern name))
+		     (cons (concat "Select " (capitalize name) " Dict")
+			   (list 'lambda () '(interactive)
+				 (list 'ispell-change-dictionary name))))))))
+	 (if (and (functionp 'ispell-find-aspell-dictionaries)
+		  (symbolp 'ispell-program-name)
+		  (string-match "aspell" ispell-program-name))
+	     (progn
+	       (ispell-find-aspell-dictionaries)
+	       (let ((dicts (reverse (cons (cons "default" nil)
+			      (append ispell-local-dictionary-alist ispell-dictionary-alist))))
+		     name load-dict)
+		 (dolist (dict dicts)
+		   (setq name (car dict))
+		   (cond ((not (stringp name))
+			  (define-key ispell-menu-map (vector 'default)
+			    (cons "Select Default Dict"
+				  (cons "Dictionary for which Aspell was configured"
+					(list 'lambda () '(interactive)
+					      (list 'ispell-change-dictionary "default"))))))
+			 ((and (stringp name)
+			       (ispell-aspell-find-dictionary name))
+			  (define-key ispell-menu-map (vector (intern name))
+			    (cons (concat "Select " (capitalize name) " Dict")
+				  (list 'lambda () '(interactive)
+					(list 'ispell-change-dictionary name)))))))))))
+      ;; End adding list for ispell dictonaries installed on SuSE
       (define-key ispell-menu-map [ispell-change-dictionary]
 	'(menu-item "Change Dictionary..." ispell-change-dictionary
 		    :help "Supply explicit dictionary file name"))
--- site-lisp/term/func-keys.el
+++ site-lisp/term/func-keys.el	2003-07-23 18:08:56.000000000 +0200
@@ -0,0 +1,31 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/func-keys.el for site-lisp path
+;;; Copyright (c) 1996-2001 SuSE Gmbh Nuernberg, Germany.
+;;;
+;;; Author: Werner Fink  <werner@suse.de>, No warranty of any kind
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; num block
+;; kp_f1 .. kp_f4 and kp_tab not found on MF-102
+  (global-set-key [kp-f1]   esc-map) ; Escape
+  (global-set-key [kp-f2]  'undo) ; Undo
+  (global-set-key [kp-f3]  'isearch-forward) ; Search
+  (global-set-key [kp-f4]  'kill-line) ; Kill-Line
+;;
+;; Backspace, Delete and any thing else
+;;
+(if (not window-system)
+      ; Do nothing within terminals because they know about
+      nil
+  (if (fboundp 'normal-erase-is-backspace-mode)
+     (normal-erase-is-backspace-mode 1)
+    (global-set-key   [delete]      'delete-char))
+ ;(global-set-key   [delete]      '[127])
+ ;(global-unset-key [backspace])
+ ;(global-set-key   [backspace]   '[127])
+)
+;;
+;; Wheel mouse support
+;;
+(mouse-wheel-mode 1)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von func-keys.el
--- site-lisp/term/gnome.el
+++ site-lisp/term/gnome.el	2003-07-23 18:08:56.000000000 +0200
@@ -0,0 +1,97 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/gnomw.el for site-lisp path
+;;; Copyright (c) 2000 SuSE Gmbh Nuernberg, Germany.  All rights reserved.
+;;;
+;;; Author: Werner Fink  <werner@suse.de>, No warranty of any kind
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; (define-key function-key-map "\e[1~" [find])
+; (define-key function-key-map "\eOH"  [home])
+  (define-key function-key-map "\e[1~" [home])
+  (define-key function-key-map "\e[2~" [insertchar])
+  (define-key function-key-map "\e[3~" [deletechar])
+; (define-key function-key-map "\e[4~" [select])
+; (define-key function-key-map "\eOF"  [end])
+  (define-key function-key-map "\e[4~" [end])
+  (define-key function-key-map "\e[5~" [prior])
+  (define-key function-key-map "\e[6~" [next])
+  (define-key function-key-map "\e[OP" [f1])
+  (define-key function-key-map "\e[OQ" [f2])
+  (define-key function-key-map "\e[OR" [f3])
+  (define-key function-key-map "\e[OS" [f4])
+  (define-key function-key-map "\e[15~" [f5])
+  (define-key function-key-map "\e[17~" [f6])
+  (define-key function-key-map "\e[18~" [f7])
+  (define-key function-key-map "\e[19~" [f8])
+  (define-key function-key-map "\e[20~" [f9])
+  (define-key function-key-map "\e[21~" [f10])
+  (define-key function-key-map "\e[23~" [f11])
+  (define-key function-key-map "\e[24~" [f12])
+  (define-key function-key-map "\e[25~" [f13])
+  (define-key function-key-map "\e[26~" [f14])
+  (define-key function-key-map "\e[28~" [help])
+  (define-key function-key-map "\e[29~" [menu])
+  (define-key function-key-map "\e?\e[28~" [M-help])
+  (define-key function-key-map "\e?\e[29~" [M-menu])
+  (define-key function-key-map "\e[31~" [f17])
+  (define-key function-key-map "\e[32~" [f18])
+  (define-key function-key-map "\e[33~" [f19])
+  (define-key function-key-map "\e[34~" [f20])
+;;
+;; num block
+;; [home] and [end] found in num block
+; (define-key function-key-map "\eOH" [home])
+; (define-key function-key-map "\eOF" [end])
+  (define-key function-key-map "\e[1~" [home])
+  (define-key function-key-map "\e[4~" [end])
+;;
+;; Locked num block
+  (define-key function-key-map "\eOI" [kp-tab])
+  (define-key function-key-map "\eOj" [kp-multiply])
+  (define-key function-key-map "\eOk" [kp-add])
+  (define-key function-key-map "\eOl" [kp-separator])
+  (define-key function-key-map "\eOM" [kp-enter])
+  (define-key function-key-map "\eOm" [kp-subtract])
+  (define-key function-key-map "\eOn" [kp-decimal])
+; (define-key function-key-map "\eOn" [kp-period]) ; [kp-decimal]
+  (define-key function-key-map "\eOo" [kp-divide])
+  (define-key function-key-map "\eOp" [kp-0])
+  (define-key function-key-map "\eOq" [kp-1])
+  (define-key function-key-map "\eOr" [kp-2])
+  (define-key function-key-map "\eOs" [kp-3])
+  (define-key function-key-map "\eOt" [kp-4])
+  (define-key function-key-map "\eOu" [kp-5])
+  (define-key function-key-map "\eOv" [kp-6])
+  (define-key function-key-map "\eOw" [kp-7])
+  (define-key function-key-map "\eOx" [kp-8])
+  (define-key function-key-map "\eOy" [kp-9])
+;;
+;; Undefine some ESC ESC behavior --- for later use
+  (global-unset-key "\e\e")
+  (define-key esc-map "\e" nil)
+;;
+  (define-key function-key-map  "\eOD" [left])
+  (define-key function-key-map  "\eOC" [right])
+  (define-key function-key-map  "\eOA" [up])
+  (define-key function-key-map  "\eOB" [down])
+;;
+  (define-key function-key-map  "\e\eOD" [M-left])
+  (define-key function-key-map  "\e\eOC" [M-right])
+  (define-key function-key-map  "\e\eOA" [M-up])
+  (define-key function-key-map  "\e\eOB" [M-down])
+;;
+;; Not in Use?
+  (define-key function-key-map "\C-?\eOD" [C-left])
+  (define-key function-key-map "\C-?\eOC" [C-right])
+  (define-key function-key-map "\C-?\eOA" [C-up])
+  (define-key function-key-map "\C-?\eOB" [C-down])
+;;
+;; Backspace, Delete and any thing else
+;;
+  (global-unset-key [insertchar])
+  (global-set-key   [insertchar]  'overwrite-mode)
+  (global-unset-key [deletechar])
+  (global-set-key   [deletechar]  'delete-char)
+;;
+(load "term/func-keys"  nil t)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von gnomw.el
--- site-lisp/term/kvt.el
+++ site-lisp/term/kvt.el	2003-07-23 18:08:56.000000000 +0200
@@ -0,0 +1,97 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/kvt.el for site-lisp path
+;;; Copyright (c) 2000 SuSE Gmbh Nuernberg, Germany.  All rights reserved.
+;;;
+;;; Author: Werner Fink  <werner@suse.de>, No warranty of any kind
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  (define-key function-key-map "\e[1~" [find])
+  (define-key function-key-map "\eOH"  [home])
+  (define-key function-key-map "\e[2~" [insertchar])
+  (define-key function-key-map "\e[3~" [deletechar])
+  (define-key function-key-map "\e[4~" [select])
+  (define-key function-key-map "\eOF"  [end])
+  (define-key function-key-map "\e[5~" [prior])
+  (define-key function-key-map "\e[6~" [next])
+  (define-key function-key-map "\e[11~" [f1])
+  (define-key function-key-map "\e[12~" [f2])
+  (define-key function-key-map "\e[13~" [f3])
+  (define-key function-key-map "\e[14~" [f4])
+  (define-key function-key-map "\e[15~" [f5])
+  (define-key function-key-map "\e[17~" [f6])
+  (define-key function-key-map "\e[18~" [f7])
+  (define-key function-key-map "\e[19~" [f8])
+  (define-key function-key-map "\e[20~" [f9])
+  (define-key function-key-map "\e[21~" [f10])
+  (define-key function-key-map "\e[23~" [f11])
+  (define-key function-key-map "\e[24~" [f12])
+  (define-key function-key-map "\e[25~" [f13])
+  (define-key function-key-map "\e[26~" [f14])
+  (define-key function-key-map "\e[28~" [help])
+  (define-key function-key-map "\e[29~" [menu])
+  (define-key function-key-map "\e?\e[28~" [M-help])
+  (define-key function-key-map "\e?\e[29~" [M-menu])
+  (define-key function-key-map "\e[31~" [f17])
+  (define-key function-key-map "\e[32~" [f18])
+  (define-key function-key-map "\e[33~" [f19])
+  (define-key function-key-map "\e[34~" [f20])
+;;
+;; num block
+;; [home] and [end] found in num block
+  (define-key function-key-map "\eOH" [home])
+  (define-key function-key-map "\eOF" [end])
+;;
+;; Locked num block
+  (define-key function-key-map "\eOP" [kp-f1])
+  (define-key function-key-map "\eOQ" [kp-f2])
+  (define-key function-key-map "\eOR" [kp-f3])
+  (define-key function-key-map "\eOS" [kp-f4])
+  (define-key function-key-map "\eOI" [kp-tab])
+  (define-key function-key-map "\eOj" [kp-multiply])
+  (define-key function-key-map "\eOk" [kp-add])
+  (define-key function-key-map "\eOl" [kp-separator])
+  (define-key function-key-map "\eOM" [kp-enter])
+  (define-key function-key-map "\eOm" [kp-subtract])
+  (define-key function-key-map "\eOn" [kp-decimal])
+; (define-key function-key-map "\eOn" [kp-period]) ; [kp-decimal]
+  (define-key function-key-map "\eOo" [kp-divide])
+  (define-key function-key-map "\eOp" [kp-0])
+  (define-key function-key-map "\eOq" [kp-1])
+  (define-key function-key-map "\eOr" [kp-2])
+  (define-key function-key-map "\eOs" [kp-3])
+  (define-key function-key-map "\eOt" [kp-4])
+  (define-key function-key-map "\eOu" [kp-5])
+  (define-key function-key-map "\eOv" [kp-6])
+  (define-key function-key-map "\eOw" [kp-7])
+  (define-key function-key-map "\eOx" [kp-8])
+  (define-key function-key-map "\eOy" [kp-9])
+;;
+;; Undefine some ESC ESC behavior --- for later use
+  (global-unset-key "\e\e")
+  (define-key esc-map "\e" nil)
+;;
+  (define-key function-key-map  "\eOD" [left])
+  (define-key function-key-map  "\eOC" [right])
+  (define-key function-key-map  "\eOA" [up])
+  (define-key function-key-map  "\eOB" [down])
+;;
+  (define-key function-key-map  "\e\eOD" [M-left])
+  (define-key function-key-map  "\e\eOC" [M-right])
+  (define-key function-key-map  "\e\eOA" [M-up])
+  (define-key function-key-map  "\e\eOB" [M-down])
+;;
+;; Not in Use?
+  (define-key function-key-map "\C-?\eOD" [C-left])
+  (define-key function-key-map "\C-?\eOC" [C-right])
+  (define-key function-key-map "\C-?\eOA" [C-up])
+  (define-key function-key-map "\C-?\eOB" [C-down])
+;;
+;; Backspace, Delete and any thing else
+;;
+  (global-unset-key [insertchar])
+  (global-set-key   [insertchar]  'overwrite-mode)
+  (global-unset-key [deletechar])
+  (global-set-key   [deletechar]  'delete-char)
+;;
+(load "term/func-keys"  nil t)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von kvt.el
--- site-lisp/term/linux.el
+++ site-lisp/term/linux.el	2003-07-23 18:08:56.000000000 +0200
@@ -0,0 +1,79 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/linux.el for site-lisp path
+;;; Copyright (c) 1996 SuSE Gmbh Nuernberg, Germany.  All rights reserved.
+;;;
+;;; Author: Werner Fink  <werner@suse.de>, No warranty of any kind
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  (define-key function-key-map "\e[1~" [home])
+  (define-key function-key-map "\e[2~" [insertchar])
+  (define-key function-key-map "\e[3~" [deletechar])
+  (define-key function-key-map "\e[4~" [end])
+  (define-key function-key-map "\e[5~" [prior])
+  (define-key function-key-map "\e[6~" [next])
+  (define-key function-key-map "\e[[A" [f1])
+  (define-key function-key-map "\e[[B" [f2])
+  (define-key function-key-map "\e[[C" [f3])
+  (define-key function-key-map "\e[[D" [f4])
+  (define-key function-key-map "\e[[E" [f5])
+  (define-key function-key-map "\e[17~" [f6])
+  (define-key function-key-map "\e[18~" [f7])
+  (define-key function-key-map "\e[19~" [f8])
+  (define-key function-key-map "\e[20~" [f9])
+  (define-key function-key-map "\e[21~" [f10])
+  (define-key function-key-map "\e[23~" [f11])
+  (define-key function-key-map "\e[24~" [f12])
+  (define-key function-key-map "\e[25~" [f13])
+  (define-key function-key-map "\e[26~" [f14])
+  (define-key function-key-map "\e[28~" [help])
+  (define-key function-key-map "\e[29~" [menu])
+  (define-key function-key-map "\e?\e[28~" [M-help])
+  (define-key function-key-map "\e?\e[29~" [M-menu])
+  (define-key function-key-map "\e[31~" [f17])
+  (define-key function-key-map "\e[32~" [f18])
+  (define-key function-key-map "\e[33~" [f19])
+  (define-key function-key-map "\e[34~" [f20])
+;;
+;; Not in Use?
+;; ----------------------------------
+;; Console-Setting for Linux ???
+  (define-key function-key-map "\e[H"  [M-up])
+  (define-key function-key-map "\e[Y"  [M-down])
+  (define-key function-key-map "\e[M"  [menu])
+  (define-key function-key-map "\e?\e[M"  [M-menu])
+  (define-key function-key-map "\e[P"  [pause])
+;;
+;; num block
+  (define-key function-key-map "\e[G" [begin])
+;;
+;; Locked num block Nothing to do :-)
+;;
+;; Undefine some ESC ESC behavior --- for later use
+  (global-unset-key "\e\e")
+  (define-key esc-map "\e" nil)
+;;
+  (define-key function-key-map "\e[D" [left])
+  (define-key function-key-map "\e[C" [right])
+  (define-key function-key-map "\e[A" [up])
+  (define-key function-key-map "\e[B" [down])
+;;
+  (define-key function-key-map "\e\e[D" [M-left])
+  (define-key function-key-map "\e\e[C" [M-right])
+  (define-key function-key-map "\e\e[A" [M-up])
+  (define-key function-key-map "\e\e[B" [M-down])
+;;
+;; Not in Use?
+  (define-key function-key-map "\C-?\e[D" [C-left])
+  (define-key function-key-map "\C-?\e[C" [C-right])
+  (define-key function-key-map "\C-?\e[A" [C-up])
+  (define-key function-key-map "\C-?\e[B" [C-down])
+;;
+;; Backspace, Delete and any thing else
+;;
+  (global-unset-key [insertchar])
+  (global-set-key   [insertchar]  'overwrite-mode)
+  (global-unset-key [deletechar])
+  (global-set-key   [deletechar]  'delete-char)
+;;
+(load "term/func-keys" nil t)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von linux.el
--- site-lisp/term/locale.el
+++ site-lisp/term/locale.el	2003-07-23 18:08:56.000000000 +0200
@@ -0,0 +1,33 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/locale.el for site-lisp path
+;;; Copyright (c) 1996-2003 SuSE Linux AG Nuernberg, Germany.
+;;;
+;;; Author: Werner Fink  <werner@suse.de>, No warranty of any kind
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Umlaute
+;; -------
+
+(let* ((tmp (shell-command-to-string "locale charmap"))
+       (tmp (substring tmp 0 (string-match "\[ \t\n\]" tmp)))
+       (tmp (downcase tmp)))
+  (when (coding-system-p (intern tmp))
+    (set-keyboard-coding-system (intern tmp))
+    (set-terminal-coding-system (intern tmp))
+    (set-default-coding-systems (intern tmp))))
+;; Set this only if no default is given
+(unless (terminal-coding-system)
+  (set-terminal-coding-system 'iso-latin-9))
+;; Set input mode
+(let ((value (current-input-mode)))
+  (set-input-mode (nth 0 value)
+		  (nth 1 value)
+		  (terminal-coding-system)
+		  ;; This quit value is optional
+		  (nth 3 value)))
+
+(add-hook 'term-setup-hook (function (lambda ()
+				       (load "term/func-keys" t t))))
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von locale.el
--- site-lisp/term/xterm.el
+++ site-lisp/term/xterm.el	2003-07-23 18:08:56.000000000 +0200
@@ -0,0 +1,120 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/xterm.el for site-lisp path
+;;; Copyright (c) 1996 SuSE Gmbh Nuernberg, Germany.  All rights reserved.
+;;;
+;;; Author: Werner Fink  <werner@suse.de>, No warranty of any kind
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; MF-102: on linux console \033[1~ is not [find] but [home]
+;; in xterm [home] is \033[H (app-keypad off) or \033OH (app-keypad on)
+;; and [find] is \033[1~
+;; Note: this must be consistent with app-defaults of xterm,
+;;       terminfo/termcap, and all of inputrc, csh.cshrc, exrc
+  (define-key function-key-map "\e[1~" [find])
+  (define-key function-key-map "\e[H"  [home])
+  (define-key function-key-map "\eOH"  [home])
+  (define-key function-key-map "\e[2~" [insertchar])
+  (define-key function-key-map "\e[3~" [deletechar])
+;; MF-102: on linux console \033[4~ is not [select] but [end]
+;; in xterm [end] should be \033[F (app-keypad off) or \033OF (app-keypad on)
+;; and [select] is \033[4~
+;; Note: this must be consistent with app-defaults of xterm,
+;;       terminfo/termcap, and all of inputrc, csh.cshrc, exrc
+  (define-key function-key-map "\e[4~" [select])
+  (define-key function-key-map "\e[F"  [end])
+  (define-key function-key-map "\eOF"  [end])
+  (define-key function-key-map "\e[5~" [prior])
+  (define-key function-key-map "\e[6~" [next])
+  (define-key function-key-map "\e[11~" [f1])
+  (define-key function-key-map "\e[12~" [f2])
+  (define-key function-key-map "\e[13~" [f3])
+  (define-key function-key-map "\e[14~" [f4])
+  (define-key function-key-map "\eOP"   [f1])
+  (define-key function-key-map "\eOQ"   [f2])
+  (define-key function-key-map "\eOR"   [f3])
+  (define-key function-key-map "\eOS"   [f4])
+  (define-key function-key-map "\e[15~" [f5])
+  (define-key function-key-map "\e[17~" [f6])
+  (define-key function-key-map "\e[18~" [f7])
+  (define-key function-key-map "\e[19~" [f8])
+  (define-key function-key-map "\e[20~" [f9])
+  (define-key function-key-map "\e[21~" [f10])
+  (define-key function-key-map "\e[23~" [f11])
+  (define-key function-key-map "\e[24~" [f12])
+  (define-key function-key-map "\e[25~" [f13])
+  (define-key function-key-map "\e[26~" [f14])
+  (define-key function-key-map "\e[28~" [help])
+  (define-key function-key-map "\e[29~" [menu])
+  (define-key function-key-map "\e?\e[28~" [M-help])
+  (define-key function-key-map "\e?\e[29~" [M-menu])
+  (define-key function-key-map "\e[31~" [f17])
+  (define-key function-key-map "\e[32~" [f18])
+  (define-key function-key-map "\e[33~" [f19])
+  (define-key function-key-map "\e[34~" [f20])
+;;
+;; num block
+;; [home] and [end] found in num block
+  (define-key function-key-map "\eOH" [home])
+  (define-key function-key-map "\eOF" [end])
+  (define-key function-key-map "\eOE" [begin])
+;;
+;; Locked num block
+;; kp_f1 .. kp_f4 and kp_tab not found on MF-102
+;; For xterm on xfree we use f1 .. f4, see above
+; (define-key function-key-map "\eOP" [kp-f1])
+; (define-key function-key-map "\eOQ" [kp-f2])
+; (define-key function-key-map "\eOR" [kp-f3])
+; (define-key function-key-map "\eOS" [kp-f4])
+  (define-key function-key-map "\eOI" [kp-tab])
+  (define-key function-key-map "\eOj" [kp-multiply])
+  (define-key function-key-map "\eOk" [kp-add])
+  (define-key function-key-map "\eOl" [kp-separator])
+  (define-key function-key-map "\eOM" [kp-enter])
+  (define-key function-key-map "\eOm" [kp-subtract])
+  (define-key function-key-map "\eOn" [kp-decimal])
+; (define-key function-key-map "\eOn" [kp-period]) ; [kp-decimal]
+  (define-key function-key-map "\eOo" [kp-divide])
+  (define-key function-key-map "\eOp" [kp-0])
+  (define-key function-key-map "\eOq" [kp-1])
+  (define-key function-key-map "\eOr" [kp-2])
+  (define-key function-key-map "\eOs" [kp-3])
+  (define-key function-key-map "\eOt" [kp-4])
+  (define-key function-key-map "\eOu" [kp-5])
+  (define-key function-key-map "\eOv" [kp-6])
+  (define-key function-key-map "\eOw" [kp-7])
+  (define-key function-key-map "\eOx" [kp-8])
+  (define-key function-key-map "\eOy" [kp-9])
+;;
+;; Undefine some ESC ESC behavior --- for later use
+  (global-unset-key "\e\e")
+  (define-key esc-map "\e" nil)
+;;
+  (define-key function-key-map  "\eOD" [left])
+  (define-key function-key-map  "\eOC" [right])
+  (define-key function-key-map  "\eOA" [up])
+  (define-key function-key-map  "\eOB" [down])
+;;
+  (define-key function-key-map  "\e\eOD" [M-left])
+  (define-key function-key-map  "\e\eOC" [M-right])
+  (define-key function-key-map  "\e\eOA" [M-up])
+  (define-key function-key-map  "\e\eOB" [M-down])
+;;
+;; Not in Use?
+  (define-key function-key-map "\C-?\eOD" [C-left])
+  (define-key function-key-map "\C-?\eOC" [C-right])
+  (define-key function-key-map "\C-?\eOA" [C-up])
+  (define-key function-key-map "\C-?\eOB" [C-down])
+  (define-key function-key-map "\eO5D"    [C-left])
+  (define-key function-key-map "\eO5C"    [C-right])
+  (define-key function-key-map "\eO5A"    [C-up])
+  (define-key function-key-map "\eO5B"    [C-down])
+;;
+;; Backspace, Delete and any thing else
+;;
+  (global-unset-key [insertchar])
+  (global-set-key   [insertchar]  'overwrite-mode)
+  (global-unset-key [deletechar])
+  (global-set-key   [deletechar]  'delete-char)
+;;
+(load "term/func-keys"  nil t)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von xterm.el
--- src/Makefile.in
+++ src/Makefile.in	2007-05-15 19:19:55.029819000 +0200
@@ -710,6 +710,9 @@ otherobj= $(termcapobj) lastfile.o $(mal
 #define TOOLTIP_SUPPORT
 #endif
 
+#define MYSHORTLISP ${dotdot}/lisp/emacs-lisp/backquote.elc ${dotdot}/lisp/delsel.elc \
+  ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/lpr.elc
+
 /* List of Lisp files loaded into the dumped Emacs.  It is arranged
    like this because it is easier to generate it semi-mechanically from
    loadup.el this way.
@@ -908,6 +911,7 @@ shortlisp= \
 	../lisp/ediff-hook.elc \
 	../lisp/widget.elc \
 	../lisp/window.elc \
+	MYSHORTLISP \
 	../lisp/version.el
 
 /* Lisp files that may or may not be used.
--- src/config.in
+++ src/config.in	2007-05-15 19:25:17.876169000 +0200
@@ -911,6 +911,8 @@ Boston, MA 02110-1301, USA.  */
    code using `volatile' can become incorrect without. Disable with care. */
 #undef volatile
 
+/* tparam() masking because of common name in ncurses */
+#define tparam emacs_tparam
 
 /* If we're using any sort of window system, define some consequences.  */
 #ifdef HAVE_X_WINDOWS
--- src/fns.c
+++ src/fns.c	2003-07-23 18:08:56.000000000 +0200
@@ -80,6 +80,10 @@ Lisp_Object Qwidget_type;
 Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper;
 
 extern Lisp_Object Qinput_method_function;
+#ifdef HAVE_MOUSE
+extern Lisp_Object do_mouse_tracking;
+extern Lisp_Object tracking_off ();
+#endif
 
 static int internal_equal P_ ((Lisp_Object , Lisp_Object, int, int));
 
@@ -3220,6 +3224,10 @@ is nil and `use-dialog-box' is non-nil. 
   int count = SPECPDL_INDEX ();
 
   specbind (Qcursor_in_echo_area, Qt);
+#ifdef HAVE_MOUSE
+  record_unwind_protect (tracking_off, do_mouse_tracking);
+  do_mouse_tracking = Qnil;
+#endif
 
   map = Fsymbol_value (intern ("query-replace-map"));
 
--- src/keyboard.c
+++ src/keyboard.c	2003-07-23 18:08:56.000000000 +0200
@@ -1395,7 +1395,7 @@ DEFUN ("abort-recursive-edit", Fabort_re
 /* Restore mouse tracking enablement.  See Ftrack_mouse for the only use
    of this function.  */
 
-static Lisp_Object
+Lisp_Object
 tracking_off (old_value)
      Lisp_Object old_value;
 {
--- src/prefix-args.c
+++ src/prefix-args.c	2003-07-23 18:08:56.000000000 +0200
@@ -53,6 +53,8 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 int
 main (argc, argv)
@@ -75,8 +77,15 @@ Echo each ARG preceded by PREFIX and a s
   prefix = argv[0];
   argc--, argv++;
 
-  for (; argc > 0; argc--, argv++)
-    printf ("%s %s%c", prefix, argv[0], (argc > 1) ? ' ' : '\n');
+  for (; argc > 0; argc--, argv++) {
+    if (strcmp(argv[0], prefix) == 0 && argv[1]) {
+      printf ("%s %s", argv[0], argv[1]);
+      argv++;
+      argc--;
+      putc ((argc > 1) ? ' ' : '\n', stdout);
+    } else
+      printf ("%s %s%c", prefix, argv[0], (argc > 1) ? ' ' : '\n');
+  }
 
   exit (0);
 }
--- src/process.c
+++ src/process.c	2007-05-15 19:29:13.505217000 +0200
@@ -528,8 +528,22 @@ status_message (p)
 static int
 allocate_pty ()
 {
-  register int c, i;
   int fd;
+#ifdef UNIX98_PTYS
+  if ((fd = getpt ()) < 0) 
+    return -1;
+
+  if (grantpt   (fd) < 0 ||
+      unlockpt  (fd) < 0 ||
+      ptsname_r (fd, pty_name, sizeof pty_name))
+    {
+      close (fd);
+      return -1;
+    }
+  setup_pty (fd);
+  return fd;
+#else
+  register int c, i;
 
 #ifdef PTY_ITERATION
   PTY_ITERATION
@@ -607,6 +621,7 @@ allocate_pty ()
 	  }
       }
   return -1;
+#endif /* !UNIX98_PTYS */
 }
 #endif /* HAVE_PTYS */
 
--- src/m/hp800.h
+++ src/m/hp800.h	2007-05-15 19:33:25.880021000 +0200
@@ -71,7 +71,7 @@ Boston, MA 02110-1301, USA.  */
 
 /* Common definitions for HPUX and GNU/Linux.  */
 
-#if defined (__hpux) || defined (GNU_LINUX)
+#if defined (__hpux) || defined (__linux__)
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically:
    Ones defined so far include vax, m68000, ns16000, pyramid,
@@ -93,11 +93,11 @@ Boston, MA 02110-1301, USA.  */
 
 #define NO_REMAP
 
-#endif /* __hpux or GNU_LINUX */
+#endif /* __hpux or __linux__ */
 
 /* Stuff for just GNU/Linux.  */
 
-#ifdef GNU_LINUX
+#ifdef __linux__
 
 /* Data type of load average, as read out of kmem.  */
 
@@ -106,6 +106,14 @@ Boston, MA 02110-1301, USA.  */
 /* Convert that into an integer that is 100 for a load average of 1.0  */
 
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
+#else
+/* Data type of load average, as read out of kmem.  */
+
+#define LOAD_AVE_TYPE long
+
+/* Convert that into an integer that is 100 for a load average of 1.0  */
+
+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
 #endif /* GNU_LINUX */
 
@@ -120,6 +128,7 @@ Boston, MA 02110-1301, USA.  */
    Otherwise Emacs assumes that text space precedes data space,
    numerically.  */
 
+#ifdef __hpux
 #define VIRT_ADDR_VARIES
 
 /* the data segment on this machine always starts at address 0x40000000. */
@@ -128,6 +137,9 @@ Boston, MA 02110-1301, USA.  */
 
 #define DATA_START    0x40000000
 #define TEXT_START    0x00000000
+#else
+#define HAVE_ALLOCA
+#endif
 
 /* This machine requires completely different unexec code
    which lives in a separate file.  Specify the file name.  */
--- src/s/gnu-linux.h
+++ src/s/gnu-linux.h	2003-07-23 18:08:56.000000000 +0200
@@ -107,6 +107,7 @@ Boston, MA 02110-1301, USA.  */
     functions and macros for terminal control.  */
 
 #define HAVE_TERMIOS
+#define NCURSES_OSPEED_T
 
 /* Define HAVE_PTYS if the system supports pty devices. */
 
@@ -199,17 +200,17 @@ Boston, MA 02110-1301, USA.  */
 /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
    says where to find X windows at run time.  */
 
-#ifdef __mips__
-#define LD_SWITCH_SYSTEM -G 0 LD_SWITCH_X_SITE_AUX
+#if defined(__mips__) || defined(__powerpc__)
+#define LD_SWITCH_SYSTEM	-G 0 -Xlinker -rpath-link -Xlinker /usr/X11R6/lib
 #else
-#define LD_SWITCH_SYSTEM LD_SWITCH_X_SITE_AUX
+#define LD_SWITCH_SYSTEM	-Xlinker -rpath-link -Xlinker /usr/X11R6/lib
 #endif /* __mips__ */
 
 /* Link temacs with -z nocombreloc so that unexec works right, whether or
    not -z combreloc is the default.  GNU ld ignores unknown -z KEYWORD
    switches, so this also works with older versions that don't implement
    -z combreloc.  */
-#define LD_SWITCH_SYSTEM_TEMACS -z nocombreloc
+#define LD_SWITCH_SYSTEM_TEMACS -Xlinker -z -Xlinker nocombreloc
 #endif /* __ELF__ */
 
 /* As of version 1.1.51, Linux did not actually implement SIGIO.
@@ -237,6 +238,15 @@ Boston, MA 02110-1301, USA.  */
 #define POSIX                 /* affects getpagesize.h and systty.h */
 #define POSIX_SIGNALS
 
+/* When _USE_BSD is defined, which it will be on glibc based
+ * systems, sigmask/sigpause will be defined in the system signal.h
+ * header file, we want the one in emacs's syssignal.h or else things
+ * blow up.  Note this worked on Intel by luck because of how arguments
+ * are passed on the stack ;-(
+ */
+#undef sigmask
+#undef sigpause
+
 /* Best not to include -lg, unless it is last on the command line */
 #define LIBS_DEBUG
 #ifndef __ELF__