diff options
Diffstat (limited to 'editors/emacs23/files')
| -rw-r--r-- | editors/emacs23/files/patch-Makefile.in | 37 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-configure.in | 30 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-lib-src:Makefile.in | 27 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-lib-src:movemail.c | 11 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-lisp:vc-hooks.el | 24 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-lisp_dired.el | 19 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-man:Makefile.in | 11 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-src:Makefile.in | 13 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-src:alloc.c | 14 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-src:m:alpha.h | 11 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-src:m:amd64.h | 184 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-src:m:ia64.h | 19 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-src:m:sparc.h | 11 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-src:mem-limits.h | 11 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-src:process.c | 72 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-src:s:freebsd.h | 14 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-src:xterm.c | 42 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-src:xterm.h | 11 |
18 files changed, 0 insertions, 561 deletions
diff --git a/editors/emacs23/files/patch-Makefile.in b/editors/emacs23/files/patch-Makefile.in deleted file mode 100644 index 2e04a36c21f8..000000000000 --- a/editors/emacs23/files/patch-Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ ---- Makefile.in.orig Sat Oct 19 10:21:01 2002 -+++ Makefile.in Fri Dec 9 01:25:01 2005 -@@ -348,14 +348,6 @@ - ## as a workaround for a bug in tar on Ultrix 4.2. - install-arch-indep: mkdir info - -set ${COPYDESTS} ; \ -- unset CDPATH; \ -- for dir in ${COPYDIR} ; do \ -- if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \ -- rm -rf $$1 ; \ -- fi ; \ -- shift ; \ -- done -- -set ${COPYDESTS} ; \ - mkdir ${COPYDESTS} ; \ - chmod ugo+rx ${COPYDESTS} ; \ - unset CDPATH; \ -@@ -432,8 +424,8 @@ - cd ${srcdir}/info ; \ - for f in ada-mode* autotype* ccmode* cl* dired-x* ebrowse* ediff* efaq* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \ - (cd $${thisdir}; \ -- ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ -- chmod a+r ${infodir}/$$f); \ -+ ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f.info; \ -+ chmod a+r ${infodir}/$$f.info); \ - done); \ - else true; fi - -unset CDPATH; \ -@@ -442,7 +434,7 @@ - then \ - for f in ada-mode autotype ccmode cl dired-x ebrowse ediff efaq emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman; do \ - (cd $${thisdir}; \ -- ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \ -+ ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f.info); \ - done; \ - else true; fi - -chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir} diff --git a/editors/emacs23/files/patch-configure.in b/editors/emacs23/files/patch-configure.in deleted file mode 100644 index 5e487eebe1c8..000000000000 --- a/editors/emacs23/files/patch-configure.in +++ /dev/null @@ -1,30 +0,0 @@ ---- configure.in.orig Sun Mar 16 17:06:05 2003 -+++ configure.in Thu Jul 7 00:14:52 2005 -@@ -179,6 +179,19 @@ - machine='' opsys='' unported=no - case "${canonical}" in - -+ ## FreeBSD ports -+ *-*-freebsd* ) -+ opsys=freebsd -+ case "${canonical}" in -+ alpha*-*-freebsd*) machine=alpha ;; -+ amd64-*-freebsd*) machine=amd64 ;; -+ ia64-*-freebsd*) machine=ia64 ;; -+ i[3456]86-*-freebsd*) machine=intel386 ;; -+ sparc64-*-freebsd*) machine=sparc ;; -+ powerpc-*-freebsd*) machine=macppc ;; -+ esac -+ ;; -+ - ## NetBSD ports - *-*-netbsd* ) - opsys=netbsd -@@ -1032,7 +1045,6 @@ - ;; - *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; - *-386bsd* ) opsys=386bsd ;; -- *-freebsd* ) opsys=freebsd ;; - *-nextstep* ) opsys=nextstep ;; - ## Otherwise, we'll fall through to the generic opsys code at the bottom. - esac diff --git a/editors/emacs23/files/patch-lib-src:Makefile.in b/editors/emacs23/files/patch-lib-src:Makefile.in deleted file mode 100644 index 4226f59f9f96..000000000000 --- a/editors/emacs23/files/patch-lib-src:Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ ---- lib-src/Makefile.in.orig Wed Aug 30 02:12:42 2000 -+++ lib-src/Makefile.in Thu Oct 11 01:54:10 2001 -@@ -85,6 +85,7 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - # By default, we uphold the dignity of our programs. - INSTALL_STRIP = - -@@ -278,7 +279,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 +291,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 diff --git a/editors/emacs23/files/patch-lib-src:movemail.c b/editors/emacs23/files/patch-lib-src:movemail.c deleted file mode 100644 index c47286937302..000000000000 --- a/editors/emacs23/files/patch-lib-src:movemail.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib-src/movemail.c.orig Mon Feb 14 11:29:49 2005 -+++ lib-src/movemail.c Mon Feb 14 11:33:06 2005 -@@ -787,7 +787,7 @@ - mbx_delimit_begin (mbf); - if (pop_retr (server, i, mbf) != OK) - { -- error (Errmsg, 0, 0); -+ error ("%s", Errmsg, 0); - close (mbfi); - return (1); - } diff --git a/editors/emacs23/files/patch-lisp:vc-hooks.el b/editors/emacs23/files/patch-lisp:vc-hooks.el deleted file mode 100644 index 8675c85f9e37..000000000000 --- a/editors/emacs23/files/patch-lisp:vc-hooks.el +++ /dev/null @@ -1,24 +0,0 @@ ---- lisp/vc-hooks.el.orig Mon Nov 12 23:37:38 2001 -+++ lisp/vc-hooks.el Tue Nov 13 12:56:08 2001 -@@ -475,10 +475,9 @@ - (if regexp - (concat (regexp-quote (file-name-nondirectory file)) - "\\.~[0-9.]+" (unless manual "\\.") "~") -- (expand-file-name (concat (file-name-nondirectory file) -- ".~" (or rev (vc-workfile-version file)) -- (unless manual ".") "~") -- (file-name-directory file)))) -+ (concat (make-backup-file-name-1 file) -+ ".~" (or rev (vc-workfile-version file)) -+ (unless manual ".") "~"))) - - (defun vc-delete-automatic-version-backups (file) - "Delete all existing automatic version backups for FILE." -@@ -509,6 +508,7 @@ - (vc-up-to-date-p file) - (eq (vc-checkout-model file) 'implicit) - (vc-call make-version-backups-p file) -+ vc-make-backup-files - (vc-make-version-backup file)))) - - (defun vc-after-save () diff --git a/editors/emacs23/files/patch-lisp_dired.el b/editors/emacs23/files/patch-lisp_dired.el deleted file mode 100644 index 93a4f6f3188a..000000000000 --- a/editors/emacs23/files/patch-lisp_dired.el +++ /dev/null @@ -1,19 +0,0 @@ ---- lisp/dired.el.orig Fri Feb 7 20:48:13 2003 -+++ lisp/dired.el Fri Mar 21 18:08:54 2003 -@@ -1535,6 +1535,7 @@ - "\\|" yyyy s s "?" - "\\|" s "?" yyyy - "\\)")) -+ (freebsd-ja (concat s mm "\\(" s "\\|/\\)" dd s "\\(" HH:MM "\\|" s yyyy "\\)")) - (japanese - (concat mm k "?" s dd k "?" s "+" - "\\(" HH:MM "\\|" yyyy k "?" "\\)"))) -@@ -1546,7 +1547,7 @@ - ;; This avoids recognizing `jservice 10 1024' as a date in the line: - ;; drwxr-xr-x 3 jservice 10 1024 Jul 2 1997 esg-host - (concat ".*[0-9][kKMGTPEZY]?" -- s "\\(" western "\\|" japanese "\\|" iso "\\)" s)) -+ s "\\(" western "\\|" freebsd-ja "\\|" japanese "\\|" iso "\\)" s)) - "Regular expression to match up to the file name in a directory listing. - The default value is designed to recognize dates and times - regardless of the language.") diff --git a/editors/emacs23/files/patch-man:Makefile.in b/editors/emacs23/files/patch-man:Makefile.in deleted file mode 100644 index 23e59c2673f6..000000000000 --- a/editors/emacs23/files/patch-man:Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- man/Makefile.in.orig Thu Apr 26 02:17:33 2001 -+++ man/Makefile.in Mon Oct 22 20:43:45 2001 -@@ -31,7 +31,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/dired-x ../info/ediff ../info/forms ../info/gnus \ - ../info/info ../info/message ../info/mh-e ../info/reftex \ diff --git a/editors/emacs23/files/patch-src:Makefile.in b/editors/emacs23/files/patch-src:Makefile.in deleted file mode 100644 index d0e31255cc3b..000000000000 --- a/editors/emacs23/files/patch-src:Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- src/Makefile.in.orig Mon Dec 17 23:09:32 2001 -+++ src/Makefile.in Mon Oct 21 13:37:26 2002 -@@ -155,6 +155,10 @@ - /* This holds special options for linking temacs - that should be used for linking anything else. */ - #ifndef LD_SWITCH_SYSTEM_TEMACS -+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500042) -+#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc -+#else - #define LD_SWITCH_SYSTEM_TEMACS -+#endif - #endif - diff --git a/editors/emacs23/files/patch-src:alloc.c b/editors/emacs23/files/patch-src:alloc.c deleted file mode 100644 index 0ae9270b0d1f..000000000000 --- a/editors/emacs23/files/patch-src:alloc.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/alloc.c.orig Thu Sep 12 13:50:01 2002 -+++ src/alloc.c Thu Sep 12 13:48:11 2002 -@@ -3723,7 +3723,11 @@ - /* This trick flushes the register windows so that all the state of - the process is contained in the stack. */ - #ifdef sparc -+#ifdef __sparc64__ -+ asm ("flushw"); -+#else - asm ("ta 3"); -+#endif - #endif - - /* Save registers that we need to see on the stack. We need to see diff --git a/editors/emacs23/files/patch-src:m:alpha.h b/editors/emacs23/files/patch-src:m:alpha.h deleted file mode 100644 index 080a33650114..000000000000 --- a/editors/emacs23/files/patch-src:m:alpha.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/m/alpha.h.orig Mon Oct 2 23:30:39 2000 -+++ src/m/alpha.h Wed Feb 13 09:05:57 2002 -@@ -198,7 +198,7 @@ - - #ifndef NOT_C_CODE - /* We need these because pointers are larger than the default ints. */ --#if !defined(__NetBSD__) && !defined(__OpenBSD__) -+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) - #include <alloca.h> - #endif - diff --git a/editors/emacs23/files/patch-src:m:amd64.h b/editors/emacs23/files/patch-src:m:amd64.h deleted file mode 100644 index 3129433e59b5..000000000000 --- a/editors/emacs23/files/patch-src:m:amd64.h +++ /dev/null @@ -1,184 +0,0 @@ ---- src/m/amd64.h~ Wed Dec 31 18:00:00 1969 -+++ src/m/amd64.h Thu Dec 18 00:21:51 2003 -@@ -0,0 +1,181 @@ -+/* machine description file For the amd64 chip. -+ Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc. -+ -+This file is part of GNU Emacs. -+ -+GNU Emacs is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 1, or (at your option) -+any later version. -+ -+GNU Emacs is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GNU Emacs; see the file COPYING. If not, write to -+the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+Boston, MA 02111-1307, USA. */ -+ -+ -+/* The following line tells the configuration script what sort of -+ operating system this machine is likely to run. -+ USUAL-OPSYS="note" -+ -+NOTE-START -+Use -opsystem=freebsd -+NOTE-END -+ -+*/ -+ -+#define BITS_PER_LONG 64 -+#define BITS_PER_EMACS_INT 64 -+#ifndef _LP64 -+#define _LP64 -+#endif -+ -+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word -+ is the most significant byte. */ -+ -+#undef WORDS_BIG_ENDIAN -+ -+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a -+ * group of arguments and treat it as an array of the arguments. */ -+ -+#define NO_ARG_ARRAY -+ -+/* 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, -+ orion, tahoe, APOLLO and many others */ -+ -+/* __amd64__ defined automatically */ -+ -+ -+/* Use type EMACS_INT rather than a union, to represent Lisp_Object */ -+/* This is desirable for most machines. */ -+ -+#define NO_UNION_TYPE -+ -+/* Define the type to use. */ -+#define EMACS_INT long -+#define EMACS_UINT unsigned long -+#define SPECIAL_EMACS_INT -+ -+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend -+ the 24-bit bit field into an int. In other words, if bit fields -+ are always unsigned. -+ -+ If you use NO_UNION_TYPE, this flag does not matter. */ -+ -+#undef EXPLICIT_SIGN_EXTEND -+ -+/* 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) -+ -+/* Define C_ALLOCA if this machine does not support a true alloca -+ and the one written in C should be used instead. -+ Define HAVE_ALLOCA to say that the system provides a properly -+ working alloca function and it should be used. -+ Define neither one if an assembler-language alloca -+ in the file alloca.s should be used. */ -+ -+#define HAVE_ALLOCA -+ -+/* GNU malloc and the relocating allocator do not work together -+ with X. [Who wrote that?] */ -+ -+/* May 1995: reportedly [Rainer Schoepf <schoepf at uni-mainz.de>] both the -+ system and the gnu malloc system work with "alpha-dec-osf3.0" and -+ "alpha-dec-osf3.2". */ -+ -+/* May 1995: it seems to me [Morten Welinder <terra at diku.dk>] that both -+ mallocs work with "alpha-dec-osf2.0", but I daren't break anything -+ right now. Feel free to play if you want. */ -+ -+/* #define SYSTEM_MALLOC */ -+ -+#ifdef __ELF__ -+/* With ELF, make sure that all common symbols get allocated to in the -+ data section. Otherwise, the dump of temacs may miss variables in -+ the shared library that have been initialized. For example, with -+ GNU libc, __malloc_initialized would normally be resolved to the -+ shared library's .bss section, which is fatal. */ -+# ifdef __GNUC__ -+# define C_SWITCH_MACHINE -fno-common -+# else -+# error What gives? Fix me if DEC Unix supports ELF now. -+# endif -+#endif -+ -+#if defined(__OpenBSD__) -+#define ORDINARY_LINK -+#endif -+ -+#ifdef __ELF__ -+#undef UNEXEC -+#define UNEXEC unexelf.o -+#endif -+ -+#if defined (LINUX) && __GNU_LIBRARY__ - 0 < 6 -+/* This controls a conditional in main. */ -+#define LINUX_SBRK_BUG -+#endif -+ -+ -+#define PNTR_COMPARISON_TYPE unsigned long -+ -+/* On the 64 bit architecture, we can use 60 bits for addresses */ -+ -+#define VALBITS 60 -+ -+ -+/* This definition of MARKBIT is necessary because of the comparison of -+ ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */ -+ -+/* #define MARKBIT 0x8000000000000000L */ -+ -+ -+/* Define XINT and XUINT so that they can take arguments of type int */ -+ -+#define XINT(a) (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS)) -+#define XUINT(a) ((long) (a) & VALMASK) -+ -+/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ -+ -+#define XPNTR(a) XUINT (a) -+ -+#ifndef NOT_C_CODE -+/* We need these because pointers are larger than the default ints. */ -+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) -+#include <alloca.h> -+#endif -+#endif /* not NOT_C_CODE */ -+ -+/* On the Alpha it's best to avoid including TERMIO since struct -+ termio and struct termios are mutually incompatible. */ -+/* #define NO_TERMIO */ -+ -+#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__) -+# define TEXT_END ({ extern int _etext; &_etext; }) -+# ifndef __ELF__ -+# define COFF -+# define DATA_END ({ extern int _EDATA; &_EDATA; }) -+# endif /* notdef __ELF__ */ -+#endif -+ -+#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__) -+#define HAVE_TEXT_START -+#endif -+ -+/* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN: -+ they generate code that uses a signaling NaN instead of DBL_MIN. -+ Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN: -+ this avoids the assembler bug. */ -+/* #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308 */ diff --git a/editors/emacs23/files/patch-src:m:ia64.h b/editors/emacs23/files/patch-src:m:ia64.h deleted file mode 100644 index 86a63f41a599..000000000000 --- a/editors/emacs23/files/patch-src:m:ia64.h +++ /dev/null @@ -1,19 +0,0 @@ ---- src/m/ia64.h.orig Fri Sep 29 06:00:37 2000 -+++ src/m/ia64.h Sun Sep 5 11:57:57 2004 -@@ -147,7 +147,7 @@ - - #ifndef NOT_C_CODE - /* We need these because pointers are larger than the default ints. */ --# if !defined(__NetBSD__) && !defined(__OpenBSD__) -+# if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) - # include <alloca.h> - # else - # include <stdlib.h> -@@ -178,6 +178,6 @@ - - #endif /* not NOT_C_CODE */ - --#define DATA_SEG_BITS 0x6000000000000000 -+#define DATA_SEG_BITS 0x2000000000000000 - - #define HAVE_TEXT_START diff --git a/editors/emacs23/files/patch-src:m:sparc.h b/editors/emacs23/files/patch-src:m:sparc.h deleted file mode 100644 index 8d594f5b5cef..000000000000 --- a/editors/emacs23/files/patch-src:m:sparc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/m/sparc.h.orig Thu Sep 12 02:25:09 2002 -+++ src/m/sparc.h Thu Sep 12 12:33:36 2002 -@@ -89,7 +89,7 @@ - #define PURESIZE 130000 - #endif - --#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__) -+#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__) && !defined(__FreeBSD__) - /* This really belongs in s/sun.h. */ - - /* Say that the text segment of a.out includes the header; diff --git a/editors/emacs23/files/patch-src:mem-limits.h b/editors/emacs23/files/patch-src:mem-limits.h deleted file mode 100644 index c58dd778e2ec..000000000000 --- a/editors/emacs23/files/patch-src:mem-limits.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mem-limits.h.~1~ Wed Mar 8 12:49:46 2000 -+++ src/mem-limits.h Wed Dec 17 03:15:24 2003 -@@ -98,7 +98,7 @@ - static POINTER data_space_start; - - /* Number of bytes of writable memory we can expect to be able to get */ --static unsigned long lim_data; -+static rlim_t lim_data; - - #ifdef NO_LIM_DATA - static void diff --git a/editors/emacs23/files/patch-src:process.c b/editors/emacs23/files/patch-src:process.c deleted file mode 100644 index 884d06d9a1c6..000000000000 --- a/editors/emacs23/files/patch-src:process.c +++ /dev/null @@ -1,72 +0,0 @@ ---- src/process.c.orig Mon Mar 17 07:06:56 2003 -+++ src/process.c Fri Apr 23 19:28:58 2004 -@@ -1891,10 +1891,34 @@ - Likewise for immediate_quit. */ - break; - -+#if 1 -+ if ( (errno == EINTR ) || (errno == EINPROGRESS)){ -+ fd_set fds; -+ int e; -+ struct timeval tv; -+ tv.tv_sec =60; -+ tv.tv_usec = 0; -+ FD_ZERO(&fds); -+ FD_SET(s, &fds); -+ resel: -+ QUIT; -+ e = select(s+1, NULL, &fds, NULL, &tv); -+ -+ if( e == -1){ -+ if(errno == EINTR) -+ goto resel; -+ else -+ xerrno = ETIMEDOUT; -+ } -+ else { -+ xerrno = 0; -+ break; -+ } -+ } -+#endif -+ - immediate_quit = 0; - -- if (xerrno == EINTR) -- goto loop; - if (xerrno == EADDRINUSE && retry < 20) - { - /* A delay here is needed on some FreeBSD systems, -@@ -2001,10 +2025,30 @@ - { - int xerrno = errno; - -+#if 1 -+ if ( (errno == EINTR ) || (errno == EINPROGRESS)){ -+ fd_set fds; -+ int e; -+ struct timeval tv; -+ tv.tv_sec =60; -+ tv_tv_usec = 0; -+ FD_CLEAR(&fds); -+ FD_SET(s, &fds); -+ resel: -+ QUIT; -+ e = select(s+1, NULL, fds, NULL, &tv); -+ if( e != 0){ -+ if(errno == EINTR) -+ goto resel; -+ else -+ xerrno = ETIMEDOUT; -+ } -+ else -+ xerrno = 0; -+ } -+#endif - immediate_quit = 0; - -- if (errno == EINTR) -- goto loop; - if (errno == EADDRINUSE && retry < 20) - { - /* A delay here is needed on some FreeBSD systems, diff --git a/editors/emacs23/files/patch-src:s:freebsd.h b/editors/emacs23/files/patch-src:s:freebsd.h deleted file mode 100644 index 2eb9ea8823ee..000000000000 --- a/editors/emacs23/files/patch-src:s:freebsd.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/s/freebsd.h.orig Tue Feb 20 19:52:17 2001 -+++ src/s/freebsd.h Mon Feb 18 11:51:50 2002 -@@ -68,6 +68,11 @@ - #define LIBS_SYSTEM -lutil - #if __FreeBSD_version < 400000 - #define LIBS_TERMCAP -ltermcap -+#else -+#ifdef HAVE_LIBNCURSES -+#define TERMINFO -+#define LIBS_TERMCAP -lncurses -+#endif - #endif - - #define SYSV_SYSTEM_DIR diff --git a/editors/emacs23/files/patch-src:xterm.c b/editors/emacs23/files/patch-src:xterm.c deleted file mode 100644 index 01ec93bec95e..000000000000 --- a/editors/emacs23/files/patch-src:xterm.c +++ /dev/null @@ -1,42 +0,0 @@ ---- src/xterm.c.orig Tue Oct 15 23:21:45 2002 -+++ src/xterm.c Wed Aug 31 09:18:48 2005 -@@ -118,8 +118,6 @@ - #ifdef HAVE_XAW3D - #include <X11/Xaw3d/Simple.h> - #include <X11/Xaw3d/Scrollbar.h> --#define ARROW_SCROLLBAR --#include <X11/Xaw3d/ScrollbarP.h> - #else /* !HAVE_XAW3D */ - #include <X11/Xaw/Simple.h> - #include <X11/Xaw/Scrollbar.h> -@@ -8863,30 +8861,12 @@ - XawScrollbarSetThumb (widget, top, shown); - else - { --#ifdef HAVE_XAW3D -- ScrollbarWidget sb = (ScrollbarWidget) widget; -- int scroll_mode = 0; -- -- /* `scroll_mode' only exists with Xaw3d + ARROW_SCROLLBAR. */ -- if (xaw3d_arrow_scroll) -- { -- /* Xaw3d stupidly ignores resize requests while dragging -- so we have to make it believe it's not in dragging mode. */ -- scroll_mode = sb->scrollbar.scroll_mode; -- if (scroll_mode == 2) -- sb->scrollbar.scroll_mode = 0; -- } --#endif - /* Try to make the scrolling a tad smoother. */ - if (!xaw3d_pick_top) - shown = min (shown, old_shown); - - XawScrollbarSetThumb (widget, top, shown); - --#ifdef HAVE_XAW3D -- if (xaw3d_arrow_scroll && scroll_mode == 2) -- sb->scrollbar.scroll_mode = scroll_mode; --#endif - } - } - } diff --git a/editors/emacs23/files/patch-src:xterm.h b/editors/emacs23/files/patch-src:xterm.h deleted file mode 100644 index a0faee236ed5..000000000000 --- a/editors/emacs23/files/patch-src:xterm.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/xterm.h.orig Mon Feb 28 13:53:40 2005 -+++ src/xterm.h Mon Feb 28 13:53:57 2005 -@@ -21,8 +21,8 @@ - - #include <X11/Xlib.h> - #include <X11/cursorfont.h> --#include <X11/Xutil.h> - #include <X11/keysym.h> -+#include <X11/Xutil.h> - #include <X11/Xatom.h> - #include <X11/Xresource.h> |