diff options
| author | Kenichi Handa | 2010-05-14 13:15:58 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-05-14 13:15:58 +0900 |
| commit | ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c (patch) | |
| tree | 0f53c077154c7cd5f05b339d91905dfd2391679d | |
| parent | 82ebc97b11a369303345927c98e7bc69928c9117 (diff) | |
| parent | 508197067c434b0111bcb6ded742d424bb738ece (diff) | |
| download | emacs-ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c.tar.gz emacs-ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c.zip | |
merge trunk
106 files changed, 1662 insertions, 1562 deletions
| @@ -1,3 +1,37 @@ | |||
| 1 | 2010-05-14 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * configure.in (cpp_undefs): Add mktime, register, X11. | ||
| 4 | |||
| 5 | * configure.in (GPM_MOUSE_SUPPORT): Remove. | ||
| 6 | (MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): New output variables. | ||
| 7 | (HAVE_WINDOW_SYSTEM, HAVE_MOUSE): Move out of AC_BOTTOM. | ||
| 8 | |||
| 9 | * configure.in (NS_IMPL_GNUSTEP_INC): New output variable. | ||
| 10 | (GNUSTEP_MAKEFILES): Do not output. | ||
| 11 | |||
| 12 | 2010-05-13 Glenn Morris <rgm@gnu.org> | ||
| 13 | |||
| 14 | * configure.in: Fix some paren typos. | ||
| 15 | |||
| 16 | * configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS. | ||
| 17 | |||
| 18 | * configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define. | ||
| 19 | |||
| 20 | 2010-05-12 Glenn Morris <rgm@gnu.org> | ||
| 21 | |||
| 22 | * configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused. | ||
| 23 | |||
| 24 | * configure.in (LIB_GCC): New output variable. | ||
| 25 | |||
| 26 | 2010-05-11 Glenn Morris <rgm@gnu.org> | ||
| 27 | |||
| 28 | * make-dist (msdos): No more mainmake. | ||
| 29 | |||
| 30 | * configure.in: Generate lib-src/Makefile directly, do not run cpp. | ||
| 31 | * config.bat: Do not run cpp on lib-src/Makefile.in. | ||
| 32 | |||
| 33 | * config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile. | ||
| 34 | |||
| 1 | 2010-05-10 Glenn Morris <rgm@gnu.org> | 35 | 2010-05-10 Glenn Morris <rgm@gnu.org> |
| 2 | 36 | ||
| 3 | * configure.in (LIBS_SYSTEM): New output variable, replacing cpp. | 37 | * configure.in (LIBS_SYSTEM): New output variable, replacing cpp. |
| @@ -5864,7 +5898,7 @@ | |||
| 5864 | 1994-05-09 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) | 5898 | 1994-05-09 David J. MacKenzie (djm@nutrimat.gnu.ai.mit.edu) |
| 5865 | 5899 | ||
| 5866 | * configure.in: Remove AC_LANG_C call. Not needed with Autoconf | 5900 | * configure.in: Remove AC_LANG_C call. Not needed with Autoconf |
| 5867 | version > 1.8. | 5901 | version > 1.8. |
| 5868 | 5902 | ||
| 5869 | 1994-05-08 Morten Welinder (terra@diku.dk) | 5903 | 1994-05-08 Morten Welinder (terra@diku.dk) |
| 5870 | 5904 | ||
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index af1d15e5cff..1f42eeb9528 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES | |||
| @@ -22,7 +22,6 @@ NS_IMPL_GNUSTEP Compile support for GNUstep implementation of NS GUI API. | |||
| 22 | NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API. | 22 | NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API. |
| 23 | HAVE_X11 Compile support for the X11 GUI. | 23 | HAVE_X11 Compile support for the X11 GUI. |
| 24 | HAVE_X_WINDOWS Compile support for X Window system | 24 | HAVE_X_WINDOWS Compile support for X Window system |
| 25 | X11 ?? Makefile.in suggests it's equivalent to HAVE_X11 | ||
| 26 | USE_LUCID Use the Lucid toolkit for menus&scrollbars. Requires HAVE_X11. | 25 | USE_LUCID Use the Lucid toolkit for menus&scrollbars. Requires HAVE_X11. |
| 27 | USE_MOTIF Use the Motif toolkit for menus&scrollbars. Requires HAVE_X11. | 26 | USE_MOTIF Use the Motif toolkit for menus&scrollbars. Requires HAVE_X11. |
| 28 | USE_GTK Use the Gtk toolkit for menus&scrollbars. Requires HAVE_X11. | 27 | USE_GTK Use the Gtk toolkit for menus&scrollbars. Requires HAVE_X11. |
| @@ -55,7 +54,6 @@ HAVE_PTYS | |||
| 55 | HAVE_TERMIO | 54 | HAVE_TERMIO |
| 56 | HAVE_TERMIOS | 55 | HAVE_TERMIOS |
| 57 | INTERRUPT_INPUT | 56 | INTERRUPT_INPUT |
| 58 | MAIL_USE_FLOCK | ||
| 59 | NARROWPROTO | 57 | NARROWPROTO |
| 60 | SEPCHAR | 58 | SEPCHAR |
| 61 | SIGTYPE | 59 | SIGTYPE |
| @@ -85,6 +83,9 @@ BCOPY_DOWNWARD_SAFE | |||
| 85 | BCOPY_UPWARD_SAFE | 83 | BCOPY_UPWARD_SAFE |
| 86 | BITS_PER_EMACS_INT | 84 | BITS_PER_EMACS_INT |
| 87 | BITS_PER_LONG | 85 | BITS_PER_LONG |
| 86 | BITS_PER_CHAR | ||
| 87 | BITS_PER_SHORT | ||
| 88 | BITS_PER_INT | ||
| 88 | BROKEN_DATAGRAM_SOCKETS | 89 | BROKEN_DATAGRAM_SOCKETS |
| 89 | BROKEN_FIONREAD | 90 | BROKEN_FIONREAD |
| 90 | BROKEN_GET_CURRENT_DIR_NAME | 91 | BROKEN_GET_CURRENT_DIR_NAME |
| @@ -99,7 +100,6 @@ BSD4_2 | |||
| 99 | BSD4_3 | 100 | BSD4_3 |
| 100 | BSD_SYSTEM | 101 | BSD_SYSTEM |
| 101 | CLASH_DETECTION | 102 | CLASH_DETECTION |
| 102 | C_SWITCH_X_SYSTEM | ||
| 103 | DATA_SEG_BITS | 103 | DATA_SEG_BITS |
| 104 | DATA_START | 104 | DATA_START |
| 105 | DBL_MIN_REPLACEMENT | 105 | DBL_MIN_REPLACEMENT |
| @@ -115,7 +115,6 @@ EMACS_CONFIGURATION | |||
| 115 | EMACS_CONFIG_OPTIONS | 115 | EMACS_CONFIG_OPTIONS |
| 116 | EMACS_INT | 116 | EMACS_INT |
| 117 | EMACS_UINT | 117 | EMACS_UINT |
| 118 | END_FILES_1 | ||
| 119 | FILE_SYSTEM_CASE | 118 | FILE_SYSTEM_CASE |
| 120 | FLOAT_CHECK_DOMAIN | 119 | FLOAT_CHECK_DOMAIN |
| 121 | FSCALE | 120 | FSCALE |
| @@ -134,7 +133,6 @@ HAVE_BCMP | |||
| 134 | HAVE_BCOPY | 133 | HAVE_BCOPY |
| 135 | HAVE_CBRT | 134 | HAVE_CBRT |
| 136 | HAVE_CLOSEDIR | 135 | HAVE_CLOSEDIR |
| 137 | HAVE_CRTIN | ||
| 138 | HAVE_DUP2 | 136 | HAVE_DUP2 |
| 139 | HAVE_EUIDACCESS | 137 | HAVE_EUIDACCESS |
| 140 | HAVE_FMOD | 138 | HAVE_FMOD |
| @@ -155,9 +153,6 @@ HAVE_INDEX | |||
| 155 | HAVE_INET_SOCKETS | 153 | HAVE_INET_SOCKETS |
| 156 | HAVE_INVERSE_HYPERBOLIC | 154 | HAVE_INVERSE_HYPERBOLIC |
| 157 | HAVE_LIBKSTAT | 155 | HAVE_LIBKSTAT |
| 158 | HAVE_LIBNCURSES | ||
| 159 | HAVE_LIBPTHREADS | ||
| 160 | HAVE_LIBXMU | ||
| 161 | HAVE_LIMITS_H | 156 | HAVE_LIMITS_H |
| 162 | HAVE_LINUX_VERSION_H | 157 | HAVE_LINUX_VERSION_H |
| 163 | HAVE_LOGB | 158 | HAVE_LOGB |
| @@ -220,6 +215,7 @@ LINUX_VERSION_CODE | |||
| 220 | LISP_FLOAT_TYPE | 215 | LISP_FLOAT_TYPE |
| 221 | LNOFLSH | 216 | LNOFLSH |
| 222 | LOCALTIME_CACHE | 217 | LOCALTIME_CACHE |
| 218 | MAIL_USE_FLOCK | ||
| 223 | MAIL_USE_LOCKF | 219 | MAIL_USE_LOCKF |
| 224 | MAIL_USE_POP | 220 | MAIL_USE_POP |
| 225 | MAIL_USE_SYSTEM_LOCK | 221 | MAIL_USE_SYSTEM_LOCK |
| @@ -266,8 +262,6 @@ SIGQUIT | |||
| 266 | SIGTRAP | 262 | SIGTRAP |
| 267 | SIGTYPE | 263 | SIGTYPE |
| 268 | SOLARIS2 | 264 | SOLARIS2 |
| 269 | START_FILES | ||
| 270 | START_FILES_1 | ||
| 271 | STDC_HEADERS | 265 | STDC_HEADERS |
| 272 | SYMS_SYSTEM | 266 | SYMS_SYSTEM |
| 273 | SYSTEM_PURESIZE_EXTRA | 267 | SYSTEM_PURESIZE_EXTRA |
| @@ -310,7 +304,6 @@ _WINSOCKAPI_ | |||
| 310 | _WINSOCK_H | 304 | _WINSOCK_H |
| 311 | __ELF__ | 305 | __ELF__ |
| 312 | __FreeBSD__ | 306 | __FreeBSD__ |
| 313 | __FreeBSD_version | ||
| 314 | __GNUC__ | 307 | __GNUC__ |
| 315 | __GNU_LIBRARY__ | 308 | __GNU_LIBRARY__ |
| 316 | __GNUC_MINOR__ | 309 | __GNUC_MINOR__ |
diff --git a/admin/notes/cpp b/admin/notes/cpp index 275001369d9..73b4b3d64ff 100644 --- a/admin/notes/cpp +++ b/admin/notes/cpp | |||
| @@ -1,11 +1,7 @@ | |||
| 1 | ttn 2003-04-09 | 1 | ttn 2003-04-09 |
| 2 | 2 | ||
| 3 | we use a C preprocesor not only in the normal compilation of .c files | 3 | we use a C preprocesor not only in the normal compilation of .c files |
| 4 | into object files, but also for creating | 4 | into object files, but also for creating src/Makefile. |
| 5 | |||
| 6 | src/Makefile | ||
| 7 | lib-src/Makefile | ||
| 8 | |||
| 9 | (delimited by comment "start of cpp stuff"). some cpp implementations | 5 | (delimited by comment "start of cpp stuff"). some cpp implementations |
| 10 | insert whitespace in between tokens. | 6 | insert whitespace in between tokens. |
| 11 | 7 | ||
diff --git a/config.bat b/config.bat index 271673bc302..0482d4f15f0 100644 --- a/config.bat +++ b/config.bat | |||
| @@ -221,16 +221,17 @@ cd .. | |||
| 221 | rem ---------------------------------------------------------------------- | 221 | rem ---------------------------------------------------------------------- |
| 222 | Echo Configuring the library source directory... | 222 | Echo Configuring the library source directory... |
| 223 | cd lib-src | 223 | cd lib-src |
| 224 | rem Create "makefile" from "makefile.in". | ||
| 225 | sed -e "1,/== start of cpp stuff ==/s@^##*[ ].*$@@" <Makefile.in >junk.c | ||
| 226 | gcc -E -traditional -I. -I../src junk.c | sed -e "s/^ / /" -e "/^#/d" -e "/^[ ]*$/d" >makefile.new | ||
| 227 | If "%DJGPP_VER%" == "2" goto libsrc-v2 | 224 | If "%DJGPP_VER%" == "2" goto libsrc-v2 |
| 228 | sed -f ../msdos/sed3.inp <makefile.new >Makefile | 225 | sed -f ../msdos/sed3.inp <Makefile.in >Makefile |
| 229 | Goto libsrc2 | 226 | Goto libsrc2 |
| 230 | :libsrc-v2 | 227 | :libsrc-v2 |
| 231 | sed -f ../msdos/sed3v2.inp <makefile.new >Makefile | 228 | sed -f ../msdos/sed3v2.inp <Makefile.in >Makefile |
| 232 | :libsrc2 | 229 | :libsrc2 |
| 233 | rm -f makefile.new junk.c | 230 | if "%X11%" == "" goto libsrc2a |
| 231 | mv Makefile makefile.tmp | ||
| 232 | sed -f ../msdos/sed3x.inp <makefile.tmp >Makefile | ||
| 233 | rm -f makefile.tmp | ||
| 234 | :libsrc2a | ||
| 234 | if "%nodebug%" == "" goto libsrc3 | 235 | if "%nodebug%" == "" goto libsrc3 |
| 235 | sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp | 236 | sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp |
| 236 | sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile | 237 | sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile |
| @@ -717,6 +717,7 @@ SET_MAKE | |||
| 717 | XMKMF | 717 | XMKMF |
| 718 | LD_SWITCH_X_SITE_AUX | 718 | LD_SWITCH_X_SITE_AUX |
| 719 | LD_SWITCH_X_SITE_AUX_RPATH | 719 | LD_SWITCH_X_SITE_AUX_RPATH |
| 720 | NS_IMPL_GNUSTEP_INC | ||
| 720 | NS_OBJ | 721 | NS_OBJ |
| 721 | NS_SUPPORT | 722 | NS_SUPPORT |
| 722 | LIB_STANDARD | 723 | LIB_STANDARD |
| @@ -751,7 +752,6 @@ LIBPNG | |||
| 751 | LIBTIFF | 752 | LIBTIFF |
| 752 | LIBGIF | 753 | LIBGIF |
| 753 | LIBGPM | 754 | LIBGPM |
| 754 | GPM_MOUSE_SUPPORT | ||
| 755 | LIBXSM | 755 | LIBXSM |
| 756 | ALLOCA | 756 | ALLOCA |
| 757 | liblockfile | 757 | liblockfile |
| @@ -796,11 +796,9 @@ ns_appdir | |||
| 796 | ns_appbindir | 796 | ns_appbindir |
| 797 | ns_appresdir | 797 | ns_appresdir |
| 798 | ns_appsrc | 798 | ns_appsrc |
| 799 | GNUSTEP_MAKEFILES | ||
| 800 | GNUSTEP_SYSTEM_HEADERS | 799 | GNUSTEP_SYSTEM_HEADERS |
| 801 | GNUSTEP_SYSTEM_LIBRARIES | 800 | GNUSTEP_SYSTEM_LIBRARIES |
| 802 | GNU_OBJC_CFLAGS | 801 | GNU_OBJC_CFLAGS |
| 803 | LIB_SRC_EXTRA_INSTALLABLES | ||
| 804 | OTHER_FILES | 802 | OTHER_FILES |
| 805 | XMENU_OBJ | 803 | XMENU_OBJ |
| 806 | XOBJ | 804 | XOBJ |
| @@ -815,6 +813,10 @@ PRE_ALLOC_OBJ | |||
| 815 | POST_ALLOC_OBJ | 813 | POST_ALLOC_OBJ |
| 816 | LD_SWITCH_SYSTEM_TEMACS | 814 | LD_SWITCH_SYSTEM_TEMACS |
| 817 | LD_SWITCH_SYSTEM_EXTRA | 815 | LD_SWITCH_SYSTEM_EXTRA |
| 816 | LIB_GCC | ||
| 817 | MOUSE_SUPPORT | ||
| 818 | TOOLTIP_SUPPORT | ||
| 819 | WINDOW_SUPPORT | ||
| 818 | LTLIBOBJS' | 820 | LTLIBOBJS' |
| 819 | ac_subst_files='' | 821 | ac_subst_files='' |
| 820 | ac_user_opts=' | 822 | ac_user_opts=' |
| @@ -6484,7 +6486,7 @@ case $opsys in | |||
| 6484 | START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o' | 6486 | START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o' |
| 6485 | ;; | 6487 | ;; |
| 6486 | netbsd | openbsd ) | 6488 | netbsd | openbsd ) |
| 6487 | if test -f $(CRT_DIR)/crti.o; then | 6489 | if test -f $CRT_DIR/crti.o; then |
| 6488 | LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o' | 6490 | LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o' |
| 6489 | START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o' | 6491 | START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o' |
| 6490 | else | 6492 | else |
| @@ -9929,6 +9931,7 @@ fi | |||
| 9929 | HAVE_NS=no | 9931 | HAVE_NS=no |
| 9930 | NS_IMPL_COCOA=no | 9932 | NS_IMPL_COCOA=no |
| 9931 | NS_IMPL_GNUSTEP=no | 9933 | NS_IMPL_GNUSTEP=no |
| 9934 | NS_IMPL_GNUSTEP_INC= | ||
| 9932 | tmp_CPPFLAGS="$CPPFLAGS" | 9935 | tmp_CPPFLAGS="$CPPFLAGS" |
| 9933 | tmp_CFLAGS="$CFLAGS" | 9936 | tmp_CFLAGS="$CFLAGS" |
| 9934 | CPPFLAGS="$CPPFLAGS -x objective-c" | 9937 | CPPFLAGS="$CPPFLAGS -x objective-c" |
| @@ -9949,6 +9952,13 @@ if test "${with_ns}" != no; then | |||
| 9949 | GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" | 9952 | GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" |
| 9950 | GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" | 9953 | GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" |
| 9951 | GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" | 9954 | GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" |
| 9955 | ## Pull in stuff from GNUstep-make. | ||
| 9956 | NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu | ||
| 9957 | GUI_LIB=gnu | ||
| 9958 | include $GNUSTEP_MAKEFILES/Additional/base.make | ||
| 9959 | include $GNUSTEP_MAKEFILES/Additional/gui.make | ||
| 9960 | shared=no | ||
| 9961 | " | ||
| 9952 | CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 9962 | CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
| 9953 | CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 9963 | CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
| 9954 | REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 9964 | REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
| @@ -10141,6 +10151,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |||
| 10141 | fi | 10151 | fi |
| 10142 | fi | 10152 | fi |
| 10143 | 10153 | ||
| 10154 | |||
| 10144 | NS_OBJ= | 10155 | NS_OBJ= |
| 10145 | NS_SUPPORT= | 10156 | NS_SUPPORT= |
| 10146 | if test "${HAVE_NS}" = yes; then | 10157 | if test "${HAVE_NS}" = yes; then |
| @@ -15991,7 +16002,7 @@ fi | |||
| 15991 | ### Use -lgpm if available, unless `--with-gpm=no'. | 16002 | ### Use -lgpm if available, unless `--with-gpm=no'. |
| 15992 | HAVE_GPM=no | 16003 | HAVE_GPM=no |
| 15993 | LIBGPM= | 16004 | LIBGPM= |
| 15994 | GPM_MOUSE_SUPPORT= | 16005 | MOUSE_SUPPORT= |
| 15995 | if test "${with_gpm}" != "no"; then | 16006 | if test "${with_gpm}" != "no"; then |
| 15996 | if test "${ac_cv_header_gpm_h+set}" = set; then | 16007 | if test "${ac_cv_header_gpm_h+set}" = set; then |
| 15997 | { $as_echo "$as_me:$LINENO: checking for gpm.h" >&5 | 16008 | { $as_echo "$as_me:$LINENO: checking for gpm.h" >&5 |
| @@ -16201,12 +16212,12 @@ cat >>confdefs.h <<\_ACEOF | |||
| 16201 | _ACEOF | 16212 | _ACEOF |
| 16202 | 16213 | ||
| 16203 | LIBGPM=-lgpm | 16214 | LIBGPM=-lgpm |
| 16204 | GPM_MOUSE_SUPPORT="\${lispsource}mouse.elc" | 16215 | ## May be reset below. |
| 16216 | MOUSE_SUPPORT="\$(GPM_MOUSE_SUPPORT)" | ||
| 16205 | fi | 16217 | fi |
| 16206 | fi | 16218 | fi |
| 16207 | 16219 | ||
| 16208 | 16220 | ||
| 16209 | |||
| 16210 | if test "${ac_cv_header_malloc_malloc_h+set}" = set; then | 16221 | if test "${ac_cv_header_malloc_malloc_h+set}" = set; then |
| 16211 | { $as_echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5 | 16222 | { $as_echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5 |
| 16212 | $as_echo_n "checking for malloc/malloc.h... " >&6; } | 16223 | $as_echo_n "checking for malloc/malloc.h... " >&6; } |
| @@ -26313,6 +26324,7 @@ fi | |||
| 26313 | ### Use configuration here uncanonicalized to avoid exceeding size limits. | 26324 | ### Use configuration here uncanonicalized to avoid exceeding size limits. |
| 26314 | 26325 | ||
| 26315 | 26326 | ||
| 26327 | ## Unused? | ||
| 26316 | 26328 | ||
| 26317 | 26329 | ||
| 26318 | 26330 | ||
| @@ -26334,6 +26346,9 @@ fi | |||
| 26334 | 26346 | ||
| 26335 | 26347 | ||
| 26336 | 26348 | ||
| 26349 | ## FIXME? Nothing uses @LD_SWITCH_X_SITE@. | ||
| 26350 | ## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the | ||
| 26351 | ## end of LIBX_BASE, but nothing ever set it. | ||
| 26337 | 26352 | ||
| 26338 | 26353 | ||
| 26339 | 26354 | ||
| @@ -26353,8 +26368,6 @@ fi | |||
| 26353 | 26368 | ||
| 26354 | 26369 | ||
| 26355 | 26370 | ||
| 26356 | |||
| 26357 | |||
| 26358 | cat >>confdefs.h <<_ACEOF | 26371 | cat >>confdefs.h <<_ACEOF |
| 26359 | #define EMACS_CONFIGURATION "${canonical}" | 26372 | #define EMACS_CONFIGURATION "${canonical}" |
| 26360 | _ACEOF | 26373 | _ACEOF |
| @@ -26375,16 +26388,6 @@ cat >>confdefs.h <<_ACEOF | |||
| 26375 | _ACEOF | 26388 | _ACEOF |
| 26376 | 26389 | ||
| 26377 | 26390 | ||
| 26378 | cat >>confdefs.h <<_ACEOF | ||
| 26379 | #define LD_SWITCH_X_SITE ${LD_SWITCH_X_SITE} | ||
| 26380 | _ACEOF | ||
| 26381 | |||
| 26382 | |||
| 26383 | cat >>confdefs.h <<_ACEOF | ||
| 26384 | #define C_SWITCH_X_SITE ${C_SWITCH_X_SITE} | ||
| 26385 | _ACEOF | ||
| 26386 | |||
| 26387 | |||
| 26388 | XMENU_OBJ= | 26391 | XMENU_OBJ= |
| 26389 | XOBJ= | 26392 | XOBJ= |
| 26390 | if test "${HAVE_X_WINDOWS}" = "yes" ; then | 26393 | if test "${HAVE_X_WINDOWS}" = "yes" ; then |
| @@ -26481,7 +26484,7 @@ else | |||
| 26481 | LIBX_OTHER= | 26484 | LIBX_OTHER= |
| 26482 | fi | 26485 | fi |
| 26483 | 26486 | ||
| 26484 | if test "$HAVE_GTK" = "yes"; then | 26487 | if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then |
| 26485 | OLDXMENU= | 26488 | OLDXMENU= |
| 26486 | LIBXMENU= | 26489 | LIBXMENU= |
| 26487 | fi | 26490 | fi |
| @@ -26568,6 +26571,61 @@ fi | |||
| 26568 | 26571 | ||
| 26569 | 26572 | ||
| 26570 | 26573 | ||
| 26574 | LIB_GCC= | ||
| 26575 | if test "x$GCC" = "xyes"; then | ||
| 26576 | |||
| 26577 | case "$opsys" in | ||
| 26578 | ## cygwin: don't link against static libgcc. | ||
| 26579 | cygwin|freebsd|netbsd|openbsd) LIB_GCC= ;; | ||
| 26580 | |||
| 26581 | gnu-*) | ||
| 26582 | ## armin76@gentoo.org reported that the lgcc_s flag is necessary to | ||
| 26583 | ## build on ARM EABI under GNU/Linux. (Bug#5518) | ||
| 26584 | ## Note that m/arm.h never bothered to undefine LIB_GCC first. | ||
| 26585 | if test "$machine" = "arm"; then | ||
| 26586 | LIB_GCC="-lgcc_s" | ||
| 26587 | else | ||
| 26588 | ## FIXME? s/gnu-linux.h used to define LIB_GCC as below, then | ||
| 26589 | ## immediately undefine it again and redefine it to empty. | ||
| 26590 | ## Was the C_SWITCH_X_SITE part really necessary? | ||
| 26591 | ## LIB_GCC=`$CC $C_SWITCH_X_SITE -print-libgcc-file-name` | ||
| 26592 | LIB_GCC= | ||
| 26593 | fi | ||
| 26594 | ;; | ||
| 26595 | |||
| 26596 | ## Ask GCC where to find libgcc.a. | ||
| 26597 | *) LIB_GCC=`$CC -print-libgcc-file-name 2> /dev/null` ;; | ||
| 26598 | esac | ||
| 26599 | fi | ||
| 26600 | |||
| 26601 | |||
| 26602 | TOOLTIP_SUPPORT= | ||
| 26603 | WINDOW_SUPPORT= | ||
| 26604 | ## If we're using X11/GNUstep, define some consequences. | ||
| 26605 | if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then | ||
| 26606 | |||
| 26607 | cat >>confdefs.h <<\_ACEOF | ||
| 26608 | #define HAVE_WINDOW_SYSTEM 1 | ||
| 26609 | _ACEOF | ||
| 26610 | |||
| 26611 | |||
| 26612 | cat >>confdefs.h <<\_ACEOF | ||
| 26613 | #define HAVE_MOUSE 1 | ||
| 26614 | _ACEOF | ||
| 26615 | |||
| 26616 | MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)" | ||
| 26617 | TOOLTIP_SUPPORT="\${lispsource}mouse.elc" | ||
| 26618 | |||
| 26619 | WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)" | ||
| 26620 | test "$HAVE_X_WINDOWS" = "yes" && \ | ||
| 26621 | WINDOW_SUPPORT="$WINDOW_SUPPORT \$(X_WINDOW_SUPPORT)" | ||
| 26622 | |||
| 26623 | fi | ||
| 26624 | |||
| 26625 | |||
| 26626 | |||
| 26627 | |||
| 26628 | |||
| 26571 | 26629 | ||
| 26572 | 26630 | ||
| 26573 | 26631 | ||
| @@ -26664,7 +26722,7 @@ test "${exec_prefix}" != NONE && | |||
| 26664 | # the C preprocessor to some helpful value like 1, or maybe the empty | 26722 | # the C preprocessor to some helpful value like 1, or maybe the empty |
| 26665 | # string. Needless to say consequent macro substitutions are less | 26723 | # string. Needless to say consequent macro substitutions are less |
| 26666 | # than conducive to the makefile finding the correct directory. | 26724 | # than conducive to the makefile finding the correct directory. |
| 26667 | cpp_undefs="`echo $srcdir $configuration $canonical unix | | 26725 | cpp_undefs="`echo $srcdir $configuration $canonical unix mktime register X11 | |
| 26668 | sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ | 26726 | sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ |
| 26669 | -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`" | 26727 | -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`" |
| 26670 | 26728 | ||
| @@ -26690,7 +26748,7 @@ fi | |||
| 26690 | rm -f conftest* | 26748 | rm -f conftest* |
| 26691 | 26749 | ||
| 26692 | 26750 | ||
| 26693 | ac_config_files="$ac_config_files Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile.c:src/Makefile.in lwlib/Makefile lisp/Makefile leim/Makefile" | 26751 | ac_config_files="$ac_config_files Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile.c:src/Makefile.in lwlib/Makefile lisp/Makefile leim/Makefile" |
| 26694 | 26752 | ||
| 26695 | ac_config_commands="$ac_config_commands default" | 26753 | ac_config_commands="$ac_config_commands default" |
| 26696 | 26754 | ||
| @@ -27289,7 +27347,7 @@ do | |||
| 27289 | case $ac_config_target in | 27347 | case $ac_config_target in |
| 27290 | "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;; | 27348 | "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;; |
| 27291 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | 27349 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
| 27292 | "lib-src/Makefile.c") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile.c:lib-src/Makefile.in" ;; | 27350 | "lib-src/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile" ;; |
| 27293 | "oldXMenu/Makefile") CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;; | 27351 | "oldXMenu/Makefile") CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;; |
| 27294 | "doc/emacs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/emacs/Makefile" ;; | 27352 | "doc/emacs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/emacs/Makefile" ;; |
| 27295 | "doc/misc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/misc/Makefile" ;; | 27353 | "doc/misc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/misc/Makefile" ;; |
| @@ -27934,22 +27992,6 @@ if test "x$GCC" = xyes && test "x$CPP_NEED_TRADITIONAL" = xyes; then | |||
| 27934 | CPPFLAGS="$CPPFLAGS -traditional" | 27992 | CPPFLAGS="$CPPFLAGS -traditional" |
| 27935 | fi | 27993 | fi |
| 27936 | 27994 | ||
| 27937 | echo creating lib-src/Makefile | ||
| 27938 | ( cd lib-src | ||
| 27939 | rm -f junk.c junk1.c junk2.c | ||
| 27940 | sed -e '/start of cpp stuff/q' \ | ||
| 27941 | < Makefile.c > junk1.c | ||
| 27942 | sed -e '1,/start of cpp stuff/d'\ | ||
| 27943 | -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ | ||
| 27944 | < Makefile.c > junk.c | ||
| 27945 | $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ | ||
| 27946 | sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c | ||
| 27947 | cat junk1.c junk2.c > Makefile.new | ||
| 27948 | rm -f junk.c junk1.c junk2.c | ||
| 27949 | chmod 444 Makefile.new | ||
| 27950 | mv -f Makefile.new Makefile | ||
| 27951 | ) | ||
| 27952 | |||
| 27953 | echo creating src/Makefile | 27995 | echo creating src/Makefile |
| 27954 | ( cd src | 27996 | ( cd src |
| 27955 | rm -f junk.c junk1.c junk2.c | 27997 | rm -f junk.c junk1.c junk2.c |
diff --git a/configure.in b/configure.in index c99167f205f..2475caae053 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -1094,7 +1094,7 @@ case $opsys in | |||
| 1094 | START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o' | 1094 | START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o' |
| 1095 | ;; | 1095 | ;; |
| 1096 | netbsd | openbsd ) | 1096 | netbsd | openbsd ) |
| 1097 | if test -f $(CRT_DIR)/crti.o; then | 1097 | if test -f $CRT_DIR/crti.o; then |
| 1098 | LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o' | 1098 | LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o' |
| 1099 | START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o' | 1099 | START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o' |
| 1100 | else | 1100 | else |
| @@ -1452,6 +1452,7 @@ fi | |||
| 1452 | HAVE_NS=no | 1452 | HAVE_NS=no |
| 1453 | NS_IMPL_COCOA=no | 1453 | NS_IMPL_COCOA=no |
| 1454 | NS_IMPL_GNUSTEP=no | 1454 | NS_IMPL_GNUSTEP=no |
| 1455 | NS_IMPL_GNUSTEP_INC= | ||
| 1455 | tmp_CPPFLAGS="$CPPFLAGS" | 1456 | tmp_CPPFLAGS="$CPPFLAGS" |
| 1456 | tmp_CFLAGS="$CFLAGS" | 1457 | tmp_CFLAGS="$CFLAGS" |
| 1457 | CPPFLAGS="$CPPFLAGS -x objective-c" | 1458 | CPPFLAGS="$CPPFLAGS -x objective-c" |
| @@ -1473,6 +1474,13 @@ if test "${with_ns}" != no; then | |||
| 1473 | GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" | 1474 | GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" |
| 1474 | GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" | 1475 | GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" |
| 1475 | GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" | 1476 | GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" |
| 1477 | ## Pull in stuff from GNUstep-make. | ||
| 1478 | NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu | ||
| 1479 | GUI_LIB=gnu | ||
| 1480 | include $GNUSTEP_MAKEFILES/Additional/base.make | ||
| 1481 | include $GNUSTEP_MAKEFILES/Additional/gui.make | ||
| 1482 | shared=no | ||
| 1483 | " | ||
| 1476 | CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 1484 | CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
| 1477 | CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 1485 | CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
| 1478 | REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" | 1486 | REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" |
| @@ -1491,6 +1499,7 @@ if test "${with_ns}" != no; then | |||
| 1491 | NS_HAVE_NSINTEGER=no | 1499 | NS_HAVE_NSINTEGER=no |
| 1492 | fi | 1500 | fi |
| 1493 | fi | 1501 | fi |
| 1502 | AC_SUBST(NS_IMPL_GNUSTEP_INC) | ||
| 1494 | 1503 | ||
| 1495 | NS_OBJ= | 1504 | NS_OBJ= |
| 1496 | NS_SUPPORT= | 1505 | NS_SUPPORT= |
| @@ -2391,7 +2400,7 @@ fi | |||
| 2391 | ### Use -lgpm if available, unless `--with-gpm=no'. | 2400 | ### Use -lgpm if available, unless `--with-gpm=no'. |
| 2392 | HAVE_GPM=no | 2401 | HAVE_GPM=no |
| 2393 | LIBGPM= | 2402 | LIBGPM= |
| 2394 | GPM_MOUSE_SUPPORT= | 2403 | MOUSE_SUPPORT= |
| 2395 | if test "${with_gpm}" != "no"; then | 2404 | if test "${with_gpm}" != "no"; then |
| 2396 | AC_CHECK_HEADER(gpm.h, | 2405 | AC_CHECK_HEADER(gpm.h, |
| 2397 | [AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes)]) | 2406 | [AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes)]) |
| @@ -2399,11 +2408,11 @@ if test "${with_gpm}" != "no"; then | |||
| 2399 | if test "${HAVE_GPM}" = "yes"; then | 2408 | if test "${HAVE_GPM}" = "yes"; then |
| 2400 | AC_DEFINE(HAVE_GPM, 1, [Define to 1 if you have the gpm library (-lgpm).]) | 2409 | AC_DEFINE(HAVE_GPM, 1, [Define to 1 if you have the gpm library (-lgpm).]) |
| 2401 | LIBGPM=-lgpm | 2410 | LIBGPM=-lgpm |
| 2402 | GPM_MOUSE_SUPPORT="\${lispsource}mouse.elc" | 2411 | ## May be reset below. |
| 2412 | MOUSE_SUPPORT="\$(GPM_MOUSE_SUPPORT)" | ||
| 2403 | fi | 2413 | fi |
| 2404 | fi | 2414 | fi |
| 2405 | AC_SUBST(LIBGPM) | 2415 | AC_SUBST(LIBGPM) |
| 2406 | AC_SUBST(GPM_MOUSE_SUPPORT) | ||
| 2407 | 2416 | ||
| 2408 | dnl Check for malloc/malloc.h on darwin | 2417 | dnl Check for malloc/malloc.h on darwin |
| 2409 | AC_CHECK_HEADER(malloc/malloc.h, [AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.])]) | 2418 | AC_CHECK_HEADER(malloc/malloc.h, [AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.])]) |
| @@ -3012,6 +3021,7 @@ fi | |||
| 3012 | ### Use configuration here uncanonicalized to avoid exceeding size limits. | 3021 | ### Use configuration here uncanonicalized to avoid exceeding size limits. |
| 3013 | AC_SUBST(version) | 3022 | AC_SUBST(version) |
| 3014 | AC_SUBST(configuration) | 3023 | AC_SUBST(configuration) |
| 3024 | ## Unused? | ||
| 3015 | AC_SUBST(canonical) | 3025 | AC_SUBST(canonical) |
| 3016 | AC_SUBST(srcdir) | 3026 | AC_SUBST(srcdir) |
| 3017 | AC_SUBST(prefix) | 3027 | AC_SUBST(prefix) |
| @@ -3033,6 +3043,9 @@ AC_SUBST(bitmapdir) | |||
| 3033 | AC_SUBST(gamedir) | 3043 | AC_SUBST(gamedir) |
| 3034 | AC_SUBST(gameuser) | 3044 | AC_SUBST(gameuser) |
| 3035 | AC_SUBST(unexec) | 3045 | AC_SUBST(unexec) |
| 3046 | ## FIXME? Nothing uses @LD_SWITCH_X_SITE@. | ||
| 3047 | ## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the | ||
| 3048 | ## end of LIBX_BASE, but nothing ever set it. | ||
| 3036 | AC_SUBST(LD_SWITCH_X_SITE) | 3049 | AC_SUBST(LD_SWITCH_X_SITE) |
| 3037 | AC_SUBST(C_SWITCH_X_SITE) | 3050 | AC_SUBST(C_SWITCH_X_SITE) |
| 3038 | AC_SUBST(C_SWITCH_X_SYSTEM) | 3051 | AC_SUBST(C_SWITCH_X_SYSTEM) |
| @@ -3046,11 +3059,9 @@ AC_SUBST(ns_appdir) | |||
| 3046 | AC_SUBST(ns_appbindir) | 3059 | AC_SUBST(ns_appbindir) |
| 3047 | AC_SUBST(ns_appresdir) | 3060 | AC_SUBST(ns_appresdir) |
| 3048 | AC_SUBST(ns_appsrc) | 3061 | AC_SUBST(ns_appsrc) |
| 3049 | AC_SUBST(GNUSTEP_MAKEFILES) | ||
| 3050 | AC_SUBST(GNUSTEP_SYSTEM_HEADERS) | 3062 | AC_SUBST(GNUSTEP_SYSTEM_HEADERS) |
| 3051 | AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES) | 3063 | AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES) |
| 3052 | AC_SUBST(GNU_OBJC_CFLAGS) | 3064 | AC_SUBST(GNU_OBJC_CFLAGS) |
| 3053 | AC_SUBST(LIB_SRC_EXTRA_INSTALLABLES) | ||
| 3054 | AC_SUBST(OTHER_FILES) | 3065 | AC_SUBST(OTHER_FILES) |
| 3055 | 3066 | ||
| 3056 | AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}", | 3067 | AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}", |
| @@ -3061,18 +3072,6 @@ AC_DEFINE_UNQUOTED(config_machfile, "${machfile}", | |||
| 3061 | [Define to the used machine dependent file.]) | 3072 | [Define to the used machine dependent file.]) |
| 3062 | AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}", | 3073 | AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}", |
| 3063 | [Define to the used os dependent file.]) | 3074 | [Define to the used os dependent file.]) |
| 3064 | AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE}, | ||
| 3065 | [Define LD_SWITCH_X_SITE to contain any special flags your loader | ||
| 3066 | may need to deal with X Windows. For instance, if you've defined | ||
| 3067 | HAVE_X_WINDOWS above and your X libraries aren't in a place that | ||
| 3068 | your loader can find on its own, you might want to add "-L/..." or | ||
| 3069 | something similar.]) | ||
| 3070 | AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE, ${C_SWITCH_X_SITE}, | ||
| 3071 | [Define C_SWITCH_X_SITE to contain any special flags your compiler | ||
| 3072 | may need to deal with X Windows. For instance, if you've defined | ||
| 3073 | HAVE_X_WINDOWS above and your X include files aren't in a place | ||
| 3074 | that your compiler can find on its own, you might want to add | ||
| 3075 | "-I/..." or something similar.]) | ||
| 3076 | 3075 | ||
| 3077 | XMENU_OBJ= | 3076 | XMENU_OBJ= |
| 3078 | XOBJ= | 3077 | XOBJ= |
| @@ -3153,7 +3152,7 @@ else | |||
| 3153 | LIBX_OTHER= | 3152 | LIBX_OTHER= |
| 3154 | fi | 3153 | fi |
| 3155 | 3154 | ||
| 3156 | if test "$HAVE_GTK" = "yes"; then | 3155 | if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then |
| 3157 | OLDXMENU= | 3156 | OLDXMENU= |
| 3158 | LIBXMENU= | 3157 | LIBXMENU= |
| 3159 | fi | 3158 | fi |
| @@ -3234,6 +3233,54 @@ fi | |||
| 3234 | AC_SUBST(LD_SWITCH_SYSTEM_EXTRA) | 3233 | AC_SUBST(LD_SWITCH_SYSTEM_EXTRA) |
| 3235 | 3234 | ||
| 3236 | 3235 | ||
| 3236 | LIB_GCC= | ||
| 3237 | if test "x$GCC" = "xyes"; then | ||
| 3238 | |||
| 3239 | case "$opsys" in | ||
| 3240 | ## cygwin: don't link against static libgcc. | ||
| 3241 | cygwin|freebsd|netbsd|openbsd) LIB_GCC= ;; | ||
| 3242 | |||
| 3243 | gnu-*) | ||
| 3244 | ## armin76@gentoo.org reported that the lgcc_s flag is necessary to | ||
| 3245 | ## build on ARM EABI under GNU/Linux. (Bug#5518) | ||
| 3246 | ## Note that m/arm.h never bothered to undefine LIB_GCC first. | ||
| 3247 | if test "$machine" = "arm"; then | ||
| 3248 | LIB_GCC="-lgcc_s" | ||
| 3249 | else | ||
| 3250 | ## FIXME? s/gnu-linux.h used to define LIB_GCC as below, then | ||
| 3251 | ## immediately undefine it again and redefine it to empty. | ||
| 3252 | ## Was the C_SWITCH_X_SITE part really necessary? | ||
| 3253 | ## LIB_GCC=`$CC $C_SWITCH_X_SITE -print-libgcc-file-name` | ||
| 3254 | LIB_GCC= | ||
| 3255 | fi | ||
| 3256 | ;; | ||
| 3257 | |||
| 3258 | ## Ask GCC where to find libgcc.a. | ||
| 3259 | *) LIB_GCC=`$CC -print-libgcc-file-name 2> /dev/null` ;; | ||
| 3260 | esac | ||
| 3261 | fi dnl if $GCC | ||
| 3262 | AC_SUBST(LIB_GCC) | ||
| 3263 | |||
| 3264 | |||
| 3265 | TOOLTIP_SUPPORT= | ||
| 3266 | WINDOW_SUPPORT= | ||
| 3267 | ## If we're using X11/GNUstep, define some consequences. | ||
| 3268 | if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then | ||
| 3269 | AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.]) | ||
| 3270 | AC_DEFINE(HAVE_MOUSE, 1, [Define if you have mouse support.]) | ||
| 3271 | MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)" | ||
| 3272 | TOOLTIP_SUPPORT="\${lispsource}mouse.elc" | ||
| 3273 | |||
| 3274 | WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)" | ||
| 3275 | test "$HAVE_X_WINDOWS" = "yes" && \ | ||
| 3276 | WINDOW_SUPPORT="$WINDOW_SUPPORT \$(X_WINDOW_SUPPORT)" | ||
| 3277 | |||
| 3278 | fi | ||
| 3279 | AC_SUBST(MOUSE_SUPPORT) | ||
| 3280 | AC_SUBST(TOOLTIP_SUPPORT) | ||
| 3281 | AC_SUBST(WINDOW_SUPPORT) | ||
| 3282 | |||
| 3283 | |||
| 3237 | AH_TOP([/* GNU Emacs site configuration template file. | 3284 | AH_TOP([/* GNU Emacs site configuration template file. |
| 3238 | Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, | 3285 | Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, |
| 3239 | 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3286 | 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| @@ -3262,12 +3309,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 3262 | ])dnl | 3309 | ])dnl |
| 3263 | 3310 | ||
| 3264 | AH_BOTTOM([ | 3311 | AH_BOTTOM([ |
| 3265 | /* If we're using X11/Carbon/GNUstep, define some consequences. */ | ||
| 3266 | #if defined(HAVE_X_WINDOWS) || defined(HAVE_NS) | ||
| 3267 | #define HAVE_WINDOW_SYSTEM | ||
| 3268 | #define HAVE_MOUSE | ||
| 3269 | #endif | ||
| 3270 | |||
| 3271 | /* Define AMPERSAND_FULL_NAME if you use the convention | 3312 | /* Define AMPERSAND_FULL_NAME if you use the convention |
| 3272 | that & in the full name stands for the login id. */ | 3313 | that & in the full name stands for the login id. */ |
| 3273 | /* Turned on June 1996 supposing nobody will mind it. */ | 3314 | /* Turned on June 1996 supposing nobody will mind it. */ |
| @@ -3292,7 +3333,7 @@ AH_BOTTOM([ | |||
| 3292 | #endif | 3333 | #endif |
| 3293 | #endif /* __FreeBSD__ || __NetBSD__ || __linux__ */ | 3334 | #endif /* __FreeBSD__ || __NetBSD__ || __linux__ */ |
| 3294 | 3335 | ||
| 3295 | /* If using GNU, then support inline function declarations. */ | 3336 | /* If using GNU, then support inline function declarations. */ |
| 3296 | /* Don't try to switch on inline handling as detected by AC_C_INLINE | 3337 | /* Don't try to switch on inline handling as detected by AC_C_INLINE |
| 3297 | generally, because even if non-gcc compilers accept `inline', they | 3338 | generally, because even if non-gcc compilers accept `inline', they |
| 3298 | may reject `extern inline'. */ | 3339 | may reject `extern inline'. */ |
| @@ -3317,7 +3358,7 @@ AH_BOTTOM([ | |||
| 3317 | /* Set up some defines, C and LD flags for NeXTstep interface on GNUstep. | 3358 | /* Set up some defines, C and LD flags for NeXTstep interface on GNUstep. |
| 3318 | (There is probably a better place to do this, but right now the Cocoa | 3359 | (There is probably a better place to do this, but right now the Cocoa |
| 3319 | side does this in s/darwin.h and we cannot | 3360 | side does this in s/darwin.h and we cannot |
| 3320 | parallel this exactly since GNUstep is multi-OS. */ | 3361 | parallel this exactly since GNUstep is multi-OS. */ |
| 3321 | #ifdef HAVE_NS | 3362 | #ifdef HAVE_NS |
| 3322 | # ifdef NS_IMPL_GNUSTEP | 3363 | # ifdef NS_IMPL_GNUSTEP |
| 3323 | /* GNUstep needs a bit more pure memory. Of the existing knobs, | 3364 | /* GNUstep needs a bit more pure memory. Of the existing knobs, |
| @@ -3414,7 +3455,7 @@ extern char *getenv (); | |||
| 3414 | #include "string.h" | 3455 | #include "string.h" |
| 3415 | #endif | 3456 | #endif |
| 3416 | #ifdef HAVE_STRINGS_H | 3457 | #ifdef HAVE_STRINGS_H |
| 3417 | #include "strings.h" /* May be needed for bcopy & al. */ | 3458 | #include "strings.h" /* May be needed for bcopy & al. */ |
| 3418 | #endif | 3459 | #endif |
| 3419 | #ifdef HAVE_STDLIB_H | 3460 | #ifdef HAVE_STDLIB_H |
| 3420 | #include <stdlib.h> | 3461 | #include <stdlib.h> |
| @@ -3581,7 +3622,10 @@ test "${exec_prefix}" != NONE && | |||
| 3581 | # the C preprocessor to some helpful value like 1, or maybe the empty | 3622 | # the C preprocessor to some helpful value like 1, or maybe the empty |
| 3582 | # string. Needless to say consequent macro substitutions are less | 3623 | # string. Needless to say consequent macro substitutions are less |
| 3583 | # than conducive to the makefile finding the correct directory. | 3624 | # than conducive to the makefile finding the correct directory. |
| 3584 | [cpp_undefs="`echo $srcdir $configuration $canonical unix | | 3625 | # src/Makefile.in used to treat X11 as equivalent to HAVE_X11. |
| 3626 | # But nothing in Emacs defines X11, and everywhere else uses HAVE_X11, | ||
| 3627 | # so that cannot have been doing anything. | ||
| 3628 | [cpp_undefs="`echo $srcdir $configuration $canonical unix mktime register X11 | | ||
| 3585 | sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ | 3629 | sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ |
| 3586 | -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"] | 3630 | -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"] |
| 3587 | 3631 | ||
| @@ -3595,7 +3639,7 @@ AC_EGREP_CPP(yes..yes, | |||
| 3595 | CPP_NEED_TRADITIONAL=no, | 3639 | CPP_NEED_TRADITIONAL=no, |
| 3596 | CPP_NEED_TRADITIONAL=yes) | 3640 | CPP_NEED_TRADITIONAL=yes) |
| 3597 | 3641 | ||
| 3598 | AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \ | 3642 | AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile \ |
| 3599 | doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ | 3643 | doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ |
| 3600 | doc/lispref/Makefile src/Makefile.c:src/Makefile.in \ | 3644 | doc/lispref/Makefile src/Makefile.c:src/Makefile.in \ |
| 3601 | lwlib/Makefile lisp/Makefile leim/Makefile, [ | 3645 | lwlib/Makefile lisp/Makefile leim/Makefile, [ |
| @@ -3619,22 +3663,6 @@ if test "x$GCC" = xyes && test "x$CPP_NEED_TRADITIONAL" = xyes; then | |||
| 3619 | CPPFLAGS="$CPPFLAGS -traditional" | 3663 | CPPFLAGS="$CPPFLAGS -traditional" |
| 3620 | fi | 3664 | fi |
| 3621 | 3665 | ||
| 3622 | echo creating lib-src/Makefile | ||
| 3623 | ( cd lib-src | ||
| 3624 | rm -f junk.c junk1.c junk2.c | ||
| 3625 | sed -e '/start of cpp stuff/q' \ | ||
| 3626 | < Makefile.c > junk1.c | ||
| 3627 | sed -e '1,/start of cpp stuff/d'\ | ||
| 3628 | -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ | ||
| 3629 | < Makefile.c > junk.c | ||
| 3630 | $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ | ||
| 3631 | sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c | ||
| 3632 | cat junk1.c junk2.c > Makefile.new | ||
| 3633 | rm -f junk.c junk1.c junk2.c | ||
| 3634 | chmod 444 Makefile.new | ||
| 3635 | mv -f Makefile.new Makefile | ||
| 3636 | ) | ||
| 3637 | |||
| 3638 | echo creating src/Makefile | 3666 | echo creating src/Makefile |
| 3639 | ( cd src | 3667 | ( cd src |
| 3640 | rm -f junk.c junk1.c junk2.c | 3668 | rm -f junk.c junk1.c junk2.c |
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 914e1d81098..f52240fbdfd 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog | |||
| @@ -309,11 +309,11 @@ | |||
| 309 | 2006-08-21 Robert J. Chassell <bob@rattlesnake.com> | 309 | 2006-08-21 Robert J. Chassell <bob@rattlesnake.com> |
| 310 | 310 | ||
| 311 | * emacs-lisp-intro.texi: Deleted in directory copy of texinfo.tex | 311 | * emacs-lisp-intro.texi: Deleted in directory copy of texinfo.tex |
| 312 | and pointed towards ../man/texinfo.tex so only one file | 312 | and pointed towards ../man/texinfo.tex so only one file |
| 313 | needs updating. Added comment of what to do when building on own. | 313 | needs updating. Added comment of what to do when building on own. |
| 314 | 314 | ||
| 315 | * texinfo.tex: Changed to version 2006-02-13.16 | 315 | * texinfo.tex: Changed to version 2006-02-13.16 |
| 316 | to enable a DVI build using the more recent versions of TeX. | 316 | to enable a DVI build using the more recent versions of TeX. |
| 317 | 317 | ||
| 318 | 2006-05-25 David Kastrup <dak@gnu.org> | 318 | 2006-05-25 David Kastrup <dak@gnu.org> |
| 319 | 319 | ||
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index c4fe0c9f3ae..c6d3c1be498 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-05-13 Jay Belanger <jay.p.belanger@gmail.com> | ||
| 2 | |||
| 3 | * calc.texi: Remove "\turnoffactive" commands througout. | ||
| 4 | |||
| 1 | 2010-05-08 Štěpán Němec <stepnem@gmail.com> (tiny change) | 5 | 2010-05-08 Štěpán Němec <stepnem@gmail.com> (tiny change) |
| 2 | 6 | ||
| 3 | * url.texi (HTTP language/coding, Customization): | 7 | * url.texi (HTTP language/coding, Customization): |
| @@ -593,7 +597,7 @@ | |||
| 593 | (Agenda commands): Document new bulk commands. | 597 | (Agenda commands): Document new bulk commands. |
| 594 | (Plain lists): Document new behavior of | 598 | (Plain lists): Document new behavior of |
| 595 | `org-cycle-include-plain-lists'. | 599 | `org-cycle-include-plain-lists'. |
| 596 | Hyphenation only in TeX. | 600 | Hyphenation only in TeX. |
| 597 | (Clocking work time): Document the key to update effort | 601 | (Clocking work time): Document the key to update effort |
| 598 | estimates. | 602 | estimates. |
| 599 | (Clocking work time): Document the clock time display. | 603 | (Clocking work time): Document the clock time display. |
| @@ -1660,7 +1664,7 @@ | |||
| 1660 | 2008-06-15 Reiner Steib <Reiner.Steib@gmx.de> | 1664 | 2008-06-15 Reiner Steib <Reiner.Steib@gmx.de> |
| 1661 | 1665 | ||
| 1662 | * gnus.texi (Mail Source Customization): Correct values of | 1666 | * gnus.texi (Mail Source Customization): Correct values of |
| 1663 | `mail-source-delete-incoming'. Reported by Tassilo Horn. | 1667 | `mail-source-delete-incoming'. Reported by Tassilo Horn. |
| 1664 | (Oort Gnus): Fix version comment for mml-dnd-protocol-alist. | 1668 | (Oort Gnus): Fix version comment for mml-dnd-protocol-alist. |
| 1665 | 1669 | ||
| 1666 | 2008-06-14 Reiner Steib <Reiner.Steib@gmx.de> | 1670 | 2008-06-14 Reiner Steib <Reiner.Steib@gmx.de> |
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 96075b6710d..c578e919612 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi | |||
| @@ -76,7 +76,6 @@ | |||
| 76 | @newcount@calcpageno | 76 | @newcount@calcpageno |
| 77 | @newtoks@calcoldeverypar @calcoldeverypar=@everypar | 77 | @newtoks@calcoldeverypar @calcoldeverypar=@everypar |
| 78 | @everypar={@calceverypar@the@calcoldeverypar} | 78 | @everypar={@calceverypar@the@calcoldeverypar} |
| 79 | @ifx@turnoffactive@undefinedzzz@def@turnoffactive{}@fi | ||
| 80 | @ifx@ninett@undefinedzzz@font@ninett=cmtt9@fi | 79 | @ifx@ninett@undefinedzzz@font@ninett=cmtt9@fi |
| 81 | @catcode`@\=0 \catcode`\@=11 | 80 | @catcode`@\=0 \catcode`\@=11 |
| 82 | \r@ggedbottomtrue | 81 | \r@ggedbottomtrue |
| @@ -1804,7 +1803,6 @@ or, in large mathematical notation, | |||
| 1804 | @end example | 1803 | @end example |
| 1805 | @end ifnottex | 1804 | @end ifnottex |
| 1806 | @tex | 1805 | @tex |
| 1807 | \turnoffactive | ||
| 1808 | \beforedisplay | 1806 | \beforedisplay |
| 1809 | $$ 2 + { 3 \times 4 \times 5 \over 6 \times 7^8 } - 9 $$ | 1807 | $$ 2 + { 3 \times 4 \times 5 \over 6 \times 7^8 } - 9 $$ |
| 1810 | \afterdisplay | 1808 | \afterdisplay |
| @@ -3358,7 +3356,6 @@ Suppose we had the following set of equations: | |||
| 3358 | @end group | 3356 | @end group |
| 3359 | @end ifnottex | 3357 | @end ifnottex |
| 3360 | @tex | 3358 | @tex |
| 3361 | \turnoffactive | ||
| 3362 | \beforedisplayh | 3359 | \beforedisplayh |
| 3363 | $$ \openup1\jot \tabskip=0pt plus1fil | 3360 | $$ \openup1\jot \tabskip=0pt plus1fil |
| 3364 | \halign to\displaywidth{\tabskip=0pt | 3361 | \halign to\displaywidth{\tabskip=0pt |
| @@ -3385,7 +3382,6 @@ This can be cast into the matrix equation, | |||
| 3385 | @end group | 3382 | @end group |
| 3386 | @end ifnottex | 3383 | @end ifnottex |
| 3387 | @tex | 3384 | @tex |
| 3388 | \turnoffactive | ||
| 3389 | \beforedisplay | 3385 | \beforedisplay |
| 3390 | $$ \pmatrix{ 1 & 2 & 3 \cr 4 & 5 & 6 \cr 7 & 6 & 0 } | 3386 | $$ \pmatrix{ 1 & 2 & 3 \cr 4 & 5 & 6 \cr 7 & 6 & 0 } |
| 3391 | \times | 3387 | \times |
| @@ -3457,7 +3453,6 @@ in terms of @expr{a} and @expr{b}. | |||
| 3457 | @end group | 3453 | @end group |
| 3458 | @end ifnottex | 3454 | @end ifnottex |
| 3459 | @tex | 3455 | @tex |
| 3460 | \turnoffactive | ||
| 3461 | \beforedisplay | 3456 | \beforedisplay |
| 3462 | $$ \eqalign{ x &+ a y = 6 \cr | 3457 | $$ \eqalign{ x &+ a y = 6 \cr |
| 3463 | x &+ b y = 10} | 3458 | x &+ b y = 10} |
| @@ -3483,7 +3478,6 @@ on the left by the transpose of @expr{A}: | |||
| 3483 | @samp{trn(A)*A*X = trn(A)*B}. | 3478 | @samp{trn(A)*A*X = trn(A)*B}. |
| 3484 | @end ifnottex | 3479 | @end ifnottex |
| 3485 | @tex | 3480 | @tex |
| 3486 | \turnoffactive | ||
| 3487 | $A^T A \, X = A^T B$, where $A^T$ is the transpose \samp{trn(A)}. | 3481 | $A^T A \, X = A^T B$, where $A^T$ is the transpose \samp{trn(A)}. |
| 3488 | @end tex | 3482 | @end tex |
| 3489 | Now | 3483 | Now |
| @@ -3506,7 +3500,6 @@ system: | |||
| 3506 | @end group | 3500 | @end group |
| 3507 | @end ifnottex | 3501 | @end ifnottex |
| 3508 | @tex | 3502 | @tex |
| 3509 | \turnoffactive | ||
| 3510 | \beforedisplayh | 3503 | \beforedisplayh |
| 3511 | $$ \openup1\jot \tabskip=0pt plus1fil | 3504 | $$ \openup1\jot \tabskip=0pt plus1fil |
| 3512 | \halign to\displaywidth{\tabskip=0pt | 3505 | \halign to\displaywidth{\tabskip=0pt |
| @@ -3778,7 +3771,6 @@ m = (N sum(x y) - sum(x) sum(y)) / (N sum(x^2) - sum(x)^2) | |||
| 3778 | @end example | 3771 | @end example |
| 3779 | @end ifnottex | 3772 | @end ifnottex |
| 3780 | @tex | 3773 | @tex |
| 3781 | \turnoffactive | ||
| 3782 | \beforedisplay | 3774 | \beforedisplay |
| 3783 | $$ m = {N \sum x y - \sum x \sum y \over | 3775 | $$ m = {N \sum x y - \sum x \sum y \over |
| 3784 | N \sum x^2 - \left( \sum x \right)^2} $$ | 3776 | N \sum x^2 - \left( \sum x \right)^2} $$ |
| @@ -3820,7 +3812,6 @@ respectively. (We could have used @kbd{*} to compute @samp{sum(x^2)} and | |||
| 3820 | @samp{sum(x y)}.) | 3812 | @samp{sum(x y)}.) |
| 3821 | @end ifnottex | 3813 | @end ifnottex |
| 3822 | @tex | 3814 | @tex |
| 3823 | \turnoffactive | ||
| 3824 | These are $\sum x$, $\sum x^2$, $\sum y$, and $\sum x y$, | 3815 | These are $\sum x$, $\sum x^2$, $\sum y$, and $\sum x y$, |
| 3825 | respectively. (We could have used \kbd{*} to compute $\sum x^2$ and | 3816 | respectively. (We could have used \kbd{*} to compute $\sum x^2$ and |
| 3826 | $\sum x y$.) | 3817 | $\sum x y$.) |
| @@ -3874,7 +3865,6 @@ b = (sum(y) - m sum(x)) / N | |||
| 3874 | @end example | 3865 | @end example |
| 3875 | @end ifnottex | 3866 | @end ifnottex |
| 3876 | @tex | 3867 | @tex |
| 3877 | \turnoffactive | ||
| 3878 | \beforedisplay | 3868 | \beforedisplay |
| 3879 | $$ b = {\sum y - m \sum x \over N} $$ | 3869 | $$ b = {\sum y - m \sum x \over N} $$ |
| 3880 | \afterdisplay | 3870 | \afterdisplay |
| @@ -5223,7 +5213,6 @@ down to the formula, | |||
| 5223 | @end example | 5213 | @end example |
| 5224 | @end ifnottex | 5214 | @end ifnottex |
| 5225 | @tex | 5215 | @tex |
| 5226 | \turnoffactive | ||
| 5227 | \beforedisplay | 5216 | \beforedisplay |
| 5228 | $$ \displaylines{ | 5217 | $$ \displaylines{ |
| 5229 | \qquad {h \over 3} (f(a) + 4 f(a+h) + 2 f(a+2h) + 4 f(a+3h) + \cdots | 5218 | \qquad {h \over 3} (f(a) + 4 f(a+h) + 2 f(a+2h) + 4 f(a+3h) + \cdots |
| @@ -5245,7 +5234,6 @@ h * (f(a) + f(a+h) + f(a+2h) + f(a+3h) + ... | |||
| 5245 | @end example | 5234 | @end example |
| 5246 | @end ifnottex | 5235 | @end ifnottex |
| 5247 | @tex | 5236 | @tex |
| 5248 | \turnoffactive | ||
| 5249 | \beforedisplay | 5237 | \beforedisplay |
| 5250 | $$ h (f(a) + f(a+h) + f(a+2h) + f(a+3h) + \cdots | 5238 | $$ h (f(a) + f(a+h) + f(a+2h) + f(a+3h) + \cdots |
| 5251 | + f(a+(n-2)h) + f(a+(n-1)h)) $$ | 5239 | + f(a+(n-2)h) + f(a+(n-1)h)) $$ |
| @@ -5686,7 +5674,6 @@ cos(x) = 1 - x^2 / 2! + x^4 / 4! - x^6 / 6! + ... | |||
| 5686 | @end example | 5674 | @end example |
| 5687 | @end ifnottex | 5675 | @end ifnottex |
| 5688 | @tex | 5676 | @tex |
| 5689 | \turnoffactive | ||
| 5690 | \beforedisplay | 5677 | \beforedisplay |
| 5691 | $$ \cos x = 1 - {x^2 \over 2!} + {x^4 \over 4!} - {x^6 \over 6!} + \cdots $$ | 5678 | $$ \cos x = 1 - {x^2 \over 2!} + {x^4 \over 4!} - {x^6 \over 6!} + \cdots $$ |
| 5692 | \afterdisplay | 5679 | \afterdisplay |
| @@ -5704,7 +5691,6 @@ cos(x) = 1 - x^2 / 2! + O(x^3) | |||
| 5704 | @end example | 5691 | @end example |
| 5705 | @end ifnottex | 5692 | @end ifnottex |
| 5706 | @tex | 5693 | @tex |
| 5707 | \turnoffactive | ||
| 5708 | \beforedisplay | 5694 | \beforedisplay |
| 5709 | $$ \cos x = 1 - {x^2 \over 2!} + O(x^3) $$ | 5695 | $$ \cos x = 1 - {x^2 \over 2!} + O(x^3) $$ |
| 5710 | \afterdisplay | 5696 | \afterdisplay |
| @@ -6336,7 +6322,6 @@ s(n+1,m) = s(n,m-1) - n s(n,m) for n >= m >= 1. | |||
| 6336 | @end example | 6322 | @end example |
| 6337 | @end ifnottex | 6323 | @end ifnottex |
| 6338 | @tex | 6324 | @tex |
| 6339 | \turnoffactive | ||
| 6340 | \beforedisplay | 6325 | \beforedisplay |
| 6341 | $$ \eqalign{ s(n,n) &= 1 \qquad \hbox{for } n \ge 0, \cr | 6326 | $$ \eqalign{ s(n,n) &= 1 \qquad \hbox{for } n \ge 0, \cr |
| 6342 | s(n,0) &= 0 \qquad \hbox{for } n > 0, \cr | 6327 | s(n,0) &= 0 \qquad \hbox{for } n > 0, \cr |
| @@ -6875,7 +6860,6 @@ get the row sum. Similarly, use @kbd{[1 1] r 4 *} to get the column sum. | |||
| 6875 | @end example | 6860 | @end example |
| 6876 | @end ifnottex | 6861 | @end ifnottex |
| 6877 | @tex | 6862 | @tex |
| 6878 | \turnoffactive | ||
| 6879 | \beforedisplay | 6863 | \beforedisplay |
| 6880 | $$ \eqalign{ x &+ a y = 6 \cr | 6864 | $$ \eqalign{ x &+ a y = 6 \cr |
| 6881 | x &+ b y = 10} | 6865 | x &+ b y = 10} |
| @@ -6939,7 +6923,6 @@ which we can solve using Calc's @samp{/} command. | |||
| 6939 | @end example | 6923 | @end example |
| 6940 | @end ifnottex | 6924 | @end ifnottex |
| 6941 | @tex | 6925 | @tex |
| 6942 | \turnoffactive | ||
| 6943 | \beforedisplayh | 6926 | \beforedisplayh |
| 6944 | $$ \openup1\jot \tabskip=0pt plus1fil | 6927 | $$ \openup1\jot \tabskip=0pt plus1fil |
| 6945 | \halign to\displaywidth{\tabskip=0pt | 6928 | \halign to\displaywidth{\tabskip=0pt |
| @@ -7074,7 +7057,6 @@ the first job is to form the matrix that describes the problem. | |||
| 7074 | @end example | 7057 | @end example |
| 7075 | @end ifnottex | 7058 | @end ifnottex |
| 7076 | @tex | 7059 | @tex |
| 7077 | \turnoffactive | ||
| 7078 | \beforedisplay | 7060 | \beforedisplay |
| 7079 | $$ m \times x + b \times 1 = y $$ | 7061 | $$ m \times x + b \times 1 = y $$ |
| 7080 | \afterdisplay | 7062 | \afterdisplay |
| @@ -7865,7 +7847,6 @@ So the result when we take the modulo after every step is, | |||
| 7865 | @end example | 7847 | @end example |
| 7866 | @end ifnottex | 7848 | @end ifnottex |
| 7867 | @tex | 7849 | @tex |
| 7868 | \turnoffactive | ||
| 7869 | \beforedisplay | 7850 | \beforedisplay |
| 7870 | $$ 3 (3 a + b - 511 m) + c - 511 n $$ | 7851 | $$ 3 (3 a + b - 511 m) + c - 511 n $$ |
| 7871 | \afterdisplay | 7852 | \afterdisplay |
| @@ -7881,7 +7862,6 @@ the distributive law yields | |||
| 7881 | @end example | 7862 | @end example |
| 7882 | @end ifnottex | 7863 | @end ifnottex |
| 7883 | @tex | 7864 | @tex |
| 7884 | \turnoffactive | ||
| 7885 | \beforedisplay | 7865 | \beforedisplay |
| 7886 | $$ 9 a + 3 b + c - 511\times3 m - 511 n $$ | 7866 | $$ 9 a + 3 b + c - 511\times3 m - 511 n $$ |
| 7887 | \afterdisplay | 7867 | \afterdisplay |
| @@ -7899,7 +7879,6 @@ term. So we can take it out to get an equivalent formula with | |||
| 7899 | @end example | 7879 | @end example |
| 7900 | @end ifnottex | 7880 | @end ifnottex |
| 7901 | @tex | 7881 | @tex |
| 7902 | \turnoffactive | ||
| 7903 | \beforedisplay | 7882 | \beforedisplay |
| 7904 | $$ 9 a + 3 b + c - 511 n^{\prime} $$ | 7883 | $$ 9 a + 3 b + c - 511 n^{\prime} $$ |
| 7905 | \afterdisplay | 7884 | \afterdisplay |
| @@ -14408,7 +14387,6 @@ $$ \sin\left( a^2 \over b_i \right) $$ | |||
| 14408 | @end group | 14387 | @end group |
| 14409 | @end example | 14388 | @end example |
| 14410 | @tex | 14389 | @tex |
| 14411 | \turnoffactive | ||
| 14412 | $$ [3 + 4i, {3 \over 4}, 3 \pm 4, [ 3 \ldots \infty)] $$ | 14390 | $$ [3 + 4i, {3 \over 4}, 3 \pm 4, [ 3 \ldots \infty)] $$ |
| 14413 | @end tex | 14391 | @end tex |
| 14414 | @sp 1 | 14392 | @sp 1 |
| @@ -14434,7 +14412,6 @@ $$ [|a|, \left| a \over b \right|, | |||
| 14434 | @end group | 14412 | @end group |
| 14435 | @end example | 14413 | @end example |
| 14436 | @tex | 14414 | @tex |
| 14437 | \turnoffactive | ||
| 14438 | $$ [\sin{a}, \sin{2 a}, \sin(2 + a), \sin\left( {a \over b} \right)] $$ | 14415 | $$ [\sin{a}, \sin{2 a}, \sin(2 + a), \sin\left( {a \over b} \right)] $$ |
| 14439 | @end tex | 14416 | @end tex |
| 14440 | @sp 2 | 14417 | @sp 2 |
| @@ -14467,7 +14444,6 @@ First with @samp{\def\evalto@{@}}, then with @samp{\def\evalto#1\to@{@}}: | |||
| 14467 | @end group | 14444 | @end group |
| 14468 | @end example | 14445 | @end example |
| 14469 | @tex | 14446 | @tex |
| 14470 | \turnoffactive | ||
| 14471 | $$ 2 + 3 \to 5 $$ | 14447 | $$ 2 + 3 \to 5 $$ |
| 14472 | $$ 5 $$ | 14448 | $$ 5 $$ |
| 14473 | @end tex | 14449 | @end tex |
| @@ -14482,7 +14458,6 @@ First with standard @code{\to}, then with @samp{\let\to\Rightarrow}: | |||
| 14482 | @end group | 14458 | @end group |
| 14483 | @end example | 14459 | @end example |
| 14484 | @tex | 14460 | @tex |
| 14485 | \turnoffactive | ||
| 14486 | $$ [{2 + 3 \to 5}, {{a \over 2} \to {b + c \over 2}}] $$ | 14461 | $$ [{2 + 3 \to 5}, {{a \over 2} \to {b + c \over 2}}] $$ |
| 14487 | {\let\to\Rightarrow | 14462 | {\let\to\Rightarrow |
| 14488 | $$ [{2 + 3 \to 5}, {{a \over 2} \to {b + c \over 2}}] $$} | 14463 | $$ [{2 + 3 \to 5}, {{a \over 2} \to {b + c \over 2}}] $$} |
| @@ -14499,7 +14474,6 @@ Matrices normally, then changing @code{\matrix} to @code{\pmatrix}: | |||
| 14499 | @end group | 14474 | @end group |
| 14500 | @end example | 14475 | @end example |
| 14501 | @tex | 14476 | @tex |
| 14502 | \turnoffactive | ||
| 14503 | $$ \matrix{ {a \over b} & 0 \cr 0 & 2^{(x + 1)} } $$ | 14477 | $$ \matrix{ {a \over b} & 0 \cr 0 & 2^{(x + 1)} } $$ |
| 14504 | $$ \pmatrix{ {a \over b} & 0 \cr 0 & 2^{(x + 1)} } $$ | 14478 | $$ \pmatrix{ {a \over b} & 0 \cr 0 & 2^{(x + 1)} } $$ |
| 14505 | @end tex | 14479 | @end tex |
| @@ -17935,7 +17909,6 @@ ddb(cost, salv, life, per) = --------, book = cost - depreciation so far | |||
| 17935 | @end example | 17909 | @end example |
| 17936 | @end ifnottex | 17910 | @end ifnottex |
| 17937 | @tex | 17911 | @tex |
| 17938 | \turnoffactive | ||
| 17939 | $$ \code{fv}(r, n, p) = p { (1 + r)^n - 1 \over r } $$ | 17912 | $$ \code{fv}(r, n, p) = p { (1 + r)^n - 1 \over r } $$ |
| 17940 | $$ \code{fvb}(r, n, p) = p { ((1 + r)^n - 1) (1 + r) \over r } $$ | 17913 | $$ \code{fvb}(r, n, p) = p { ((1 + r)^n - 1) (1 + r) \over r } $$ |
| 17941 | $$ \code{fvl}(r, n, p) = p (1 + r)^n $$ | 17914 | $$ \code{fvl}(r, n, p) = p (1 + r)^n $$ |
| @@ -18591,7 +18564,6 @@ letter gamma). You can obtain these using the @kbd{H f G} [@code{gammag}] | |||
| 18591 | and @kbd{H I f G} [@code{gammaG}] commands. | 18564 | and @kbd{H I f G} [@code{gammaG}] commands. |
| 18592 | @end ifnottex | 18565 | @end ifnottex |
| 18593 | @tex | 18566 | @tex |
| 18594 | \turnoffactive | ||
| 18595 | The functions corresponding to the integrals that define $P(a,x)$ | 18567 | The functions corresponding to the integrals that define $P(a,x)$ |
| 18596 | and $Q(a,x)$ but without the normalizing $1/\Gamma(a)$ | 18568 | and $Q(a,x)$ but without the normalizing $1/\Gamma(a)$ |
| 18597 | factor are called $\gamma(a,x)$ and $\Gamma(a,x)$, respectively. | 18569 | factor are called $\gamma(a,x)$ and $\Gamma(a,x)$, respectively. |
| @@ -20559,7 +20531,6 @@ this is the weighted mean of the @expr{x} values with weights | |||
| 20559 | @texline @math{1 /\sigma^2}. | 20531 | @texline @math{1 /\sigma^2}. |
| 20560 | @infoline @expr{1 / s^2}. | 20532 | @infoline @expr{1 / s^2}. |
| 20561 | @tex | 20533 | @tex |
| 20562 | \turnoffactive | ||
| 20563 | $$ \mu = { \displaystyle \sum { x_i \over \sigma_i^2 } \over | 20534 | $$ \mu = { \displaystyle \sum { x_i \over \sigma_i^2 } \over |
| 20564 | \displaystyle \sum { 1 \over \sigma_i^2 } } $$ | 20535 | \displaystyle \sum { 1 \over \sigma_i^2 } } $$ |
| 20565 | @end tex | 20536 | @end tex |
| @@ -20593,7 +20564,6 @@ root of the reciprocal of the sum of the reciprocals of the squares | |||
| 20593 | of the input errors. (I.e., the variance is the reciprocal of the | 20564 | of the input errors. (I.e., the variance is the reciprocal of the |
| 20594 | sum of the reciprocals of the variances.) | 20565 | sum of the reciprocals of the variances.) |
| 20595 | @tex | 20566 | @tex |
| 20596 | \turnoffactive | ||
| 20597 | $$ \sigma_\mu^2 = {1 \over \displaystyle \sum {1 \over \sigma_i^2}} $$ | 20567 | $$ \sigma_\mu^2 = {1 \over \displaystyle \sum {1 \over \sigma_i^2}} $$ |
| 20598 | @end tex | 20568 | @end tex |
| 20599 | If the inputs are plain | 20569 | If the inputs are plain |
| @@ -20603,7 +20573,6 @@ out to be equivalent to calculating the standard deviation and | |||
| 20603 | then assuming each value's error is equal to this standard | 20573 | then assuming each value's error is equal to this standard |
| 20604 | deviation.) | 20574 | deviation.) |
| 20605 | @tex | 20575 | @tex |
| 20606 | \turnoffactive | ||
| 20607 | $$ \sigma_\mu^2 = {\sigma^2 \over N} $$ | 20576 | $$ \sigma_\mu^2 = {\sigma^2 \over N} $$ |
| 20608 | @end tex | 20577 | @end tex |
| 20609 | 20578 | ||
| @@ -20636,7 +20605,6 @@ command computes the harmonic mean of the data values. This is | |||
| 20636 | defined as the reciprocal of the arithmetic mean of the reciprocals | 20605 | defined as the reciprocal of the arithmetic mean of the reciprocals |
| 20637 | of the values. | 20606 | of the values. |
| 20638 | @tex | 20607 | @tex |
| 20639 | \turnoffactive | ||
| 20640 | $$ { N \over \displaystyle \sum {1 \over x_i} } $$ | 20608 | $$ { N \over \displaystyle \sum {1 \over x_i} } $$ |
| 20641 | @end tex | 20609 | @end tex |
| 20642 | 20610 | ||
| @@ -20650,7 +20618,6 @@ is the @var{n}th root of the product of the values. This is also | |||
| 20650 | equal to the @code{exp} of the arithmetic mean of the logarithms | 20618 | equal to the @code{exp} of the arithmetic mean of the logarithms |
| 20651 | of the data values. | 20619 | of the data values. |
| 20652 | @tex | 20620 | @tex |
| 20653 | \turnoffactive | ||
| 20654 | $$ \exp \left ( \sum { \ln x_i } \right ) = | 20621 | $$ \exp \left ( \sum { \ln x_i } \right ) = |
| 20655 | \left ( \prod { x_i } \right)^{1 / N} $$ | 20622 | \left ( \prod { x_i } \right)^{1 / N} $$ |
| 20656 | @end tex | 20623 | @end tex |
| @@ -20662,7 +20629,6 @@ mean'' of two numbers taken from the stack. This is computed by | |||
| 20662 | replacing the two numbers with their arithmetic mean and geometric | 20629 | replacing the two numbers with their arithmetic mean and geometric |
| 20663 | mean, then repeating until the two values converge. | 20630 | mean, then repeating until the two values converge. |
| 20664 | @tex | 20631 | @tex |
| 20665 | \turnoffactive | ||
| 20666 | $$ a_{i+1} = { a_i + b_i \over 2 } , \qquad b_{i+1} = \sqrt{a_i b_i} $$ | 20632 | $$ a_{i+1} = { a_i + b_i \over 2 } , \qquad b_{i+1} = \sqrt{a_i b_i} $$ |
| 20667 | @end tex | 20633 | @end tex |
| 20668 | 20634 | ||
| @@ -20685,7 +20651,6 @@ deviation, whose value is the square root of the sum of the squares of | |||
| 20685 | the differences between the values and the mean of the @expr{N} values, | 20651 | the differences between the values and the mean of the @expr{N} values, |
| 20686 | divided by @expr{N-1}. | 20652 | divided by @expr{N-1}. |
| 20687 | @tex | 20653 | @tex |
| 20688 | \turnoffactive | ||
| 20689 | $$ \sigma^2 = {1 \over N - 1} \sum (x_i - \mu)^2 $$ | 20654 | $$ \sigma^2 = {1 \over N - 1} \sum (x_i - \mu)^2 $$ |
| 20690 | @end tex | 20655 | @end tex |
| 20691 | 20656 | ||
| @@ -20712,7 +20677,6 @@ is used when the input represents a sample of the set of all | |||
| 20712 | data values, so that the mean computed from the input is itself | 20677 | data values, so that the mean computed from the input is itself |
| 20713 | only an estimate of the true mean. | 20678 | only an estimate of the true mean. |
| 20714 | @tex | 20679 | @tex |
| 20715 | \turnoffactive | ||
| 20716 | $$ \sigma^2 = {1 \over N} \sum (x_i - \mu)^2 $$ | 20680 | $$ \sigma^2 = {1 \over N} \sum (x_i - \mu)^2 $$ |
| 20717 | @end tex | 20681 | @end tex |
| 20718 | 20682 | ||
| @@ -20777,7 +20741,6 @@ are composed of error forms, the error for a given data point | |||
| 20777 | is taken as the square root of the sum of the squares of the two | 20741 | is taken as the square root of the sum of the squares of the two |
| 20778 | input errors. | 20742 | input errors. |
| 20779 | @tex | 20743 | @tex |
| 20780 | \turnoffactive | ||
| 20781 | $$ \sigma_{x\!y}^2 = {1 \over N-1} \sum (x_i - \mu_x) (y_i - \mu_y) $$ | 20744 | $$ \sigma_{x\!y}^2 = {1 \over N-1} \sum (x_i - \mu_x) (y_i - \mu_y) $$ |
| 20782 | $$ \sigma_{x\!y}^2 = | 20745 | $$ \sigma_{x\!y}^2 = |
| 20783 | {\displaystyle {1 \over N-1} | 20746 | {\displaystyle {1 \over N-1} |
| @@ -20805,7 +20768,6 @@ This is defined by the covariance of the vectors divided by the | |||
| 20805 | product of their standard deviations. (There is no difference | 20768 | product of their standard deviations. (There is no difference |
| 20806 | between sample or population statistics here.) | 20769 | between sample or population statistics here.) |
| 20807 | @tex | 20770 | @tex |
| 20808 | \turnoffactive | ||
| 20809 | $$ r_{x\!y} = { \sigma_{x\!y}^2 \over \sigma_x^2 \sigma_y^2 } $$ | 20771 | $$ r_{x\!y} = { \sigma_{x\!y}^2 \over \sigma_x^2 \sigma_y^2 } $$ |
| 20810 | @end tex | 20772 | @end tex |
| 20811 | 20773 | ||
| @@ -24361,8 +24323,6 @@ For example, suppose the data matrix | |||
| 24361 | @end example | 24323 | @end example |
| 24362 | @end ifnottex | 24324 | @end ifnottex |
| 24363 | @tex | 24325 | @tex |
| 24364 | \turnoffactive | ||
| 24365 | \turnoffactive | ||
| 24366 | \beforedisplay | 24326 | \beforedisplay |
| 24367 | $$ \pmatrix{ 1 & 2 & 3 & 4 & 5 \cr | 24327 | $$ \pmatrix{ 1 & 2 & 3 & 4 & 5 \cr |
| 24368 | 5 & 7 & 9 & 11 & 13 } | 24328 | 5 & 7 & 9 & 11 & 13 } |
| @@ -24422,7 +24382,6 @@ chi^2 = sum((y_i - (a + b x_i))^2, i, 1, N) | |||
| 24422 | @end example | 24382 | @end example |
| 24423 | @end ifnottex | 24383 | @end ifnottex |
| 24424 | @tex | 24384 | @tex |
| 24425 | \turnoffactive | ||
| 24426 | \beforedisplay | 24385 | \beforedisplay |
| 24427 | $$ \chi^2 = \sum_{i=1}^N (y_i - (a + b x_i))^2 $$ | 24386 | $$ \chi^2 = \sum_{i=1}^N (y_i - (a + b x_i))^2 $$ |
| 24428 | \afterdisplay | 24387 | \afterdisplay |
| @@ -24613,7 +24572,6 @@ chi^2 = sum(((y_i - (a + b x_i)) / sigma_i)^2, i, 1, N) | |||
| 24613 | @end example | 24572 | @end example |
| 24614 | @end ifnottex | 24573 | @end ifnottex |
| 24615 | @tex | 24574 | @tex |
| 24616 | \turnoffactive | ||
| 24617 | \beforedisplay | 24575 | \beforedisplay |
| 24618 | $$ \chi^2 = \sum_{i=1}^N \left(y_i - (a + b x_i) \over \sigma_i\right)^2 $$ | 24576 | $$ \chi^2 = \sum_{i=1}^N \left(y_i - (a + b x_i) \over \sigma_i\right)^2 $$ |
| 24619 | \afterdisplay | 24577 | \afterdisplay |
| @@ -25388,7 +25346,6 @@ any later ones are answered by reading additional elements from | |||
| 25388 | the stack. Thus, @kbd{' k^2 @key{RET} ' k @key{RET} 1 @key{RET} 5 @key{RET} a + @key{RET}} | 25346 | the stack. Thus, @kbd{' k^2 @key{RET} ' k @key{RET} 1 @key{RET} 5 @key{RET} a + @key{RET}} |
| 25389 | produces the result 55. | 25347 | produces the result 55. |
| 25390 | @tex | 25348 | @tex |
| 25391 | \turnoffactive | ||
| 25392 | $$ \sum_{k=1}^5 k^2 = 55 $$ | 25349 | $$ \sum_{k=1}^5 k^2 = 55 $$ |
| 25393 | @end tex | 25350 | @end tex |
| 25394 | 25351 | ||
diff --git a/etc/ChangeLog b/etc/ChangeLog index 855bb93a1f0..4f83227c8dc 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1839,7 +1839,7 @@ | |||
| 1839 | 2006-11-05 Slawomir Nowaczyk <slawek@cs.lth.se> | 1839 | 2006-11-05 Slawomir Nowaczyk <slawek@cs.lth.se> |
| 1840 | 1840 | ||
| 1841 | * emacs.py (eargs): Provide eldoc message for builtin types. | 1841 | * emacs.py (eargs): Provide eldoc message for builtin types. |
| 1842 | Make sure eargs always outputs sentinel, to avoid Emacs freeze. | 1842 | Make sure eargs always outputs sentinel, to avoid Emacs freeze. |
| 1843 | 1843 | ||
| 1844 | 2006-10-22 Chong Yidong <cyd@stupidchicken.com> | 1844 | 2006-10-22 Chong Yidong <cyd@stupidchicken.com> |
| 1845 | 1845 | ||
| @@ -4646,8 +4646,8 @@ | |||
| 4646 | 1990-01-19 David Lawrence (tale@cocoa-puffs) | 4646 | 1990-01-19 David Lawrence (tale@cocoa-puffs) |
| 4647 | 4647 | ||
| 4648 | * timer.c, getdate.y (new files) and Makefile: | 4648 | * timer.c, getdate.y (new files) and Makefile: |
| 4649 | Sub-process support for run-at-time in timer.el. | 4649 | Sub-process support for run-at-time in timer.el. |
| 4650 | Doesn't yet work correctly for USG. | 4650 | Doesn't yet work correctly for USG. |
| 4651 | 4651 | ||
| 4652 | 1990-01-10 Jim Kingdon (kingdon@pogo) | 4652 | 1990-01-10 Jim Kingdon (kingdon@pogo) |
| 4653 | 4653 | ||
| @@ -43,6 +43,8 @@ You can disable this by using --without-selinux. | |||
| 43 | 43 | ||
| 44 | * Changes in Emacs 24.1 | 44 | * Changes in Emacs 24.1 |
| 45 | 45 | ||
| 46 | ** Completion can cycle, depending on completion-cycle-threshold. | ||
| 47 | |||
| 46 | ** auto-mode-case-fold is now enabled by default. | 48 | ** auto-mode-case-fold is now enabled by default. |
| 47 | 49 | ||
| 48 | +++ | 50 | +++ |
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 608d5c618b3..36e2f29e58f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,20 @@ | |||
| 1 | 2010-05-12 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@. | ||
| 4 | |||
| 5 | 2010-05-11 Glenn Morris <rgm@gnu.org> | ||
| 6 | |||
| 7 | * Makefile.in (.m.o): Remove, there are no .m files. | ||
| 8 | (BASE_CFLAGS): New variable. | ||
| 9 | (ALL_CFLAGS, LINK_CFLAGS, CPP_CFLAGS): Use $BASE_CFLAGS. | ||
| 10 | (check): Update the message. | ||
| 11 | (update-game-score${EXEEXT}): Do not use $MOVE_FLAGS. | ||
| 12 | |||
| 13 | * Makefile.in: Convert comments to makefile format. | ||
| 14 | |||
| 15 | * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. | ||
| 16 | (config.h) [MSDOS]: Do not include. | ||
| 17 | |||
| 1 | 2010-05-10 Glenn Morris <rgm@gnu.org> | 18 | 2010-05-10 Glenn Morris <rgm@gnu.org> |
| 2 | 19 | ||
| 3 | * Makefile.in (LIBS_SYSTEM): Set with configure, not cpp. | 20 | * Makefile.in (LIBS_SYSTEM): Set with configure, not cpp. |
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 5f0fb6e671f..4799a9fefc4 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in | |||
| @@ -31,6 +31,7 @@ EMACSOPT = -batch --no-site-file --multibyte | |||
| 31 | CC=@CC@ | 31 | CC=@CC@ |
| 32 | CFLAGS=@CFLAGS@ | 32 | CFLAGS=@CFLAGS@ |
| 33 | version=@version@ | 33 | version=@version@ |
| 34 | ## Used in $archlibdir. | ||
| 34 | configuration=@configuration@ | 35 | configuration=@configuration@ |
| 35 | EXEEXT=@EXEEXT@ | 36 | EXEEXT=@EXEEXT@ |
| 36 | C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ | 37 | C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ |
| @@ -107,7 +108,7 @@ INSTALL_STRIP = | |||
| 107 | 108 | ||
| 108 | # Things that a user might actually run, | 109 | # Things that a user might actually run, |
| 109 | # which should be installed in bindir. | 110 | # which should be installed in bindir. |
| 110 | INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} @LIB_SRC_EXTRA_INSTALLABLES@ | 111 | INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} |
| 111 | INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog | 112 | INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog |
| 112 | 113 | ||
| 113 | # Things that Emacs runs internally, or during the build process, | 114 | # Things that Emacs runs internally, or during the build process, |
| @@ -127,8 +128,8 @@ EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} | |||
| 127 | # Specify additional -D flags for movemail. Options: | 128 | # Specify additional -D flags for movemail. Options: |
| 128 | # -DMAIL_USE_FLOCK or -DMAIL_USE_LOCKF (use flock or lockf for file locking). | 129 | # -DMAIL_USE_FLOCK or -DMAIL_USE_LOCKF (use flock or lockf for file locking). |
| 129 | # See the comments about locking in movemail.c. Normally the values | 130 | # See the comments about locking in movemail.c. Normally the values |
| 130 | # in ../src/[ms]/*.h should be correct and you should not need to do anything. | 131 | # set by configure should be correct and you should not need to do anything. |
| 131 | # If neither flag is set, blessmail is used. | 132 | # If neither flag is set, you need to use blessmail. |
| 132 | MOVE_FLAGS= | 133 | MOVE_FLAGS= |
| 133 | 134 | ||
| 134 | ## Empty if either MAIL_USE_FLOCK or MAIL_USE_LOCKF, else need-blessmail. | 135 | ## Empty if either MAIL_USE_FLOCK or MAIL_USE_LOCKF, else need-blessmail. |
| @@ -160,40 +161,28 @@ LIBS_SYSTEM = @LIBS_SYSTEM@ | |||
| 160 | # Those files shared with other GNU utilities need HAVE_CONFIG_H | 161 | # Those files shared with other GNU utilities need HAVE_CONFIG_H |
| 161 | # defined before they know they can take advantage of the information | 162 | # defined before they know they can take advantage of the information |
| 162 | # in ../src/config.h. | 163 | # in ../src/config.h. |
| 163 | ALL_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} | 164 | BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src |
| 164 | LINK_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CFLAGS} | ||
| 165 | CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ${CPPFLAGS} ${CFLAGS} | ||
| 166 | 165 | ||
| 167 | # ========================== start of cpp stuff ======================= | 166 | ALL_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} |
| 168 | /* From here on, comments must be done in C syntax. */ | 167 | LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} |
| 169 | 168 | CPP_CFLAGS = ${BASE_CFLAGS} ${CPPFLAGS} ${CFLAGS} | |
| 170 | #ifdef MSDOS | ||
| 171 | #include "../src/config.h" | ||
| 172 | LIBS_SYSTEM = MSDOS_LIBS_SYSTEM | ||
| 173 | #endif | ||
| 174 | 169 | ||
| 175 | LOADLIBES=$(LIBS_SYSTEM) | 170 | LOADLIBES=$(LIBS_SYSTEM) |
| 176 | 171 | ||
| 177 | 172 | ||
| 178 | .SUFFIXES: .m | 173 | ## This is the default compilation command. |
| 179 | 174 | ## But we should never rely on it, because some make version failed to | |
| 180 | /* This is the default compilation command. | 175 | ## find it for getopt.o. |
| 181 | But we should never rely on it, because some make version | 176 | ## Using an explicit command made it work. |
| 182 | failed to find it for getopt.o. | ||
| 183 | Using an explicit command made it work. */ | ||
| 184 | .c.o: | 177 | .c.o: |
| 185 | ${CC} -c ${CPP_CFLAGS} $< | 178 | ${CC} -c ${CPP_CFLAGS} $< |
| 186 | 179 | ||
| 187 | .m.o: | ||
| 188 | $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< | ||
| 189 | |||
| 190 | all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} | 180 | all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} |
| 191 | 181 | ||
| 192 | /* These targets copy the scripts into the build directory | 182 | ## These targets copy the scripts into the build directory so that |
| 193 | so that they can be run from there in an uninstalled Emacs. | 183 | ## they can be run from there in an uninstalled Emacs. |
| 194 | The "-" is prepended because some versions of cp barf when | 184 | ## The "-" is prepended because some versions of cp barf when srcdir |
| 195 | srcdir is the current directory, and thus the file will be | 185 | ## is the current directory, and thus the file will be copied into itself. |
| 196 | copied into itself. */ | ||
| 197 | rcs2log: $(srcdir)/rcs2log | 186 | rcs2log: $(srcdir)/rcs2log |
| 198 | -cp -p $(srcdir)/rcs2log rcs2log | 187 | -cp -p $(srcdir)/rcs2log rcs2log |
| 199 | 188 | ||
| @@ -206,16 +195,15 @@ grep-changelog: $(srcdir)/grep-changelog | |||
| 206 | vcdiff: $(srcdir)/vcdiff | 195 | vcdiff: $(srcdir)/vcdiff |
| 207 | -cp -p $(srcdir)/vcdiff vcdiff | 196 | -cp -p $(srcdir)/vcdiff vcdiff |
| 208 | 197 | ||
| 209 | /* Only used if we need blessmail, but no harm in always defining. | 198 | ## Only used if we need blessmail, but no harm in always defining. |
| 210 | This makes the actual blessmail executable. */ | 199 | ## This makes the actual blessmail executable. |
| 211 | blessmail: | 200 | blessmail: |
| 212 | $(EMACS) $(EMACSOPT) -l $(srcdir)/../lisp/mail/blessmail.el | 201 | $(EMACS) $(EMACSOPT) -l $(srcdir)/../lisp/mail/blessmail.el |
| 213 | chmod +x blessmail | 202 | chmod +x blessmail |
| 214 | 203 | ||
| 215 | /* This checks if we need to run blessmail. */ | 204 | ## This checks if we need to run blessmail. |
| 205 | ## Do not charge ahead and do it! Let the installer decide. | ||
| 216 | need-blessmail: blessmail | 206 | need-blessmail: blessmail |
| 217 | /* Don\'t charge ahead and do it! Let the installer decide. | ||
| 218 | ./blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT} */ | ||
| 219 | @if [ `wc -l <blessmail` != 2 ] ; then \ | 207 | @if [ `wc -l <blessmail` != 2 ] ; then \ |
| 220 | dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \ | 208 | dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \ |
| 221 | echo Assuming $$dir is really the mail spool directory, you should; \ | 209 | echo Assuming $$dir is really the mail spool directory, you should; \ |
| @@ -224,11 +212,14 @@ need-blessmail: blessmail | |||
| 224 | echo Do that after running make install.; \ | 212 | echo Do that after running make install.; \ |
| 225 | fi | 213 | fi |
| 226 | 214 | ||
| 227 | /* This is the target invoked by the top-level Makefile. */ | 215 | ## This is the target invoked by the top-level Makefile. |
| 228 | maybe-blessmail: $(BLESSMAIL_TARGET) | 216 | maybe-blessmail: $(BLESSMAIL_TARGET) |
| 229 | 217 | ||
| 230 | /* Install the internal utilities. Until they are installed, we can | 218 | ## Install the internal utilities. Until they are installed, we can |
| 231 | just run them directly from lib-src. */ | 219 | ## just run them directly from lib-src. |
| 220 | ## If the chown/chmod commands fail, that is not a big deal. | ||
| 221 | ## update-game-score will detect at runtime that it is not setuid, | ||
| 222 | ## and handle things accordingly. | ||
| 232 | $(DESTDIR)${archlibdir}: all | 223 | $(DESTDIR)${archlibdir}: all |
| 233 | @echo | 224 | @echo |
| 234 | @echo "Installing utilities run internally by Emacs." | 225 | @echo "Installing utilities run internally by Emacs." |
| @@ -241,9 +232,6 @@ $(DESTDIR)${archlibdir}: all | |||
| 241 | umask 022; $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}; \ | 232 | umask 022; $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}; \ |
| 242 | touch $(DESTDIR)${gamedir}/snake-scores; \ | 233 | touch $(DESTDIR)${gamedir}/snake-scores; \ |
| 243 | touch $(DESTDIR)${gamedir}/tetris-scores | 234 | touch $(DESTDIR)${gamedir}/tetris-scores |
| 244 | /* If the following commands fail, that is not a big deal. | ||
| 245 | update-game-score will detect at runtime that it is not setuid, | ||
| 246 | and handle things accordingly. */ | ||
| 247 | -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \ | 235 | -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \ |
| 248 | chown ${gameuser} $(DESTDIR)${gamedir}; \ | 236 | chown ${gameuser} $(DESTDIR)${gamedir}; \ |
| 249 | chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \ | 237 | chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \ |
| @@ -294,24 +282,24 @@ maintainer-clean: distclean | |||
| 294 | extraclean: maintainer-clean | 282 | extraclean: maintainer-clean |
| 295 | -rm -f *~ \#* | 283 | -rm -f *~ \#* |
| 296 | 284 | ||
| 297 | /* Test the contents of the directory. */ | 285 | ## Test the contents of the directory. |
| 298 | check: | 286 | check: |
| 299 | @echo "We don't have any tests for GNU Emacs yet." | 287 | @echo "We don't have any tests for the lib-src/ directory yet." |
| 300 | 288 | ||
| 301 | tags: TAGS | 289 | tags: TAGS |
| 302 | TAGS: etags${EXEEXT} | 290 | TAGS: etags${EXEEXT} |
| 303 | etags *.[ch] | 291 | etags *.[ch] |
| 304 | 292 | ||
| 305 | /* This verifies that the non-ASCII characters in the file \`testfile\' | 293 | ## This verifies that the non-ASCII characters in the file \`testfile\' |
| 306 | have not been clobbered by whatever means were used to copy and | 294 | ## have not been clobbered by whatever means were used to copy and |
| 307 | distribute Emacs. If they were clobbered, all the .elc files were | 295 | ## distribute Emacs. If they were clobbered, all the .elc files were |
| 308 | clobbered too. */ | 296 | ## clobbered too. |
| 309 | test-distrib${EXEEXT}: ${srcdir}/test-distrib.c | 297 | test-distrib${EXEEXT}: ${srcdir}/test-distrib.c |
| 310 | $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c | 298 | $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c |
| 311 | ./test-distrib ${srcdir}/testfile | 299 | ./test-distrib ${srcdir}/testfile |
| 312 | 300 | ||
| 313 | /* We need the following in order to create a <getopt.h> when the system | 301 | ## We need the following in order to create a <getopt.h> when the system |
| 314 | does not have one that works with the given compiler. */ | 302 | ## does not have one that works with the given compiler. |
| 315 | GETOPT_H = @GETOPT_H@ | 303 | GETOPT_H = @GETOPT_H@ |
| 316 | getopt.h: getopt_.h | 304 | getopt.h: getopt_.h |
| 317 | cp $(srcdir)/getopt_.h $@-t | 305 | cp $(srcdir)/getopt_.h $@-t |
| @@ -336,8 +324,8 @@ etags${EXEEXT}: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h | |||
| 336 | ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h | 324 | ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h |
| 337 | $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse | 325 | $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse |
| 338 | 326 | ||
| 339 | /* We depend on etags to assure that parallel makes don\'t write two | 327 | ## We depend on etags to assure that parallel makes do not write two |
| 340 | etags.o files on top of each other. */ | 328 | ## etags.o files on top of each other. |
| 341 | ctags${EXEEXT}: etags${EXEEXT} | 329 | ctags${EXEEXT}: etags${EXEEXT} |
| 342 | $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags | 330 | $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags |
| 343 | 331 | ||
| @@ -360,7 +348,7 @@ b2m${EXEEXT}: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS) | |||
| 360 | movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS) | 348 | movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS) |
| 361 | $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MOVE) -o movemail | 349 | $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MOVE) -o movemail |
| 362 | 350 | ||
| 363 | /* We need to define emacs to get the right version of something (what?). */ | 351 | ## We need to define emacs to get the right version of something (what?). |
| 364 | movemail.o: ${srcdir}/movemail.c ../src/config.h $(GETOPT_H) | 352 | movemail.o: ${srcdir}/movemail.c ../src/config.h $(GETOPT_H) |
| 365 | $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c | 353 | $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c |
| 366 | 354 | ||
| @@ -379,8 +367,10 @@ hexl${EXEEXT}: ${srcdir}/hexl.c ../src/config.h | |||
| 379 | $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl | 367 | $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl |
| 380 | 368 | ||
| 381 | update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS) | 369 | update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS) |
| 382 | $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} update-game-score.o $(GETOPTOBJS) $(LOADLIBES) -o update-game-score | 370 | $(CC) ${LINK_CFLAGS} update-game-score.o $(GETOPTOBJS) $(LOADLIBES) -o update-game-score |
| 383 | 371 | ||
| 384 | update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H) | 372 | update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H) |
| 385 | $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ | 373 | $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ |
| 386 | -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" | 374 | -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" |
| 375 | |||
| 376 | ## Makefile ends here. | ||
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 871b51470f8..484ae6529c3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,13 +1,111 @@ | |||
| 1 | 2010-05-13 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | Add TeX open-block and close-block keybindings to SGML, and vice | ||
| 4 | versa. | ||
| 5 | |||
| 6 | * textmodes/tex-mode.el (tex-mode-map): Bind C-c C-t to | ||
| 7 | latex-open-block and C-c / to latex-close-block. | ||
| 8 | |||
| 9 | * textmodes/sgml-mode.el (sgml-mode-map): Bind C-c C-o to sgml-tag | ||
| 10 | and C-c C-e to sgml-close-tag. | ||
| 11 | |||
| 12 | 2010-05-13 Michael Albinus <michael.albinus@gmx.de> | ||
| 13 | |||
| 14 | * net/tramp.el (with-progress-reporter): Create reporter object | ||
| 15 | only when the message would be displayed. Handled nested calls. | ||
| 16 | (tramp-handle-load, tramp-handle-file-local-copy) | ||
| 17 | (tramp-handle-insert-file-contents, tramp-handle-write-region) | ||
| 18 | (tramp-maybe-send-script, tramp-find-shell): Use | ||
| 19 | `with-progress-reporter'. | ||
| 20 | (tramp-handle-dired-compress-file, tramp-maybe-open-connection): | ||
| 21 | Fix message text. | ||
| 22 | |||
| 23 | * net/tramp-smb.el (tramp-smb-handle-copy-file) | ||
| 24 | (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) | ||
| 25 | (tramp-smb-handle-write-region, tramp-smb-maybe-open-connection): | ||
| 26 | Use `with-progress-reporter'. | ||
| 27 | |||
| 28 | 2010-05-13 AgustÃn MartÃn <agustin.martin@hispalinux.es> | ||
| 29 | |||
| 30 | * ispell.el (ispell-init-process): Do not kill ispell process | ||
| 31 | everytime when spellchecking from the minibuffer (bug#6143). | ||
| 32 | |||
| 33 | 2010-05-13 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 34 | |||
| 35 | * progmodes/sh-script.el (sh-mode): Use define-derived-mode. | ||
| 36 | |||
| 37 | * dos-fns.el: Add "dos-" prefix for namespace control. | ||
| 38 | (convert-standard-filename): Define as alias for | ||
| 39 | dos-convert-standard-filename but only if applicable. | ||
| 40 | |||
| 41 | 2010-05-12 Alan Mackenzie <acm@muc.de> | ||
| 42 | |||
| 43 | * progmodes/cc-cmds.el (c-beginning-of-defun, c-end-of-defun): | ||
| 44 | Push the mark at the start of these functions when appropriate. | ||
| 45 | |||
| 46 | 2010-05-12 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 47 | |||
| 48 | * minibuffer.el (completion-cycle-threshold): New custom var. | ||
| 49 | (completion--do-completion): Use it. | ||
| 50 | (minibuffer-complete): Use cycling if appropriate. | ||
| 51 | |||
| 52 | 2010-05-11 Juanma Barranquero <lekktu@gmail.com> | ||
| 53 | |||
| 54 | * dirtrack.el (dirtrackp): Remove defcustom; don't make automatically | ||
| 55 | buffer-local (it's an obsolete alias for `dirtrack-mode') (bug#6173). | ||
| 56 | |||
| 57 | 2010-05-11 Juri Linkov <juri@jurta.org> | ||
| 58 | |||
| 59 | * scroll-all.el (scroll-all-check-to-scroll): | ||
| 60 | Add `scroll-up-command' and `scroll-down-command' (bug#6164). | ||
| 61 | |||
| 62 | 2010-05-11 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 63 | |||
| 64 | * iimage.el (iimage-mode-map): Move initialization into declaration. | ||
| 65 | (iimage-mode-buffer): Use with-silent-modifications. | ||
| 66 | Simplify calling convention. Adjust callers. | ||
| 67 | (iimage-mode): Don't run hook redundantly. | ||
| 68 | |||
| 69 | * minibuffer.el (completion-pcm--pattern->regex): | ||
| 70 | Fix last change (bug#6160). | ||
| 71 | |||
| 72 | 2010-05-10 Juri Linkov <juri@jurta.org> | ||
| 73 | |||
| 74 | Remove nodes visited during Isearch from the Info history. | ||
| 75 | * info.el (Info-isearch-initial-history) | ||
| 76 | (Info-isearch-initial-history-list): New variables. | ||
| 77 | (Info-isearch-start): Record initial values of | ||
| 78 | Info-isearch-initial-history and Info-isearch-initial-history-list. | ||
| 79 | Add Info-isearch-end to isearch-mode-end-hook. | ||
| 80 | (Info-isearch-end): New function. | ||
| 81 | |||
| 82 | 2010-05-10 Michael Albinus <michael.albinus@gmx.de> | ||
| 83 | |||
| 84 | * net/tramp.el (tramp-do-file-attributes-with-stat): Add space in | ||
| 85 | format string, in order to work around a bug in pdksh. | ||
| 86 | Reported by Gilles Pion <gpion@lfdj.com>. | ||
| 87 | (tramp-handle-verify-visited-file-modtime): Do not send a command | ||
| 88 | when the connection is not established. | ||
| 89 | (tramp-handle-set-file-times): Simplify the check for utc. | ||
| 90 | |||
| 91 | 2010-05-10 Juanma Barranquero <lekktu@gmail.com> | ||
| 92 | |||
| 93 | Fix use of `filter-buffer-substring' (rework previous change). | ||
| 94 | * emulation/cua-base.el (cua--filter-buffer-noprops): New function. | ||
| 95 | (cua-repeat-replace-region): | ||
| 96 | * emulation/cua-rect.el (cua--extract-rectangle, cua-incr-rectangle): | ||
| 97 | * emulation/cua-gmrk.el (cua-copy-region-to-global-mark) | ||
| 98 | (cua-cut-region-to-global-mark): Use it. | ||
| 99 | |||
| 1 | 2010-05-09 Michael R. Mauger <mmaug@yahoo.com> | 100 | 2010-05-09 Michael R. Mauger <mmaug@yahoo.com> |
| 2 | 101 | ||
| 3 | * progmodes/sql.el: Version 2.1 | 102 | * progmodes/sql.el: Version 2.1. |
| 4 | (sql-product-alist): Redesigned structure of product info. | 103 | (sql-product-alist): Redesign structure of product info. |
| 5 | (sql-product, sql-user, sql-server, sql-database): Safe | 104 | (sql-product, sql-user, sql-server, sql-database): Safe variables. |
| 6 | variables. | ||
| 7 | (sql-port, sql-port-history): New variables. | 105 | (sql-port, sql-port-history): New variables. |
| 8 | (sql-interactive-product): New variable. | 106 | (sql-interactive-product): New variable. |
| 9 | (sql-send-terminator): New variable. | 107 | (sql-send-terminator): New variable. |
| 10 | (sql-imenu-generic-expression): Added "Types" imenu entry. | 108 | (sql-imenu-generic-expression): Add "Types" imenu entry. |
| 11 | (sql-oracle-login-params, sql-sqlite-login-params) | 109 | (sql-oracle-login-params, sql-sqlite-login-params) |
| 12 | (sql-mysql-login-params, sql-solid-login-params) | 110 | (sql-mysql-login-params, sql-solid-login-params) |
| 13 | (sql-sybase-login-params, sql-informix-login-params) | 111 | (sql-sybase-login-params, sql-informix-login-params) |
| @@ -15,10 +113,9 @@ | |||
| 15 | (sql-postgres-login-params, sql-interbase-login-params) | 113 | (sql-postgres-login-params, sql-interbase-login-params) |
| 16 | (sql-db2-login-params, sql-linter-login-params) | 114 | (sql-db2-login-params, sql-linter-login-params) |
| 17 | (sql-oracle-scan-on): New variables. | 115 | (sql-oracle-scan-on): New variables. |
| 18 | (sql-mode-map): Added C-c C-i to start interactive mode. | 116 | (sql-mode-map): Add C-c C-i to start interactive mode. |
| 19 | (sql-mode-menu): Updated existing menu entries. | 117 | (sql-mode-menu): Update existing menu entries. |
| 20 | (sql-font-lock-keywords-builder): Compile-time font-lock | 118 | (sql-font-lock-keywords-builder): Compile-time font-lock optimization. |
| 21 | optimization. | ||
| 22 | (sql-mode-oracle-font-lock-keywords) | 119 | (sql-mode-oracle-font-lock-keywords) |
| 23 | (sql-mode-postgres-font-lock-keywords) | 120 | (sql-mode-postgres-font-lock-keywords) |
| 24 | (sql-mode-ms-font-lock-keywords) | 121 | (sql-mode-ms-font-lock-keywords) |
| @@ -30,7 +127,7 @@ | |||
| 30 | (sql-mode-mysql-font-lock-keywords) | 127 | (sql-mode-mysql-font-lock-keywords) |
| 31 | (sql-mode-sqlite-font-lock-keywords) | 128 | (sql-mode-sqlite-font-lock-keywords) |
| 32 | (sql-mode-db2-font-lock-keywords) | 129 | (sql-mode-db2-font-lock-keywords) |
| 33 | (sql-mode-linter-font-lock-keywords): Updated initialization to | 130 | (sql-mode-linter-font-lock-keywords): Update initialization to |
| 34 | reduce run-time complexity. | 131 | reduce run-time complexity. |
| 35 | (sql-add-product, sql-del-product): New functions. | 132 | (sql-add-product, sql-del-product): New functions. |
| 36 | (sql-set-product-feature, sql-get-product-feature): New functions. | 133 | (sql-set-product-feature, sql-get-product-feature): New functions. |
| @@ -39,12 +136,12 @@ | |||
| 39 | (sql-highlight-product): Update product API. | 136 | (sql-highlight-product): Update product API. |
| 40 | (sql-help-list-products): New function. | 137 | (sql-help-list-products): New function. |
| 41 | (sql-help): Dynamically lists free and non-free products. | 138 | (sql-help): Dynamically lists free and non-free products. |
| 42 | (sql-get-login): Corrected bug in handling history and added | 139 | (sql-get-login): Correct bug in handling history and added |
| 43 | prompt for port. | 140 | prompt for port. |
| 44 | (sql-copy-column): Copy without properties. | 141 | (sql-copy-column): Copy without properties. |
| 45 | (sqli-input-sender): Apply filters to SQLi input. | 142 | (sqli-input-sender): Apply filters to SQLi input. |
| 46 | (sql-query-placeholders-and-send): Obey `sql-oracle-scan-on' | 143 | (sql-query-placeholders-and-send): Obey `sql-oracle-scan-on' setting. |
| 47 | setting. Implement as a filter. | 144 | Implement as a filter. |
| 48 | (sql-escape-newlines-filter): Implement as a filter. | 145 | (sql-escape-newlines-filter): Implement as a filter. |
| 49 | (sql-remove-tabs-filter): New function. | 146 | (sql-remove-tabs-filter): New function. |
| 50 | (sql-send-magic-terminator): New function. | 147 | (sql-send-magic-terminator): New function. |
| @@ -59,8 +156,8 @@ | |||
| 59 | (sql-connect-oracle, sql-connect-sybase, sql-connect-informix) | 156 | (sql-connect-oracle, sql-connect-sybase, sql-connect-informix) |
| 60 | (sql-connect-sqlite, sql-connect-mysql, sql-connect-solid) | 157 | (sql-connect-sqlite, sql-connect-mysql, sql-connect-solid) |
| 61 | (sql-connect-ingres, sql-connect-ms, sql-connect-postgres) | 158 | (sql-connect-ingres, sql-connect-ms, sql-connect-postgres) |
| 62 | (sql-connect-interbase, sql-connect-db2, sql-connect-linter): Use | 159 | (sql-connect-interbase, sql-connect-db2, sql-connect-linter): |
| 63 | `sql-connect'. | 160 | Use `sql-connect'. |
| 64 | 161 | ||
| 65 | 2010-05-09 Stefan Monnier <monnier@iro.umontreal.ca> | 162 | 2010-05-09 Stefan Monnier <monnier@iro.umontreal.ca> |
| 66 | 163 | ||
| @@ -109,7 +206,7 @@ | |||
| 109 | 206 | ||
| 110 | 2010-05-08 Chong Yidong <cyd@stupidchicken.com> | 207 | 2010-05-08 Chong Yidong <cyd@stupidchicken.com> |
| 111 | 208 | ||
| 112 | * international/mule.el (auto-coding-alist): Only purecopy | 209 | * international/mule.el (auto-coding-alist): Only purecopy |
| 113 | car of each item, not the whole list (Bug#6083). | 210 | car of each item, not the whole list (Bug#6083). |
| 114 | 211 | ||
| 115 | 2010-05-08 Chong Yidong <cyd@stupidchicken.com> | 212 | 2010-05-08 Chong Yidong <cyd@stupidchicken.com> |
| @@ -122,7 +219,7 @@ | |||
| 122 | * composite.el (compose-region, reference-point-alist): Fix typos | 219 | * composite.el (compose-region, reference-point-alist): Fix typos |
| 123 | in the doc strings. | 220 | in the doc strings. |
| 124 | 221 | ||
| 125 | 2010-05-08 Alexander Klimov <alserkli@inbox.ru> (tiny change) | 222 | 2010-05-08 Alexander Klimov <alserkli@inbox.ru> (tiny change) |
| 126 | 223 | ||
| 127 | * calc/calc-graph.el (calc-graph-plot): Use the proper form for | 224 | * calc/calc-graph.el (calc-graph-plot): Use the proper form for |
| 128 | gnuplot's "set" command. | 225 | gnuplot's "set" command. |
| @@ -465,7 +562,7 @@ | |||
| 465 | (ede-dired-add-to-target): Use dolist. | 562 | (ede-dired-add-to-target): Use dolist. |
| 466 | 563 | ||
| 467 | 2010-05-01 Toru TSUNEYOSHI <t_tuneyosi@hotmail.com> | 564 | 2010-05-01 Toru TSUNEYOSHI <t_tuneyosi@hotmail.com> |
| 468 | Michael Albinus <michael.albinus@gmx.de> | 565 | Michael Albinus <michael.albinus@gmx.de> |
| 469 | 566 | ||
| 470 | Implement compression for inline methods. | 567 | Implement compression for inline methods. |
| 471 | 568 | ||
| @@ -769,6 +866,8 @@ | |||
| 769 | 866 | ||
| 770 | 2010-04-21 Stefan Monnier <monnier@iro.umontreal.ca> | 867 | 2010-04-21 Stefan Monnier <monnier@iro.umontreal.ca> |
| 771 | 868 | ||
| 869 | Make the log-edit comments use RFC822 format throughout. | ||
| 870 | |||
| 772 | * vc.el (vc-checkin, vc-modify-change-comment): | 871 | * vc.el (vc-checkin, vc-modify-change-comment): |
| 773 | Adjust to new vc-start/finish-logentry. | 872 | Adjust to new vc-start/finish-logentry. |
| 774 | (vc-find-conflicted-file): New command. | 873 | (vc-find-conflicted-file): New command. |
| @@ -974,7 +1073,7 @@ | |||
| 974 | (calc-hyperbolic): Add "Option" to message, as appropriate. | 1073 | (calc-hyperbolic): Add "Option" to message, as appropriate. |
| 975 | (calc-option, calc-is-option): New functions. | 1074 | (calc-option, calc-is-option): New functions. |
| 976 | 1075 | ||
| 977 | * calc-help.el (calc-full-help): Add `calc-option-help'. | 1076 | * calc-help.el (calc-full-help): Add `calc-option-help'. |
| 978 | (calc-option-prefix-help): New function. | 1077 | (calc-option-prefix-help): New function. |
| 979 | 1078 | ||
| 980 | * calc-misc.el (calc-help): Add "Option" entry. | 1079 | * calc-misc.el (calc-help): Add "Option" entry. |
| @@ -1537,7 +1636,7 @@ | |||
| 1537 | values. | 1636 | values. |
| 1538 | 1637 | ||
| 1539 | 2010-03-29 Phil Hagelberg <phil@evri.com> | 1638 | 2010-03-29 Phil Hagelberg <phil@evri.com> |
| 1540 | Chong Yidong <cyd@stupidchicken.com> | 1639 | Chong Yidong <cyd@stupidchicken.com> |
| 1541 | 1640 | ||
| 1542 | * subr.el: Extend progress reporters to perform "spinning". | 1641 | * subr.el: Extend progress reporters to perform "spinning". |
| 1543 | (progress-reporter-update, progress-reporter-do-update): | 1642 | (progress-reporter-update, progress-reporter-do-update): |
| @@ -5180,7 +5279,7 @@ | |||
| 5180 | * Makefile.in (ELCFILES): Adapt to subword.el move. | 5279 | * Makefile.in (ELCFILES): Adapt to subword.el move. |
| 5181 | 5280 | ||
| 5182 | 2009-11-21 Thierry Volpiatto <thierry.volpiatto@gmail.com> | 5281 | 2009-11-21 Thierry Volpiatto <thierry.volpiatto@gmail.com> |
| 5183 | Stefan Monnier <monnier@iro.umontreal.ca> | 5282 | Stefan Monnier <monnier@iro.umontreal.ca> |
| 5184 | 5283 | ||
| 5185 | * bookmark.el (bookmark-bmenu-bookmark-column): Remove var. | 5284 | * bookmark.el (bookmark-bmenu-bookmark-column): Remove var. |
| 5186 | (bookmark-bmenu-list): Save name on `bookmark-name-prop' text-prop. | 5285 | (bookmark-bmenu-list): Save name on `bookmark-name-prop' text-prop. |
| @@ -9266,7 +9365,7 @@ | |||
| 9266 | indent buffer only if called interactively (Bug#4452). | 9365 | indent buffer only if called interactively (Bug#4452). |
| 9267 | 9366 | ||
| 9268 | 2009-09-19 Juanma Barranquero <lekktu@gmail.com> | 9367 | 2009-09-19 Juanma Barranquero <lekktu@gmail.com> |
| 9269 | Eli Zaretskii <eliz@gnu.org> | 9368 | Eli Zaretskii <eliz@gnu.org> |
| 9270 | 9369 | ||
| 9271 | This fixes bug#4197 (merged to bug#865, though not identical). | 9370 | This fixes bug#4197 (merged to bug#865, though not identical). |
| 9272 | * server.el (server-auth-dir): Add docstring note about FAT32. | 9371 | * server.el (server-auth-dir): Add docstring note about FAT32. |
| @@ -10083,7 +10182,7 @@ | |||
| 10083 | Don't call substitute-in-file-name on diary-file. | 10182 | Don't call substitute-in-file-name on diary-file. |
| 10084 | 10183 | ||
| 10085 | 2009-09-03 Eduard Wiebe <usenet@pusto.de> | 10184 | 2009-09-03 Eduard Wiebe <usenet@pusto.de> |
| 10086 | Stefan Monnier <monnier@iro.umontreal.ca> | 10185 | Stefan Monnier <monnier@iro.umontreal.ca> |
| 10087 | 10186 | ||
| 10088 | * mail/footnote.el (footnote-prefix): Make it a defcustom. | 10187 | * mail/footnote.el (footnote-prefix): Make it a defcustom. |
| 10089 | (footnote-mode-map): Move initialization into the declaration. | 10188 | (footnote-mode-map): Move initialization into the declaration. |
| @@ -11194,7 +11293,7 @@ | |||
| 11194 | * progmodes/hideshow.el (hs-special-modes-alist): Add js-mode entry. | 11293 | * progmodes/hideshow.el (hs-special-modes-alist): Add js-mode entry. |
| 11195 | 11294 | ||
| 11196 | 2009-08-14 Daniel Colascione <dan.colascione@gmail.com> | 11295 | 2009-08-14 Daniel Colascione <dan.colascione@gmail.com> |
| 11197 | Karl Landstrom <karl.landstrom@brgeight.se> | 11296 | Karl Landstrom <karl.landstrom@brgeight.se> |
| 11198 | 11297 | ||
| 11199 | * progmodes/js.el: New file. | 11298 | * progmodes/js.el: New file. |
| 11200 | 11299 | ||
| @@ -12961,7 +13060,7 @@ | |||
| 12961 | XZ is the successor to LZMA: <http://tukaani.org/xz/> | 13060 | XZ is the successor to LZMA: <http://tukaani.org/xz/> |
| 12962 | 13061 | ||
| 12963 | 2009-06-22 Dmitry Dzhus <dima@sphinx.net.ru> | 13062 | 2009-06-22 Dmitry Dzhus <dima@sphinx.net.ru> |
| 12964 | Nick Roberts <nickrob@snap.net.nz> | 13063 | Nick Roberts <nickrob@snap.net.nz> |
| 12965 | 13064 | ||
| 12966 | * progmodes/gdb-mi.el: Pull further modified changes from Dmitry's | 13065 | * progmodes/gdb-mi.el: Pull further modified changes from Dmitry's |
| 12967 | repository (http://sphinx.net.ru/hg/gdb-mi/). | 13066 | repository (http://sphinx.net.ru/hg/gdb-mi/). |
diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1 index dd96ee162f1..bd8b8c3ae27 100644 --- a/lisp/ChangeLog.1 +++ b/lisp/ChangeLog.1 | |||
| @@ -990,7 +990,7 @@ | |||
| 990 | * info.el: | 990 | * info.el: |
| 991 | (Info-select-node): Was searching unboundedly for "execute:". | 991 | (Info-select-node): Was searching unboundedly for "execute:". |
| 992 | (Info-follow-reference): Was called Info-footnote. | 992 | (Info-follow-reference): Was called Info-footnote. |
| 993 | Also, handle presence of spaces and newlines in ref names. | 993 | Also, handle presence of spaces and newlines in ref names. |
| 994 | (Info-extract-menu-node-name): Handle presence of spaces and | 994 | (Info-extract-menu-node-name): Handle presence of spaces and |
| 995 | newlines in the node name. | 995 | newlines in the node name. |
| 996 | (Info-menu): Handle presence of spaces and newlines in item | 996 | (Info-menu): Handle presence of spaces and newlines in item |
| @@ -1465,7 +1465,7 @@ | |||
| 1465 | 1985-10-28 Richard M. Stallman (rms@prep) | 1465 | 1985-10-28 Richard M. Stallman (rms@prep) |
| 1466 | 1466 | ||
| 1467 | * rmail.el, rmailsum.el, rmailkwd.el, rmailmsc.el, | 1467 | * rmail.el, rmailsum.el, rmailkwd.el, rmailmsc.el, |
| 1468 | rmailout.el, rmailedit.el: | 1468 | * rmailout.el, rmailedit.el: |
| 1469 | Install thoroughly rewritten rmail with many new features. | 1469 | Install thoroughly rewritten rmail with many new features. |
| 1470 | 1470 | ||
| 1471 | * debug.el (debug, debugger-mode): | 1471 | * debug.el (debug, debugger-mode): |
| @@ -3100,7 +3100,7 @@ | |||
| 3100 | (also, mail-yank-ignored-headers had a typo) | 3100 | (also, mail-yank-ignored-headers had a typo) |
| 3101 | 3101 | ||
| 3102 | * rmail.el (rmail-get-new-mail, convert-to-babyl-format, ...) | 3102 | * rmail.el (rmail-get-new-mail, convert-to-babyl-format, ...) |
| 3103 | loaddefs.el | 3103 | * loaddefs.el: |
| 3104 | Remodularize inbox parsing. Add support(?) for mmdf inboxes. | 3104 | Remodularize inbox parsing. Add support(?) for mmdf inboxes. |
| 3105 | Note that I can't seem to define definitive documentation of | 3105 | Note that I can't seem to define definitive documentation of |
| 3106 | what this format is; however the code installed seems to work | 3106 | what this format is; however the code installed seems to work |
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 95f59243cb1..b058e6813d5 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 | |||
| @@ -32509,7 +32509,7 @@ | |||
| 32509 | (bibtex-field-list, bibtex-find-crossref): Fix typos in error messages. | 32509 | (bibtex-field-list, bibtex-find-crossref): Fix typos in error messages. |
| 32510 | 32510 | ||
| 32511 | 2005-01-24 Dan Nicolaescu <dann@ics.uci.edu> | 32511 | 2005-01-24 Dan Nicolaescu <dann@ics.uci.edu> |
| 32512 | Juri Linkov <juri@jurta.org> | 32512 | Juri Linkov <juri@jurta.org> |
| 32513 | 32513 | ||
| 32514 | * textmodes/reftex-global.el (reftex-isearch-push-state-function) | 32514 | * textmodes/reftex-global.el (reftex-isearch-push-state-function) |
| 32515 | (reftex-isearch-pop-state-function, reftex-isearch-isearch-search) | 32515 | (reftex-isearch-pop-state-function, reftex-isearch-isearch-search) |
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 12ea1f45e17..d219c7a5660 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 | |||
| @@ -721,7 +721,7 @@ | |||
| 721 | char-width-table. Don't make ethiopic and tibetan double column. | 721 | char-width-table. Don't make ethiopic and tibetan double column. |
| 722 | 722 | ||
| 723 | * textmodes/fill.el (fill-find-break-point-function-table): | 723 | * textmodes/fill.el (fill-find-break-point-function-table): |
| 724 | Don't set it up in defvar. | 724 | Don't set it up in defvar. |
| 725 | (fill-nospace-between-words-table): New variable. | 725 | (fill-nospace-between-words-table): New variable. |
| 726 | (fill-delete-newlines): Check fill-nospace-between-words-table | 726 | (fill-delete-newlines): Check fill-nospace-between-words-table |
| 727 | instead of charset property nospace-between-words. | 727 | instead of charset property nospace-between-words. |
| @@ -1872,8 +1872,8 @@ | |||
| 1872 | 2008-02-01 Dave Love <fx@gnu.org> | 1872 | 2008-02-01 Dave Love <fx@gnu.org> |
| 1873 | 1873 | ||
| 1874 | * emacs-lisp/byte-opt.el (side-effect-free-fns): | 1874 | * emacs-lisp/byte-opt.el (side-effect-free-fns): |
| 1875 | Add string-make-unibyte string-make-multibyte string-to-multibyte | 1875 | Add string-make-unibyte string-make-multibyte string-to-multibyte |
| 1876 | string-as-multibyte string-as-unibyte. | 1876 | string-as-multibyte string-as-unibyte. |
| 1877 | 1877 | ||
| 1878 | 2008-02-01 Dave Love <fx@gnu.org> | 1878 | 2008-02-01 Dave Love <fx@gnu.org> |
| 1879 | 1879 | ||
| @@ -3983,7 +3983,7 @@ | |||
| 3983 | * ibuffer.el (ibuffer-mode): Fix typo in previous change. | 3983 | * ibuffer.el (ibuffer-mode): Fix typo in previous change. |
| 3984 | 3984 | ||
| 3985 | 2008-01-17 Vinicius Jose Latorre <viniciusjl@ig.com.br> | 3985 | 2008-01-17 Vinicius Jose Latorre <viniciusjl@ig.com.br> |
| 3986 | Miles Bader <miles@gnu.org> | 3986 | Miles Bader <miles@gnu.org> |
| 3987 | 3987 | ||
| 3988 | * blank-mode.el: New file. Minor mode to visualize (HARD) SPACE, | 3988 | * blank-mode.el: New file. Minor mode to visualize (HARD) SPACE, |
| 3989 | TAB, NEWLINE. Miles Bader <miles@gnu.org> wrote the original code | 3989 | TAB, NEWLINE. Miles Bader <miles@gnu.org> wrote the original code |
| @@ -5479,7 +5479,7 @@ | |||
| 5479 | (verilog-insert-indices): Escape braces in doc strings. | 5479 | (verilog-insert-indices): Escape braces in doc strings. |
| 5480 | 5480 | ||
| 5481 | 2007-12-08 Michael McNamara <mac@verilog.com> | 5481 | 2007-12-08 Michael McNamara <mac@verilog.com> |
| 5482 | Wilson Snyder <wsnyder@wsnyder.org> | 5482 | Wilson Snyder <wsnyder@wsnyder.org> |
| 5483 | 5483 | ||
| 5484 | * progmodes/verilog-mode.el: New file. | 5484 | * progmodes/verilog-mode.el: New file. |
| 5485 | 5485 | ||
| @@ -13484,7 +13484,7 @@ | |||
| 13484 | Use native Emacs functions, when appropriate. | 13484 | Use native Emacs functions, when appropriate. |
| 13485 | 13485 | ||
| 13486 | 2007-08-01 Dan Nicolaescu <dann@ics.uci.edu> | 13486 | 2007-08-01 Dan Nicolaescu <dann@ics.uci.edu> |
| 13487 | Stefan Monnier <monnier@iro.umontreal.ca> | 13487 | Stefan Monnier <monnier@iro.umontreal.ca> |
| 13488 | 13488 | ||
| 13489 | * vc.el: Document new VC operation `extra-menu'. | 13489 | * vc.el: Document new VC operation `extra-menu'. |
| 13490 | 13490 | ||
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index 1edfd9081d0..a01020b87d0 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 | |||
| @@ -1029,7 +1029,7 @@ | |||
| 1029 | 1029 | ||
| 1030 | * paren.el (show-paren-function): | 1030 | * paren.el (show-paren-function): |
| 1031 | * simple.el (kill-forward-chars, kill-backward-chars): | 1031 | * simple.el (kill-forward-chars, kill-backward-chars): |
| 1032 | Use (+/- (point) N), instead of `forward-point'. | 1032 | Use (+/- (point) N), instead of `forward-point'. |
| 1033 | 1033 | ||
| 1034 | 2009-03-19 Glenn Morris <rgm@gnu.org> | 1034 | 2009-03-19 Glenn Morris <rgm@gnu.org> |
| 1035 | 1035 | ||
| @@ -3012,12 +3012,12 @@ | |||
| 3012 | Don't activate node nil. (Bug#1569) | 3012 | Don't activate node nil. (Bug#1569) |
| 3013 | 3013 | ||
| 3014 | 2009-01-22 Paul Reilly <pmr@pajato.com> | 3014 | 2009-01-22 Paul Reilly <pmr@pajato.com> |
| 3015 | Henrik Enberg <enberg@printf.se> | 3015 | Henrik Enberg <enberg@printf.se> |
| 3016 | Alex Schroeder <alex@gnu.org> | 3016 | Alex Schroeder <alex@gnu.org> |
| 3017 | Chong Yidong <cyd@stupidchicken.com> | 3017 | Chong Yidong <cyd@stupidchicken.com> |
| 3018 | Richard M Stallman <rms@gnu.org> | 3018 | Richard M Stallman <rms@gnu.org> |
| 3019 | Glenn Morris <rgm@gnu.org> | 3019 | Glenn Morris <rgm@gnu.org> |
| 3020 | Juanma Barranquero <lekktu@gmail.com> | 3020 | Juanma Barranquero <lekktu@gmail.com> |
| 3021 | 3021 | ||
| 3022 | * mail/rmail.el: Code implementing Rmail-mbox functionality. | 3022 | * mail/rmail.el: Code implementing Rmail-mbox functionality. |
| 3023 | (rmail-attribute-header, rmail-keyword-header) | 3023 | (rmail-attribute-header, rmail-keyword-header) |
| @@ -4310,7 +4310,7 @@ | |||
| 4310 | was orderly adjusted, nil otherwise. | 4310 | was orderly adjusted, nil otherwise. |
| 4311 | 4311 | ||
| 4312 | 2008-12-12 Juanma Barranquero <lekktu@gmail.com> | 4312 | 2008-12-12 Juanma Barranquero <lekktu@gmail.com> |
| 4313 | Stefan Monnier <monnier@iro.umontreal.ca> | 4313 | Stefan Monnier <monnier@iro.umontreal.ca> |
| 4314 | 4314 | ||
| 4315 | * server.el (server-sentinel): Uncomment code to delete connection file. | 4315 | * server.el (server-sentinel): Uncomment code to delete connection file. |
| 4316 | (server-start): Save the connection file in the server property list. | 4316 | (server-start): Save the connection file in the server property list. |
| @@ -4369,7 +4369,7 @@ | |||
| 4369 | terminal variable assignment. | 4369 | terminal variable assignment. |
| 4370 | 4370 | ||
| 4371 | 2008-12-10 Yukihiro Matsumoto <matz@ruby-lang.org> | 4371 | 2008-12-10 Yukihiro Matsumoto <matz@ruby-lang.org> |
| 4372 | Nobuyoshi Nakada <nobu@ruby-lang.org> | 4372 | Nobuyoshi Nakada <nobu@ruby-lang.org> |
| 4373 | 4373 | ||
| 4374 | * progmodes/ruby-mode.el: New file. | 4374 | * progmodes/ruby-mode.el: New file. |
| 4375 | 4375 | ||
| @@ -5599,7 +5599,7 @@ | |||
| 5599 | New aliases, to satisfy `define-derived-mode' expectations. | 5599 | New aliases, to satisfy `define-derived-mode' expectations. |
| 5600 | 5600 | ||
| 5601 | 2008-11-15 Glenn Morris <rgm@gnu.org> | 5601 | 2008-11-15 Glenn Morris <rgm@gnu.org> |
| 5602 | Martin Rudalics <rudalics@gmx.at> | 5602 | Martin Rudalics <rudalics@gmx.at> |
| 5603 | 5603 | ||
| 5604 | * emacs-lisp/find-func.el (find-function-advised-original): New. | 5604 | * emacs-lisp/find-func.el (find-function-advised-original): New. |
| 5605 | (find-function-C-source, find-function-noselect): | 5605 | (find-function-C-source, find-function-noselect): |
| @@ -10308,8 +10308,8 @@ | |||
| 10308 | (newsticker--treeview-propertize-tag): Show item title in tooltip. | 10308 | (newsticker--treeview-propertize-tag): Show item title in tooltip. |
| 10309 | 10309 | ||
| 10310 | 2008-06-20 Martin Blais <blais@furius.ca> | 10310 | 2008-06-20 Martin Blais <blais@furius.ca> |
| 10311 | Stefan Merten <smerten@oekonux.de> | 10311 | Stefan Merten <smerten@oekonux.de> |
| 10312 | David Goodger <goodger@python.org> | 10312 | David Goodger <goodger@python.org> |
| 10313 | 10313 | ||
| 10314 | * textmodes/rst.el: New file. | 10314 | * textmodes/rst.el: New file. |
| 10315 | 10315 | ||
| @@ -10627,7 +10627,7 @@ | |||
| 10627 | * term/linux.el (terminal-init-linux): Load t-mouse. | 10627 | * term/linux.el (terminal-init-linux): Load t-mouse. |
| 10628 | 10628 | ||
| 10629 | 2008-06-13 Stefan Monnier <monnier@iro.umontreal.ca> | 10629 | 2008-06-13 Stefan Monnier <monnier@iro.umontreal.ca> |
| 10630 | Drew Adams <drew.adams@oracle.com> | 10630 | Drew Adams <drew.adams@oracle.com> |
| 10631 | 10631 | ||
| 10632 | * info.el (Info-breadcrumbs-depth): New var. | 10632 | * info.el (Info-breadcrumbs-depth): New var. |
| 10633 | (Info-insert-breadcrumbs): New function. | 10633 | (Info-insert-breadcrumbs): New function. |
| @@ -18798,7 +18798,7 @@ | |||
| 18798 | for useful options. | 18798 | for useful options. |
| 18799 | 18799 | ||
| 18800 | 2008-03-01 Dan Nicolaescu <dann@ics.uci.edu> | 18800 | 2008-03-01 Dan Nicolaescu <dann@ics.uci.edu> |
| 18801 | Glenn Morris <rgm@gnu.org> | 18801 | Glenn Morris <rgm@gnu.org> |
| 18802 | 18802 | ||
| 18803 | * emacs-lisp/bytecomp.el (byte-recompile-directory) | 18803 | * emacs-lisp/bytecomp.el (byte-recompile-directory) |
| 18804 | (byte-compile-file, batch-byte-compile, batch-byte-compile-file): | 18804 | (byte-compile-file, batch-byte-compile, batch-byte-compile-file): |
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index cd36210f7fc..6da88b3c0be 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 | |||
| @@ -7051,7 +7051,7 @@ | |||
| 7051 | * ediff.el (ediff-toggle-read-only, ediff-patch-file): Check out | 7051 | * ediff.el (ediff-toggle-read-only, ediff-patch-file): Check out |
| 7052 | version controlled files before their buffers are modified. | 7052 | version controlled files before their buffers are modified. |
| 7053 | (ediff-local-checkout-flag, ediff-toggle-read-only-function): | 7053 | (ediff-local-checkout-flag, ediff-toggle-read-only-function): |
| 7054 | New variables. | 7054 | New variables. |
| 7055 | 7055 | ||
| 7056 | * ediff.el (ediff-find-file, ediff-patch-file): Were getting | 7056 | * ediff.el (ediff-find-file, ediff-patch-file): Were getting |
| 7057 | confused by symbolic links. Fixed. | 7057 | confused by symbolic links. Fixed. |
| @@ -8050,7 +8050,7 @@ | |||
| 8050 | 1994-07-23 enami tsugutomo <enami@sys.ptg.sony.co.jp> | 8050 | 1994-07-23 enami tsugutomo <enami@sys.ptg.sony.co.jp> |
| 8051 | 8051 | ||
| 8052 | * lisp/add-log.el (add-log-current-defun): Skip doc string | 8052 | * lisp/add-log.el (add-log-current-defun): Skip doc string |
| 8053 | correctly even if it ends with line that starts space. | 8053 | correctly even if it ends with line that starts space. |
| 8054 | 8054 | ||
| 8055 | 1994-07-22 Ed Reingold <reingold@albert.gnu.ai.mit.edu> | 8055 | 1994-07-22 Ed Reingold <reingold@albert.gnu.ai.mit.edu> |
| 8056 | 8056 | ||
| @@ -9194,11 +9194,11 @@ | |||
| 9194 | * solar.el (solar-sunrise, solar-sunset): Fix doc string. | 9194 | * solar.el (solar-sunrise, solar-sunset): Fix doc string. |
| 9195 | (solar-time-string): Rewritten. | 9195 | (solar-time-string): Rewritten. |
| 9196 | (solar-adj-time-for-dst): New function. | 9196 | (solar-adj-time-for-dst): New function. |
| 9197 | (solar-sunrise-sunset, diary-sabbath-candles, | 9197 | (solar-sunrise-sunset, diary-sabbath-candles) |
| 9198 | solar-equinoxes-solstices): Revised to use the rewritten and new fcns. | 9198 | (solar-equinoxes-solstices): Revised to use the rewritten and new fcns. |
| 9199 | 9199 | ||
| 9200 | * calendar.el (solar-holidays): Revised to use the rewritten and | 9200 | * calendar.el (solar-holidays): Revised to use the rewritten and |
| 9201 | new fcns. | 9201 | new fcns. |
| 9202 | 9202 | ||
| 9203 | * lunar.el (lunar-phase): Revised to use the rewritten and new fcns. | 9203 | * lunar.el (lunar-phase): Revised to use the rewritten and new fcns. |
| 9204 | 9204 | ||
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index 2ba61dc516e..45c832c5e24 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 | |||
| @@ -3687,7 +3687,7 @@ | |||
| 3687 | When changing the environment, avoid need for setenv. | 3687 | When changing the environment, avoid need for setenv. |
| 3688 | 3688 | ||
| 3689 | 1996-01-05 Karl Eichwalder <ke@ke.Central.DE> | 3689 | 1996-01-05 Karl Eichwalder <ke@ke.Central.DE> |
| 3690 | Karl Fogel <kfogel@floss.red-bean.com> | 3690 | Karl Fogel <kfogel@floss.red-bean.com> |
| 3691 | 3691 | ||
| 3692 | * bookmark.el: "cyclic.com" addresses changed to "red-bean.com". | 3692 | * bookmark.el: "cyclic.com" addresses changed to "red-bean.com". |
| 3693 | (bookmark-bmenu-mode-map): Don't bind C-k. | 3693 | (bookmark-bmenu-mode-map): Don't bind C-k. |
| @@ -5837,7 +5837,7 @@ | |||
| 5837 | 1995-10-09 Roland McGrath <roland@churchy.gnu.ai.mit.edu> | 5837 | 1995-10-09 Roland McGrath <roland@churchy.gnu.ai.mit.edu> |
| 5838 | 5838 | ||
| 5839 | * etags.el (tags-table-check-computed-list): Map | 5839 | * etags.el (tags-table-check-computed-list): Map |
| 5840 | tags-expand-table-name over lists of included tables. | 5840 | tags-expand-table-name over lists of included tables. |
| 5841 | 5841 | ||
| 5842 | 1995-10-09 Erik Naggum <erik@naggum.no> | 5842 | 1995-10-09 Erik Naggum <erik@naggum.no> |
| 5843 | 5843 | ||
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 6858c07d852..de40b71f080 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 | |||
| @@ -2749,7 +2749,7 @@ | |||
| 2749 | * abbrev.el: Likewise. | 2749 | * abbrev.el: Likewise. |
| 2750 | 2750 | ||
| 2751 | 1998-05-26 Emilio Lopes <Emilio.Lopes@Physik.TU-Muenchen.DE> | 2751 | 1998-05-26 Emilio Lopes <Emilio.Lopes@Physik.TU-Muenchen.DE> |
| 2752 | Karl Fogel <kfogel@red-bean.com> | 2752 | Karl Fogel <kfogel@red-bean.com> |
| 2753 | 2753 | ||
| 2754 | * bookmark.el: Changes so bookmark list mode works with Info: | 2754 | * bookmark.el: Changes so bookmark list mode works with Info: |
| 2755 | (bookmark-jump-noselect): Use an inner save-window-excursion. | 2755 | (bookmark-jump-noselect): Use an inner save-window-excursion. |
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 135eb8edbb3..d008640cbe3 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 | |||
| @@ -2739,8 +2739,8 @@ | |||
| 2739 | 2739 | ||
| 2740 | 2001-06-27 Francesco Potortì <pot@gnu.org> | 2740 | 2001-06-27 Francesco Potortì <pot@gnu.org> |
| 2741 | 2741 | ||
| 2742 | * uniquify.el: (uniquify-rationalize-file-buffer-names): | 2742 | * uniquify.el (uniquify-rationalize-file-buffer-names): |
| 2743 | Undo previous change. | 2743 | Undo previous change. |
| 2744 | 2744 | ||
| 2745 | 2001-06-27 Francesco Potortì <pot@gnu.org> | 2745 | 2001-06-27 Francesco Potortì <pot@gnu.org> |
| 2746 | 2746 | ||
| @@ -12205,7 +12205,7 @@ | |||
| 12205 | 12205 | ||
| 12206 | 2000-09-05 Stefan Monnier <monnier@cs.yale.edu> | 12206 | 2000-09-05 Stefan Monnier <monnier@cs.yale.edu> |
| 12207 | 12207 | ||
| 12208 | * vc.el: (toplevel): Don't require `dired' at run-time. | 12208 | * vc.el (toplevel): Don't require `dired' at run-time. |
| 12209 | (vc-dired-resynch-file): Remove autoload cookie. | 12209 | (vc-dired-resynch-file): Remove autoload cookie. |
| 12210 | 12210 | ||
| 12211 | 2000-09-05 Andre Spiegel <spiegel@gnu.org> | 12211 | 2000-09-05 Andre Spiegel <spiegel@gnu.org> |
| @@ -12998,7 +12998,7 @@ | |||
| 12998 | `vc-locking-user' semantics. | 12998 | `vc-locking-user' semantics. |
| 12999 | (vc-backend-merge): Remove. | 12999 | (vc-backend-merge): Remove. |
| 13000 | 13000 | ||
| 13001 | * vc-rcs.el, vc-scc.el: (vc-{sc,r}cs-check{in,out}): Update 'vc-state | 13001 | * vc-rcs.el, vc-scc.el (vc-{sc,r}cs-check{in,out}): Update 'vc-state |
| 13002 | rather than 'vc-locking-user. | 13002 | rather than 'vc-locking-user. |
| 13003 | 13003 | ||
| 13004 | * vc-rcs-hooks.el (vc-rcs-consult-headers): Adapt to new `vc-state'. | 13004 | * vc-rcs-hooks.el (vc-rcs-consult-headers): Adapt to new `vc-state'. |
| @@ -15318,8 +15318,8 @@ | |||
| 15318 | leading comma nicely. Extended to handle member initializers | 15318 | leading comma nicely. Extended to handle member initializers |
| 15319 | too. | 15319 | too. |
| 15320 | 15320 | ||
| 15321 | * cc-engine.el: (c-beginning-of-inheritance-list, | 15321 | * cc-engine.el (c-beginning-of-inheritance-list) |
| 15322 | c-guess-basic-syntax): Fixed recognition of inheritance lists | 15322 | (c-guess-basic-syntax): Fixed recognition of inheritance lists |
| 15323 | when the lines begins with a comma. | 15323 | when the lines begins with a comma. |
| 15324 | 15324 | ||
| 15325 | * cc-vars.el (c-offsets-alist): Changed default for | 15325 | * cc-vars.el (c-offsets-alist): Changed default for |
| @@ -19574,7 +19574,7 @@ | |||
| 19574 | (backward-kill-word): Revert addition of * to interactive spec -- | 19574 | (backward-kill-word): Revert addition of * to interactive spec -- |
| 19575 | it's a feature. | 19575 | it's a feature. |
| 19576 | 19576 | ||
| 19577 | * paragraphs.el: (kill-paragraph, backward-kill-paragraph) | 19577 | * paragraphs.el (kill-paragraph, backward-kill-paragraph) |
| 19578 | (backward-kill-sentence, kill-sentence): Likewise. | 19578 | (backward-kill-sentence, kill-sentence): Likewise. |
| 19579 | 19579 | ||
| 19580 | * gud.el (gud-jdb-build-class-source-alist): Prepend space to | 19580 | * gud.el (gud-jdb-build-class-source-alist): Prepend space to |
| @@ -19918,7 +19918,7 @@ | |||
| 19918 | 19918 | ||
| 19919 | 2000-02-10 Dave Love <fx@gnu.org> | 19919 | 2000-02-10 Dave Love <fx@gnu.org> |
| 19920 | 19920 | ||
| 19921 | * wid-edit.el: (widgets) [defgroup]: Remove url link. | 19921 | * wid-edit.el (widgets) [defgroup]: Remove url link. |
| 19922 | (widget-color-choice-list, widget-color-history, widget-mouse-help): | 19922 | (widget-color-choice-list, widget-color-history, widget-mouse-help): |
| 19923 | Deleted. | 19923 | Deleted. |
| 19924 | (widget-specify-field, widget-specify-button): Don't use | 19924 | (widget-specify-field, widget-specify-button): Don't use |
diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el index c209a2a6eb9..4e29c51fa75 100644 --- a/lisp/dirtrack.el +++ b/lisp/dirtrack.el | |||
| @@ -143,13 +143,6 @@ be on a single line." | |||
| 143 | :group 'dirtrack | 143 | :group 'dirtrack |
| 144 | :type 'string) | 144 | :type 'string) |
| 145 | 145 | ||
| 146 | (defcustom dirtrackp t | ||
| 147 | "If non-nil, directory tracking via `dirtrack' is enabled." | ||
| 148 | :group 'dirtrack | ||
| 149 | :type 'boolean) | ||
| 150 | |||
| 151 | (make-variable-buffer-local 'dirtrackp) | ||
| 152 | |||
| 153 | (defcustom dirtrack-directory-function | 146 | (defcustom dirtrack-directory-function |
| 154 | (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) | 147 | (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) |
| 155 | 'dirtrack-windows-directory-function | 148 | 'dirtrack-windows-directory-function |
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el index c1c2517bc22..5834afae8bc 100644 --- a/lisp/dos-fns.el +++ b/lisp/dos-fns.el | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | (declare-function msdos-long-file-names "msdos.c") | 31 | (declare-function msdos-long-file-names "msdos.c") |
| 32 | 32 | ||
| 33 | ;; This overrides a trivial definition in files.el. | 33 | ;; This overrides a trivial definition in files.el. |
| 34 | (defun convert-standard-filename (filename) | 34 | (defun dos-convert-standard-filename (filename) |
| 35 | "Convert a standard file's name to something suitable for the current OS. | 35 | "Convert a standard file's name to something suitable for the current OS. |
| 36 | This means to guarantee valid names and perhaps to canonicalize | 36 | This means to guarantee valid names and perhaps to canonicalize |
| 37 | certain patterns. | 37 | certain patterns. |
| @@ -48,7 +48,7 @@ shell requires it (see `w32-shell-dos-semantics')." | |||
| 48 | (let ((flen (length filename))) | 48 | (let ((flen (length filename))) |
| 49 | ;; If FILENAME has a trailing slash, remove it and recurse. | 49 | ;; If FILENAME has a trailing slash, remove it and recurse. |
| 50 | (if (memq (aref filename (1- flen)) '(?/ ?\\)) | 50 | (if (memq (aref filename (1- flen)) '(?/ ?\\)) |
| 51 | (concat (convert-standard-filename | 51 | (concat (dos-convert-standard-filename |
| 52 | (substring filename 0 (1- flen))) | 52 | (substring filename 0 (1- flen))) |
| 53 | "/") | 53 | "/") |
| 54 | (let* (;; ange-ftp gets in the way for names like "/foo:bar". | 54 | (let* (;; ange-ftp gets in the way for names like "/foo:bar". |
| @@ -122,12 +122,17 @@ shell requires it (see `w32-shell-dos-semantics')." | |||
| 122 | (aset string (1- (length string)) lastchar)))) | 122 | (aset string (1- (length string)) lastchar)))) |
| 123 | (concat (if (and (stringp dir) | 123 | (concat (if (and (stringp dir) |
| 124 | (memq (aref dir dlen-m-1) '(?/ ?\\))) | 124 | (memq (aref dir dlen-m-1) '(?/ ?\\))) |
| 125 | (concat (convert-standard-filename | 125 | (concat (dos-convert-standard-filename |
| 126 | (substring dir 0 dlen-m-1)) | 126 | (substring dir 0 dlen-m-1)) |
| 127 | "/") | 127 | "/") |
| 128 | (convert-standard-filename dir)) | 128 | (dos-convert-standard-filename dir)) |
| 129 | string)))))) | 129 | string)))))) |
| 130 | 130 | ||
| 131 | ;; Only redirect convert-standard-filename if it has a chance of working, | ||
| 132 | ;; otherwise loading dos-fns.el might make your non-DOS Emacs misbehave. | ||
| 133 | (when (fboundp 'msdos-long-file-names) | ||
| 134 | (defalias 'convert-standard-filename 'dos-convert-standard-filename)) | ||
| 135 | |||
| 131 | (defun dos-8+3-filename (filename) | 136 | (defun dos-8+3-filename (filename) |
| 132 | "Truncate FILENAME to DOS 8+3 limits." | 137 | "Truncate FILENAME to DOS 8+3 limits." |
| 133 | (if (or (not (stringp filename)) | 138 | (if (or (not (stringp filename)) |
| @@ -188,12 +193,12 @@ shell requires it (see `w32-shell-dos-semantics')." | |||
| 188 | 193 | ||
| 189 | ;; This is for the sake of standard file names elsewhere in Emacs that | 194 | ;; This is for the sake of standard file names elsewhere in Emacs that |
| 190 | ;; are defined as constant strings or via defconst, and whose | 195 | ;; are defined as constant strings or via defconst, and whose |
| 191 | ;; conversion via `convert-standard-filename' does not give good | 196 | ;; conversion via `dos-convert-standard-filename' does not give good |
| 192 | ;; enough results. | 197 | ;; enough results. |
| 193 | (defun dosified-file-name (file-name) | 198 | (defun dosified-file-name (file-name) |
| 194 | "Return a variant of FILE-NAME that is valid on MS-DOS filesystems. | 199 | "Return a variant of FILE-NAME that is valid on MS-DOS filesystems. |
| 195 | 200 | ||
| 196 | This function is for those rare cases where `convert-standard-filename' | 201 | This function is for those rare cases where `dos-convert-standard-filename' |
| 197 | does not do a job that is good enough, e.g. if you need to preserve the | 202 | does not do a job that is good enough, e.g. if you need to preserve the |
| 198 | file-name extension. It recognizes only certain specific file names | 203 | file-name extension. It recognizes only certain specific file names |
| 199 | that are used in Emacs Lisp sources; any other file name will be | 204 | that are used in Emacs Lisp sources; any other file name will be |
| @@ -209,13 +214,13 @@ returned unaltered." | |||
| 209 | (defvar msdos-shells) | 214 | (defvar msdos-shells) |
| 210 | 215 | ||
| 211 | ;; Override settings chosen at startup. | 216 | ;; Override settings chosen at startup. |
| 212 | (defun set-default-process-coding-system () | 217 | (defun dos-set-default-process-coding-system () |
| 213 | (setq default-process-coding-system | 218 | (setq default-process-coding-system |
| 214 | (if (default-value 'enable-multibyte-characters) | 219 | (if (default-value 'enable-multibyte-characters) |
| 215 | '(undecided-dos . undecided-dos) | 220 | '(undecided-dos . undecided-dos) |
| 216 | '(raw-text-dos . raw-text-dos)))) | 221 | '(raw-text-dos . raw-text-dos)))) |
| 217 | 222 | ||
| 218 | (add-hook 'before-init-hook 'set-default-process-coding-system) | 223 | (add-hook 'before-init-hook 'dos-set-default-process-coding-system) |
| 219 | 224 | ||
| 220 | ;; File names defined in preloaded packages can be incorrect or | 225 | ;; File names defined in preloaded packages can be incorrect or |
| 221 | ;; invalid if long file names were available during dumping, but not | 226 | ;; invalid if long file names were available during dumping, but not |
| @@ -232,17 +237,17 @@ returned unaltered." | |||
| 232 | 237 | ||
| 233 | (add-hook 'before-init-hook 'dos-reevaluate-defcustoms) | 238 | (add-hook 'before-init-hook 'dos-reevaluate-defcustoms) |
| 234 | 239 | ||
| 235 | (defvar register-name-alist | 240 | (defvar dos-register-name-alist |
| 236 | '((ax . 0) (bx . 1) (cx . 2) (dx . 3) (si . 4) (di . 5) | 241 | '((ax . 0) (bx . 1) (cx . 2) (dx . 3) (si . 4) (di . 5) |
| 237 | (cflag . 6) (flags . 7) | 242 | (cflag . 6) (flags . 7) |
| 238 | (al . (0 . 0)) (bl . (1 . 0)) (cl . (2 . 0)) (dl . (3 . 0)) | 243 | (al . (0 . 0)) (bl . (1 . 0)) (cl . (2 . 0)) (dl . (3 . 0)) |
| 239 | (ah . (0 . 1)) (bh . (1 . 1)) (ch . (2 . 1)) (dh . (3 . 1)))) | 244 | (ah . (0 . 1)) (bh . (1 . 1)) (ch . (2 . 1)) (dh . (3 . 1)))) |
| 240 | 245 | ||
| 241 | (defun make-register () | 246 | (defun dos-make-register () |
| 242 | (make-vector 8 0)) | 247 | (make-vector 8 0)) |
| 243 | 248 | ||
| 244 | (defun register-value (regs name) | 249 | (defun dos-register-value (regs name) |
| 245 | (let ((where (cdr (assoc name register-name-alist)))) | 250 | (let ((where (cdr (assoc name dos-register-name-alist)))) |
| 246 | (cond ((consp where) | 251 | (cond ((consp where) |
| 247 | (let ((tem (aref regs (car where)))) | 252 | (let ((tem (aref regs (car where)))) |
| 248 | (if (zerop (cdr where)) | 253 | (if (zerop (cdr where)) |
| @@ -252,10 +257,10 @@ returned unaltered." | |||
| 252 | (aref regs where)) | 257 | (aref regs where)) |
| 253 | (t nil)))) | 258 | (t nil)))) |
| 254 | 259 | ||
| 255 | (defun set-register-value (regs name value) | 260 | (defun dos-set-register-value (regs name value) |
| 256 | (and (numberp value) | 261 | (and (numberp value) |
| 257 | (>= value 0) | 262 | (>= value 0) |
| 258 | (let ((where (cdr (assoc name register-name-alist)))) | 263 | (let ((where (cdr (assoc name dos-register-name-alist)))) |
| 259 | (cond ((consp where) | 264 | (cond ((consp where) |
| 260 | (let ((tem (aref regs (car where))) | 265 | (let ((tem (aref regs (car where))) |
| 261 | (value (logand value 255))) | 266 | (value (logand value 255))) |
| @@ -268,18 +273,18 @@ returned unaltered." | |||
| 268 | (aset regs where (logand value 65535)))))) | 273 | (aset regs where (logand value 65535)))))) |
| 269 | regs) | 274 | regs) |
| 270 | 275 | ||
| 271 | (defsubst intdos (regs) | 276 | (defsubst dos-intdos (regs) |
| 272 | (int86 33 regs)) | 277 | (int86 33 regs)) |
| 273 | 278 | ||
| 274 | ;; Backward compatibility for obsolescent functions which | 279 | ;; Backward compatibility for obsolescent functions which |
| 275 | ;; set screen size. | 280 | ;; set screen size. |
| 276 | 281 | ||
| 277 | (defun mode25 () | 282 | (defun dos-mode25 () |
| 278 | "Changes the number of screen rows to 25." | 283 | "Changes the number of screen rows to 25." |
| 279 | (interactive) | 284 | (interactive) |
| 280 | (set-frame-size (selected-frame) 80 25)) | 285 | (set-frame-size (selected-frame) 80 25)) |
| 281 | 286 | ||
| 282 | (defun mode4350 () | 287 | (defun dos-mode4350 () |
| 283 | "Changes the number of rows to 43 or 50. | 288 | "Changes the number of rows to 43 or 50. |
| 284 | Emacs always tries to set the screen height to 50 rows first. | 289 | Emacs always tries to set the screen height to 50 rows first. |
| 285 | If this fails, it will try to set it to 43 rows, on the assumption | 290 | If this fails, it will try to set it to 43 rows, on the assumption |
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index d8b36adf730..3e434b36213 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el | |||
| @@ -780,6 +780,10 @@ Repeating prefix key when region is active works as a single prefix key." | |||
| 780 | (setq mark-active nil) | 780 | (setq mark-active nil) |
| 781 | (run-hooks 'deactivate-mark-hook))) | 781 | (run-hooks 'deactivate-mark-hook))) |
| 782 | 782 | ||
| 783 | (defun cua--filter-buffer-noprops (start end) | ||
| 784 | (let ((str (filter-buffer-substring start end))) | ||
| 785 | (set-text-properties 0 (length str) nil str) | ||
| 786 | str)) | ||
| 783 | 787 | ||
| 784 | ;; The current register prefix | 788 | ;; The current register prefix |
| 785 | (defvar cua--register nil) | 789 | (defvar cua--register nil) |
| @@ -1039,10 +1043,7 @@ of text." | |||
| 1039 | (setq s (car u)) | 1043 | (setq s (car u)) |
| 1040 | (setq s (car u) e (cdr u))))))) | 1044 | (setq s (car u) e (cdr u))))))) |
| 1041 | (cond ((and s e (<= s e) (= s (mark t))) | 1045 | (cond ((and s e (<= s e) (= s (mark t))) |
| 1042 | (setq cua--repeat-replace-text | 1046 | (setq cua--repeat-replace-text (cua--filter-buffer-noprops s e))) |
| 1043 | (filter-buffer-substring s e)) | ||
| 1044 | (set-text-properties 0 (length cua--repeat-replace-text) | ||
| 1045 | nil cua--repeat-replace-text)) | ||
| 1046 | ((and (null s) (eq u elt)) ;; nothing inserted | 1047 | ((and (null s) (eq u elt)) ;; nothing inserted |
| 1047 | (setq cua--repeat-replace-text | 1048 | (setq cua--repeat-replace-text |
| 1048 | "")) | 1049 | "")) |
diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el index 6c69800d73c..b67d09c04cf 100644 --- a/lisp/emulation/cua-gmrk.el +++ b/lisp/emulation/cua-gmrk.el | |||
| @@ -137,9 +137,8 @@ With prefix argument, don't jump to global mark when cancelling it." | |||
| 137 | (let ((src-buf (current-buffer))) | 137 | (let ((src-buf (current-buffer))) |
| 138 | (save-excursion | 138 | (save-excursion |
| 139 | (if (equal (marker-buffer cua--global-mark-marker) src-buf) | 139 | (if (equal (marker-buffer cua--global-mark-marker) src-buf) |
| 140 | (let ((text (filter-buffer-substring start end))) | 140 | (let ((text (cua--filter-buffer-noprops start end))) |
| 141 | (goto-char (marker-position cua--global-mark-marker)) | 141 | (goto-char (marker-position cua--global-mark-marker)) |
| 142 | (set-text-properties 0 (length text) text) | ||
| 143 | (insert text)) | 142 | (insert text)) |
| 144 | (set-buffer (marker-buffer cua--global-mark-marker)) | 143 | (set-buffer (marker-buffer cua--global-mark-marker)) |
| 145 | (goto-char (marker-position cua--global-mark-marker)) | 144 | (goto-char (marker-position cua--global-mark-marker)) |
| @@ -162,11 +161,10 @@ With prefix argument, don't jump to global mark when cancelling it." | |||
| 162 | (if (and (< start (marker-position cua--global-mark-marker)) | 161 | (if (and (< start (marker-position cua--global-mark-marker)) |
| 163 | (< (marker-position cua--global-mark-marker) end)) | 162 | (< (marker-position cua--global-mark-marker) end)) |
| 164 | (message "Can't move region into itself") | 163 | (message "Can't move region into itself") |
| 165 | (let ((text (filter-buffer-substring start end)) | 164 | (let ((text (cua--filter-buffer-noprops start end)) |
| 166 | (p1 (copy-marker start)) | 165 | (p1 (copy-marker start)) |
| 167 | (p2 (copy-marker end))) | 166 | (p2 (copy-marker end))) |
| 168 | (goto-char (marker-position cua--global-mark-marker)) | 167 | (goto-char (marker-position cua--global-mark-marker)) |
| 169 | (set-text-properties 0 (length text) text) | ||
| 170 | (insert text) | 168 | (insert text) |
| 171 | (cua--activate-global-mark) | 169 | (cua--activate-global-mark) |
| 172 | (delete-region (marker-position p1) (marker-position p2)) | 170 | (delete-region (marker-position p1) (marker-position p2)) |
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index 4ac8ce58b3e..2b41f6435ee 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el | |||
| @@ -625,7 +625,7 @@ If command is repeated at same position, delete the rectangle." | |||
| 625 | (if (not (cua--rectangle-virtual-edges)) | 625 | (if (not (cua--rectangle-virtual-edges)) |
| 626 | (cua--rectangle-operation nil nil nil nil nil ; do not tabify | 626 | (cua--rectangle-operation nil nil nil nil nil ; do not tabify |
| 627 | '(lambda (s e l r) | 627 | '(lambda (s e l r) |
| 628 | (setq rect (cons (filter-buffer-substring s e nil t) rect)))) | 628 | (setq rect (cons (cua--filter-buffer-noprops s e) rect)))) |
| 629 | (cua--rectangle-operation nil 1 nil nil nil ; do not tabify | 629 | (cua--rectangle-operation nil 1 nil nil nil ; do not tabify |
| 630 | '(lambda (s e l r v) | 630 | '(lambda (s e l r v) |
| 631 | (let ((copy t) (bs 0) (as 0) row) | 631 | (let ((copy t) (bs 0) (as 0) row) |
| @@ -643,7 +643,7 @@ If command is repeated at same position, delete the rectangle." | |||
| 643 | (setq as (- r (max (current-column) l)) | 643 | (setq as (- r (max (current-column) l)) |
| 644 | e (point))) | 644 | e (point))) |
| 645 | (setq row (if (and copy (> e s)) | 645 | (setq row (if (and copy (> e s)) |
| 646 | (filter-buffer-substring s e nil t) | 646 | (cua--filter-buffer-noprops s e) |
| 647 | "")) | 647 | "")) |
| 648 | (when (> bs 0) | 648 | (when (> bs 0) |
| 649 | (setq row (concat (make-string bs ?\s) row))) | 649 | (setq row (concat (make-string bs ?\s) row))) |
| @@ -1124,12 +1124,12 @@ The length of STRING need not be the same as the rectangle width." | |||
| 1124 | '(lambda (s e l r) | 1124 | '(lambda (s e l r) |
| 1125 | (cond | 1125 | (cond |
| 1126 | ((re-search-forward "0x\\([0-9a-fA-F]+\\)" e t) | 1126 | ((re-search-forward "0x\\([0-9a-fA-F]+\\)" e t) |
| 1127 | (let* ((txt (filter-buffer-substring (match-beginning 1) (match-end 1) nil t)) | 1127 | (let* ((txt (cua--filter-buffer-noprops (match-beginning 1) (match-end 1))) |
| 1128 | (n (string-to-number txt 16)) | 1128 | (n (string-to-number txt 16)) |
| 1129 | (fmt (format "0x%%0%dx" (length txt)))) | 1129 | (fmt (format "0x%%0%dx" (length txt)))) |
| 1130 | (replace-match (format fmt (+ n increment))))) | 1130 | (replace-match (format fmt (+ n increment))))) |
| 1131 | ((re-search-forward "\\( *-?[0-9]+\\)" e t) | 1131 | ((re-search-forward "\\( *-?[0-9]+\\)" e t) |
| 1132 | (let* ((txt (filter-buffer-substring (match-beginning 1) (match-end 1) nil t)) | 1132 | (let* ((txt (cua--filter-buffer-noprops (match-beginning 1) (match-end 1))) |
| 1133 | (prefix (if (= (aref txt 0) ?0) "0" "")) | 1133 | (prefix (if (= (aref txt 0) ?0) "0" "")) |
| 1134 | (n (string-to-number txt 10)) | 1134 | (n (string-to-number txt 10)) |
| 1135 | (fmt (format "%%%s%dd" prefix (length txt)))) | 1135 | (fmt (format "%%%s%dd" prefix (length txt)))) |
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03 index d378cf36d42..6f46837ad19 100644 --- a/lisp/erc/ChangeLog.03 +++ b/lisp/erc/ChangeLog.03 | |||
| @@ -145,7 +145,7 @@ | |||
| 145 | to delete-if-not. | 145 | to delete-if-not. |
| 146 | 146 | ||
| 147 | * erc.el(erc-update-current-channel-member): | 147 | * erc.el(erc-update-current-channel-member): |
| 148 | Use erc-downcase when comparing | 148 | Use erc-downcase when comparing |
| 149 | nick entries. Cleanup indentation. | 149 | nick entries. Cleanup indentation. |
| 150 | 150 | ||
| 151 | 2003-11-01 Lawrence Mitchell <wence@gmx.li> | 151 | 2003-11-01 Lawrence Mitchell <wence@gmx.li> |
| @@ -171,7 +171,7 @@ | |||
| 171 | 2003-10-24 Mario Lang <mlang@delysid.org> | 171 | 2003-10-24 Mario Lang <mlang@delysid.org> |
| 172 | 172 | ||
| 173 | * erc-dcc.el: From Stephan Stahl <stl@isogmbh.de>: | 173 | * erc-dcc.el: From Stephan Stahl <stl@isogmbh.de>: |
| 174 | * (erc-dcc-send-block): Kill buffer if transfer completed correctly. | 174 | (erc-dcc-send-block): Kill buffer if transfer completed correctly. |
| 175 | 175 | ||
| 176 | 2003-10-22 Mario Lang <mlang@delysid.org> | 176 | 2003-10-22 Mario Lang <mlang@delysid.org> |
| 177 | 177 | ||
diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04 index 16e7788a221..a1cbab740be 100644 --- a/lisp/erc/ChangeLog.04 +++ b/lisp/erc/ChangeLog.04 | |||
| @@ -72,7 +72,7 @@ | |||
| 72 | 2004-12-24 Jorgen Schaefer <forcer@users.sourceforge.net> | 72 | 2004-12-24 Jorgen Schaefer <forcer@users.sourceforge.net> |
| 73 | 73 | ||
| 74 | * erc-goodies.el, erc.el: The Small Extraction of Stuff[tm] commit. | 74 | * erc-goodies.el, erc.el: The Small Extraction of Stuff[tm] commit. |
| 75 | Moved some functions from erc.el to erc-goodies.el, and | 75 | Moved some functions from erc.el to erc-goodies.el, and |
| 76 | transformed them to erc modules in the process. | 76 | transformed them to erc modules in the process. |
| 77 | - imenu autoload stuff moved. I don't know why it is here at all. | 77 | - imenu autoload stuff moved. I don't know why it is here at all. |
| 78 | - Moved: scroll-to-bottom, make-read-only, distinguish-noncommands, | 78 | - Moved: scroll-to-bottom, make-read-only, distinguish-noncommands, |
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index d78e07037b4..0b7eaf7ed72 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,4 +1,66 @@ | |||
| 1 | 2010-05-07 Christian von Roques <roques@mti.ag> (tiny change) | 1 | 2010-05-13 Katsumi Yamaoka <yamaoka@jpl.org> |
| 2 | |||
| 3 | * mml1991.el (mml1991-mailcrypt-encrypt, mml1991-gpg-encrypt) | ||
| 4 | * mml2015.el (mml2015-gpg-encrypt): Disable multibyte in buffers | ||
| 5 | generated within the mm-with-unibyte-current-buffer macro. | ||
| 6 | |||
| 7 | 2010-05-13 Katsumi Yamaoka <yamaoka@jpl.org> | ||
| 8 | |||
| 9 | * gnus-art.el (gnus-bind-safe-url-regexp): Bind mm-w3m-safe-url-regexp | ||
| 10 | to nil when we're in a mml-preview buffer and no group is selected. | ||
| 11 | |||
| 12 | 2010-05-12 Andreas Seltenreich <seltenreich@gmx.de> | ||
| 13 | |||
| 14 | * gnus-sum.el (gnus-summary-read-group-1): Don't jump to next group | ||
| 15 | when catching the `C-g'. Reported by: "Leo" | ||
| 16 | |||
| 17 | 2010-05-12 Katsumi Yamaoka <yamaoka@jpl.org> | ||
| 18 | |||
| 19 | * message.el (message-forward-make-body-plain) | ||
| 20 | (message-forward-make-body-mml): Use mm-multibyte-string-p instead of | ||
| 21 | multibyte-string-p. | ||
| 22 | |||
| 23 | 2010-05-12 Katsumi Yamaoka <yamaoka@jpl.org> | ||
| 24 | |||
| 25 | * message.el (message-forward-make-body-mml): Assume original message | ||
| 26 | is multibyte string; error on unibyte. | ||
| 27 | (message-forward-make-body-plain): Ditto; don't add excessive newline | ||
| 28 | in body end. | ||
| 29 | |||
| 30 | 2010-05-11 Andreas Seltenreich <seltenreich@gmx.de> | ||
| 31 | |||
| 32 | * gnus-sum.el (gnus-summary-kill-thread): Use gnus-summary-mark-article | ||
| 33 | instead of g-s-m-a-as-unread to set the expirable mark. (Bug#5284) | ||
| 34 | |||
| 35 | 2010-05-11 Katsumi Yamaoka <yamaoka@jpl.org> | ||
| 36 | |||
| 37 | * mm-extern.el (mm-extern-url): Don't use | ||
| 38 | mm-with-unibyte-current-buffer. | ||
| 39 | (mm-extern-cache-contents): Use with-current-buffer instead of | ||
| 40 | save-excursion + set-buffer. | ||
| 41 | |||
| 42 | 2010-05-10 Katsumi Yamaoka <yamaoka@jpl.org> | ||
| 43 | |||
| 44 | * mm-util.el (mm-emacs-mule): Remove. | ||
| 45 | |||
| 46 | 2010-05-10 Andreas Seltenreich <seltenreich@gmx.de> | ||
| 47 | |||
| 48 | * gnus-sum.el (gnus-summary-mode): Don't make minor-mode-alist | ||
| 49 | buffer-local as it's incompatible with Stefan Monnier's 2010-05-03 | ||
| 50 | change. | ||
| 51 | |||
| 52 | 2010-05-10 Katsumi Yamaoka <yamaoka@jpl.org> | ||
| 53 | |||
| 54 | * mm-util.el (mm-with-unibyte-current-buffer): Redefine it so as not to | ||
| 55 | bind the default value of enable-multibyte-characters to nil. | ||
| 56 | |||
| 57 | 2010-05-10 Katsumi Yamaoka <yamaoka@jpl.org> | ||
| 58 | |||
| 59 | * message.el (message-forward-make-body-plain) | ||
| 60 | (message-forward-make-body-mml): | ||
| 61 | Don't use mm-with-unibyte-current-buffer. | ||
| 62 | |||
| 63 | 2010-05-07 Christian von Roques <roques@mti.ag> (tiny change) | ||
| 2 | 64 | ||
| 3 | * mml2015.el (mml2015-epg-find-usable-key): Skip disabled key | 65 | * mml2015.el (mml2015-epg-find-usable-key): Skip disabled key |
| 4 | (Bug#5592). | 66 | (Bug#5592). |
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1 index e455770711b..795df6f95a7 100644 --- a/lisp/gnus/ChangeLog.1 +++ b/lisp/gnus/ChangeLog.1 | |||
| @@ -28,10 +28,10 @@ | |||
| 28 | 28 | ||
| 29 | * gnus-start.el (gnus-slave-save-newsrc): | 29 | * gnus-start.el (gnus-slave-save-newsrc): |
| 30 | * gnus-uu.el (gnus-uu-tmp-dir, gnus-uu-decode-binhex) | 30 | * gnus-uu.el (gnus-uu-tmp-dir, gnus-uu-decode-binhex) |
| 31 | (gnus-uu-decode-binhex-view, gnus-uu-digest-mail-forward) | 31 | (gnus-uu-decode-binhex-view, gnus-uu-digest-mail-forward) |
| 32 | (gnus-uu-initialize): | 32 | (gnus-uu-initialize): |
| 33 | * nnmail.el (nnmail-make-complex-temp-name, nnmail-get-new-mail): | 33 | * nnmail.el (nnmail-make-complex-temp-name, nnmail-get-new-mail): |
| 34 | Use make-temp-file. | 34 | Use make-temp-file. |
| 35 | 35 | ||
| 36 | 1999-09-07 Eli Zaretskii <eliz@gnu.org> | 36 | 1999-09-07 Eli Zaretskii <eliz@gnu.org> |
| 37 | 37 | ||
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index cd7f3b56aad..b05ff5fc8ef 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 | |||
| @@ -4905,8 +4905,8 @@ | |||
| 4905 | 2003-02-08 Michael Welsh Duggan <md5i@cs.cmu.edu> | 4905 | 2003-02-08 Michael Welsh Duggan <md5i@cs.cmu.edu> |
| 4906 | 4906 | ||
| 4907 | * nnmail.el (nnmail-split-it): If a message ends up matching the | 4907 | * nnmail.el (nnmail-split-it): If a message ends up matching the |
| 4908 | same mailbox more than once, it will cause duplicates to appear | 4908 | same mailbox more than once, it will cause duplicates to appear |
| 4909 | in the mailbox. | 4909 | in the mailbox. |
| 4910 | 4910 | ||
| 4911 | 2003-02-08 Simon Josefsson <jas@extundo.com> | 4911 | 2003-02-08 Simon Josefsson <jas@extundo.com> |
| 4912 | 4912 | ||
| @@ -5553,8 +5553,8 @@ | |||
| 5553 | 2003-01-13 Jhair Tocancipa Triana <jhair_tocancipa@@gmx.net> | 5553 | 2003-01-13 Jhair Tocancipa Triana <jhair_tocancipa@@gmx.net> |
| 5554 | 5554 | ||
| 5555 | * gnus-audio.el (gnus-audio-au-player, gnus-audio-wav-player): Use | 5555 | * gnus-audio.el (gnus-audio-au-player, gnus-audio-wav-player): Use |
| 5556 | /usr/bin/play as default player. | 5556 | /usr/bin/play as default player. |
| 5557 | (gnus-audio-play): Added ARG-DESCRIPTOR to prompt for a file to play. | 5557 | (gnus-audio-play): Added ARG-DESCRIPTOR to prompt for a file to play. |
| 5558 | 5558 | ||
| 5559 | 2003-01-14 Katsumi Yamaoka <yamaoka@jpl.org> | 5559 | 2003-01-14 Katsumi Yamaoka <yamaoka@jpl.org> |
| 5560 | 5560 | ||
| @@ -9034,7 +9034,7 @@ | |||
| 9034 | boolean not a string | 9034 | boolean not a string |
| 9035 | * gnus-group.el (gnus-group-line-format): Add description of %C | 9035 | * gnus-group.el (gnus-group-line-format): Add description of %C |
| 9036 | * gnus-group.el (gnus-group-line-format-alist): Add gnus-tmp-comment | 9036 | * gnus-group.el (gnus-group-line-format-alist): Add gnus-tmp-comment |
| 9037 | as %C | 9037 | as %C |
| 9038 | * gnus-group.el (gnus-group-insert-group-line): Add gnus-tmp-comment. | 9038 | * gnus-group.el (gnus-group-insert-group-line): Add gnus-tmp-comment. |
| 9039 | 9039 | ||
| 9040 | 2002-04-22 Paul Jarc <prj@po.cwru.edu> | 9040 | 2002-04-22 Paul Jarc <prj@po.cwru.edu> |
| @@ -11326,7 +11326,7 @@ | |||
| 11326 | 2002-01-02 ShengHuo ZHU <zsh@cs.rochester.edu> | 11326 | 2002-01-02 ShengHuo ZHU <zsh@cs.rochester.edu> |
| 11327 | 11327 | ||
| 11328 | * gnus-picon.el (gnus-picon-transform-newsgroups): Fix for the case | 11328 | * gnus-picon.el (gnus-picon-transform-newsgroups): Fix for the case |
| 11329 | "Newsgroups: rec.music.beatles.moderated, rec.music.beatles". | 11329 | "Newsgroups: rec.music.beatles.moderated, rec.music.beatles". |
| 11330 | 11330 | ||
| 11331 | 2002-01-03 Steve Youngs <youngs@xemacs.org> | 11331 | 2002-01-03 Steve Youngs <youngs@xemacs.org> |
| 11332 | 11332 | ||
| @@ -12256,7 +12256,7 @@ | |||
| 12256 | (imap-stream-alist): Backslash. | 12256 | (imap-stream-alist): Backslash. |
| 12257 | 12257 | ||
| 12258 | * gnus-sum.el (gnus-summary-limit-to-author): Missing arguments. | 12258 | * gnus-sum.el (gnus-summary-limit-to-author): Missing arguments. |
| 12259 | Thanks to david.goldberg6@verizon.net (David S. Goldberg). | 12259 | Thanks to david.goldberg6@verizon.net (David S. Goldberg). |
| 12260 | 12260 | ||
| 12261 | 2001-11-27 14:00:00 ShengHuo ZHU <zsh@cs.rochester.edu> | 12261 | 2001-11-27 14:00:00 ShengHuo ZHU <zsh@cs.rochester.edu> |
| 12262 | 12262 | ||
| @@ -12755,7 +12755,7 @@ | |||
| 12755 | 2001-10-30 13:00:00 ShengHuo ZHU <zsh@cs.rochester.edu> | 12755 | 2001-10-30 13:00:00 ShengHuo ZHU <zsh@cs.rochester.edu> |
| 12756 | 12756 | ||
| 12757 | * gnus-spec.el (gnus-parse-simple-format): Use | 12757 | * gnus-spec.el (gnus-parse-simple-format): Use |
| 12758 | buffer-substring-no-properties. | 12758 | buffer-substring-no-properties. |
| 12759 | 12759 | ||
| 12760 | 2001-10-30 Katsumi Yamaoka <yamaoka@jpl.org> | 12760 | 2001-10-30 Katsumi Yamaoka <yamaoka@jpl.org> |
| 12761 | 12761 | ||
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 5f899b3067a..0659ee893de 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el | |||
| @@ -4822,7 +4822,11 @@ General format specifiers can also be used. See Info node | |||
| 4822 | (with-current-buffer gnus-article-current-summary | 4822 | (with-current-buffer gnus-article-current-summary |
| 4823 | gnus-newsgroup-name) | 4823 | gnus-newsgroup-name) |
| 4824 | gnus-newsgroup-name))) | 4824 | gnus-newsgroup-name))) |
| 4825 | (if (cond ((stringp gnus-safe-html-newsgroups) | 4825 | (if (cond ((not group) |
| 4826 | ;; Maybe we're in a mml-preview buffer | ||
| 4827 | ;; and no group is selected. | ||
| 4828 | t) | ||
| 4829 | ((stringp gnus-safe-html-newsgroups) | ||
| 4826 | (string-match gnus-safe-html-newsgroups group)) | 4830 | (string-match gnus-safe-html-newsgroups group)) |
| 4827 | ((consp gnus-safe-html-newsgroups) | 4831 | ((consp gnus-safe-html-newsgroups) |
| 4828 | (member group gnus-safe-html-newsgroups))) | 4832 | (member group gnus-safe-html-newsgroups))) |
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 480c546ca6e..3a2c944ed2f 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el | |||
| @@ -3056,7 +3056,6 @@ The following commands are available: | |||
| 3056 | (gnus-simplify-mode-line) | 3056 | (gnus-simplify-mode-line) |
| 3057 | (setq major-mode 'gnus-summary-mode) | 3057 | (setq major-mode 'gnus-summary-mode) |
| 3058 | (setq mode-name "Summary") | 3058 | (setq mode-name "Summary") |
| 3059 | (make-local-variable 'minor-mode-alist) | ||
| 3060 | (use-local-map gnus-summary-mode-map) | 3059 | (use-local-map gnus-summary-mode-map) |
| 3061 | (buffer-disable-undo) | 3060 | (buffer-disable-undo) |
| 3062 | (setq buffer-read-only t ;Disable modification | 3061 | (setq buffer-read-only t ;Disable modification |
| @@ -3932,7 +3931,6 @@ If NO-DISPLAY, don't generate a summary buffer." | |||
| 3932 | (progn | 3931 | (progn |
| 3933 | (set-buffer gnus-group-buffer) | 3932 | (set-buffer gnus-group-buffer) |
| 3934 | (gnus-group-jump-to-group group) | 3933 | (gnus-group-jump-to-group group) |
| 3935 | (gnus-group-next-unread-group 1) | ||
| 3936 | (gnus-configure-windows 'group 'force)) | 3934 | (gnus-configure-windows 'group 'force)) |
| 3937 | (gnus-handle-ephemeral-exit quit-config)) | 3935 | (gnus-handle-ephemeral-exit quit-config)) |
| 3938 | ;; Finally signal the quit. | 3936 | ;; Finally signal the quit. |
| @@ -11509,7 +11507,7 @@ If the prefix argument is negative, tick articles instead." | |||
| 11509 | ((> unmark 0) | 11507 | ((> unmark 0) |
| 11510 | (gnus-summary-mark-article-as-unread gnus-unread-mark)) | 11508 | (gnus-summary-mark-article-as-unread gnus-unread-mark)) |
| 11511 | ((= unmark 0) | 11509 | ((= unmark 0) |
| 11512 | (gnus-summary-mark-article-as-unread gnus-expirable-mark)) | 11510 | (gnus-summary-mark-article nil gnus-expirable-mark)) |
| 11513 | (t | 11511 | (t |
| 11514 | (gnus-summary-mark-article-as-unread gnus-ticked-mark))) | 11512 | (gnus-summary-mark-article-as-unread gnus-ticked-mark))) |
| 11515 | (setq articles (cdr articles)))) | 11513 | (setq articles (cdr articles)))) |
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 79a88cd6bd3..947b1bd53e8 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el | |||
| @@ -7161,22 +7161,28 @@ Optional DIGEST will use digest to forward." | |||
| 7161 | (defun message-forward-make-body-plain (forward-buffer) | 7161 | (defun message-forward-make-body-plain (forward-buffer) |
| 7162 | (insert | 7162 | (insert |
| 7163 | "\n-------------------- Start of forwarded message --------------------\n") | 7163 | "\n-------------------- Start of forwarded message --------------------\n") |
| 7164 | (let ((b (point)) e) | 7164 | (let ((b (point)) |
| 7165 | (insert | 7165 | (contents (with-current-buffer forward-buffer (buffer-string))) |
| 7166 | (with-temp-buffer | 7166 | e) |
| 7167 | (mm-disable-multibyte) | 7167 | (unless (featurep 'xemacs) |
| 7168 | (insert | 7168 | (unless (mm-multibyte-string-p contents) |
| 7169 | (with-current-buffer forward-buffer | 7169 | (error "Attempt to insert unibyte string from the buffer \"%s\"\ |
| 7170 | (mm-with-unibyte-current-buffer (buffer-string)))) | 7170 | to the multibyte buffer \"%s\"" |
| 7171 | (mm-enable-multibyte) | 7171 | (if (bufferp forward-buffer) |
| 7172 | (mime-to-mml) | 7172 | (buffer-name forward-buffer) |
| 7173 | (goto-char (point-min)) | 7173 | forward-buffer) |
| 7174 | (when (looking-at "From ") | 7174 | (buffer-name)))) |
| 7175 | (replace-match "X-From-Line: ")) | 7175 | (insert (mm-with-multibyte-buffer |
| 7176 | (buffer-string))) | 7176 | (insert contents) |
| 7177 | (mime-to-mml) | ||
| 7178 | (goto-char (point-min)) | ||
| 7179 | (when (looking-at "From ") | ||
| 7180 | (replace-match "X-From-Line: ")) | ||
| 7181 | (buffer-string))) | ||
| 7182 | (unless (bolp) (insert "\n")) | ||
| 7177 | (setq e (point)) | 7183 | (setq e (point)) |
| 7178 | (insert | 7184 | (insert |
| 7179 | "\n-------------------- End of forwarded message --------------------\n") | 7185 | "-------------------- End of forwarded message --------------------\n") |
| 7180 | (message-remove-ignored-headers b e))) | 7186 | (message-remove-ignored-headers b e))) |
| 7181 | 7187 | ||
| 7182 | (defun message-remove-ignored-headers (b e) | 7188 | (defun message-remove-ignored-headers (b e) |
| @@ -7212,18 +7218,22 @@ Optional DIGEST will use digest to forward." | |||
| 7212 | (insert "\n\n<#mml type=message/rfc822 disposition=inline>\n") | 7218 | (insert "\n\n<#mml type=message/rfc822 disposition=inline>\n") |
| 7213 | (let ((b (point)) e) | 7219 | (let ((b (point)) e) |
| 7214 | (if (not message-forward-decoded-p) | 7220 | (if (not message-forward-decoded-p) |
| 7215 | (insert | 7221 | (let ((contents (with-current-buffer forward-buffer (buffer-string)))) |
| 7216 | (with-temp-buffer | 7222 | (unless (featurep 'xemacs) |
| 7217 | (mm-disable-multibyte) | 7223 | (unless (mm-multibyte-string-p contents) |
| 7218 | (insert | 7224 | (error "Attempt to insert unibyte string from the buffer \"%s\"\ |
| 7219 | (with-current-buffer forward-buffer | 7225 | to the multibyte buffer \"%s\"" |
| 7220 | (mm-with-unibyte-current-buffer (buffer-string)))) | 7226 | (if (bufferp forward-buffer) |
| 7221 | (mm-enable-multibyte) | 7227 | (buffer-name forward-buffer) |
| 7222 | (mime-to-mml) | 7228 | forward-buffer) |
| 7223 | (goto-char (point-min)) | 7229 | (buffer-name)))) |
| 7224 | (when (looking-at "From ") | 7230 | (insert (mm-with-multibyte-buffer |
| 7225 | (replace-match "X-From-Line: ")) | 7231 | (insert contents) |
| 7226 | (buffer-string))) | 7232 | (mime-to-mml) |
| 7233 | (goto-char (point-min)) | ||
| 7234 | (when (looking-at "From ") | ||
| 7235 | (replace-match "X-From-Line: ")) | ||
| 7236 | (buffer-string)))) | ||
| 7227 | (save-restriction | 7237 | (save-restriction |
| 7228 | (narrow-to-region (point) (point)) | 7238 | (narrow-to-region (point) (point)) |
| 7229 | (mml-insert-buffer forward-buffer) | 7239 | (mml-insert-buffer forward-buffer) |
diff --git a/lisp/gnus/mm-extern.el b/lisp/gnus/mm-extern.el index 1e3df3c4cff..f40f798789c 100644 --- a/lisp/gnus/mm-extern.el +++ b/lisp/gnus/mm-extern.el | |||
| @@ -67,9 +67,8 @@ | |||
| 67 | (coding-system-for-read mm-binary-coding-system)) | 67 | (coding-system-for-read mm-binary-coding-system)) |
| 68 | (unless url | 68 | (unless url |
| 69 | (error "URL is not specified")) | 69 | (error "URL is not specified")) |
| 70 | (mm-with-unibyte-current-buffer | ||
| 71 | (mm-url-insert-file-contents url)) | ||
| 72 | (mm-disable-multibyte) | 70 | (mm-disable-multibyte) |
| 71 | (mm-url-insert-file-contents url) | ||
| 73 | (setq buffer-file-name name))) | 72 | (setq buffer-file-name name))) |
| 74 | 73 | ||
| 75 | (defun mm-extern-anon-ftp (handle) | 74 | (defun mm-extern-anon-ftp (handle) |
| @@ -125,7 +124,7 @@ | |||
| 125 | (or access-type | 124 | (or access-type |
| 126 | (error "Couldn't find access type")))) | 125 | (error "Couldn't find access type")))) |
| 127 | mm-extern-function-alist))) | 126 | mm-extern-function-alist))) |
| 128 | buf handles) | 127 | handles) |
| 129 | (unless func | 128 | (unless func |
| 130 | (error "Access type (%s) is not supported" access-type)) | 129 | (error "Access type (%s) is not supported" access-type)) |
| 131 | (mm-with-part handle | 130 | (mm-with-part handle |
| @@ -136,8 +135,7 @@ | |||
| 136 | (unless (bufferp (car handles)) | 135 | (unless (bufferp (car handles)) |
| 137 | (mm-destroy-parts handles) | 136 | (mm-destroy-parts handles) |
| 138 | (error "Multipart external body is not supported")) | 137 | (error "Multipart external body is not supported")) |
| 139 | (save-excursion | 138 | (with-current-buffer (mm-handle-buffer handles) |
| 140 | (set-buffer (setq buf (mm-handle-buffer handles))) | ||
| 141 | (let (good) | 139 | (let (good) |
| 142 | (unwind-protect | 140 | (unwind-protect |
| 143 | (progn | 141 | (progn |
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index a288b8b1b6d..f657000205e 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el | |||
| @@ -902,12 +902,6 @@ mail with multiple parts is preferred to sending a Unicode one.") | |||
| 902 | out))) | 902 | out))) |
| 903 | 903 | ||
| 904 | (eval-and-compile | 904 | (eval-and-compile |
| 905 | (defvar mm-emacs-mule (and (not (featurep 'xemacs)) | ||
| 906 | (boundp 'enable-multibyte-characters) | ||
| 907 | (default-value 'enable-multibyte-characters) | ||
| 908 | (fboundp 'set-buffer-multibyte)) | ||
| 909 | "True in Emacs with Mule.") | ||
| 910 | |||
| 911 | (if (featurep 'xemacs) | 905 | (if (featurep 'xemacs) |
| 912 | (defalias 'mm-enable-multibyte 'ignore) | 906 | (defalias 'mm-enable-multibyte 'ignore) |
| 913 | (defun mm-enable-multibyte () | 907 | (defun mm-enable-multibyte () |
| @@ -1230,33 +1224,23 @@ Use multibyte mode for this." | |||
| 1230 | 1224 | ||
| 1231 | (defmacro mm-with-unibyte-current-buffer (&rest forms) | 1225 | (defmacro mm-with-unibyte-current-buffer (&rest forms) |
| 1232 | "Evaluate FORMS with current buffer temporarily made unibyte. | 1226 | "Evaluate FORMS with current buffer temporarily made unibyte. |
| 1233 | Also bind the default-value of `enable-multibyte-characters' to nil. | 1227 | Equivalent to `progn' in XEmacs. |
| 1234 | Equivalent to `progn' in XEmacs | 1228 | |
| 1235 | 1229 | Note: We recommend not using this macro any more; there should be | |
| 1236 | NOTE: Use this macro with caution in multibyte buffers (it is not | 1230 | better ways to do a similar thing. The previous version of this macro |
| 1237 | worth using this macro in unibyte buffers of course). Use of | 1231 | bound the default value of `enable-multibyte-characters' to nil while |
| 1238 | `(set-buffer-multibyte t)', which is run finally, is generally | 1232 | evaluating FORMS but it is no longer done. So, some programs assuming |
| 1239 | harmful since it is likely to modify existing data in the buffer. | 1233 | it if any may malfunction." |
| 1240 | For instance, it converts \"\\300\\255\" into \"\\255\" in | ||
| 1241 | Emacs 23 (unicode)." | ||
| 1242 | (if (featurep 'xemacs) | 1234 | (if (featurep 'xemacs) |
| 1243 | `(progn ,@forms) | 1235 | `(progn ,@forms) |
| 1244 | ;; FIXME: (default-value 'enable-multibyte-characters) is read-only | 1236 | (let ((multibyte (make-symbol "multibyte"))) |
| 1245 | ;; so let-binding it is wrong. The right fix is to not use this | 1237 | `(let ((,multibyte enable-multibyte-characters)) |
| 1246 | ;; macro at all any more, since it's been ill-defined from the start. | 1238 | (when ,multibyte |
| 1247 | (let ((multibyte (make-symbol "multibyte")) | 1239 | (set-buffer-multibyte nil)) |
| 1248 | (buffer (make-symbol "buffer"))) | 1240 | (prog1 |
| 1249 | `(if mm-emacs-mule | 1241 | (progn ,@forms) |
| 1250 | (let ((,multibyte enable-multibyte-characters) | 1242 | (when ,multibyte |
| 1251 | (,buffer (current-buffer))) | 1243 | (set-buffer-multibyte t))))))) |
| 1252 | (unwind-protect | ||
| 1253 | (letf (((default-value 'enable-multibyte-characters) nil)) | ||
| 1254 | (set-buffer-multibyte nil) | ||
| 1255 | ,@forms) | ||
| 1256 | (set-buffer ,buffer) | ||
| 1257 | (set-buffer-multibyte ,multibyte))) | ||
| 1258 | (letf (((default-value 'enable-multibyte-characters) nil)) | ||
| 1259 | ,@forms))))) | ||
| 1260 | (put 'mm-with-unibyte-current-buffer 'lisp-indent-function 0) | 1244 | (put 'mm-with-unibyte-current-buffer 'lisp-indent-function 0) |
| 1261 | (put 'mm-with-unibyte-current-buffer 'edebug-form-spec '(body)) | 1245 | (put 'mm-with-unibyte-current-buffer 'edebug-form-spec '(body)) |
| 1262 | 1246 | ||
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el index a3ada29fa66..3ba479574fd 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el | |||
| @@ -145,6 +145,7 @@ Whether the passphrase is cached at all is controlled by | |||
| 145 | (delete-region (point-min) (point))) | 145 | (delete-region (point-min) (point))) |
| 146 | (mm-with-unibyte-current-buffer | 146 | (mm-with-unibyte-current-buffer |
| 147 | (with-temp-buffer | 147 | (with-temp-buffer |
| 148 | (inline (mm-disable-multibyte)) | ||
| 148 | (setq cipher (current-buffer)) | 149 | (setq cipher (current-buffer)) |
| 149 | (insert-buffer-substring text) | 150 | (insert-buffer-substring text) |
| 150 | (unless (mc-encrypt-generic | 151 | (unless (mc-encrypt-generic |
| @@ -225,6 +226,7 @@ Whether the passphrase is cached at all is controlled by | |||
| 225 | (delete-region (point-min) (point))) | 226 | (delete-region (point-min) (point))) |
| 226 | (mm-with-unibyte-current-buffer | 227 | (mm-with-unibyte-current-buffer |
| 227 | (with-temp-buffer | 228 | (with-temp-buffer |
| 229 | (inline (mm-disable-multibyte)) | ||
| 228 | (flet ((gpg-encrypt-func | 230 | (flet ((gpg-encrypt-func |
| 229 | (sign plaintext ciphertext result recipients &optional | 231 | (sign plaintext ciphertext result recipients &optional |
| 230 | passphrase sign-with-key armor textmode) | 232 | passphrase sign-with-key armor textmode) |
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 130a3ca86a5..977f4dabb67 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el | |||
| @@ -680,6 +680,7 @@ Whether the passphrase is cached at all is controlled by | |||
| 680 | cipher) | 680 | cipher) |
| 681 | (mm-with-unibyte-current-buffer | 681 | (mm-with-unibyte-current-buffer |
| 682 | (with-temp-buffer | 682 | (with-temp-buffer |
| 683 | (mm-disable-multibyte) | ||
| 683 | ;; set up a function to call the correct gpg encrypt routine | 684 | ;; set up a function to call the correct gpg encrypt routine |
| 684 | ;; with the right arguments. (FIXME: this should be done | 685 | ;; with the right arguments. (FIXME: this should be done |
| 685 | ;; differently.) | 686 | ;; differently.) |
diff --git a/lisp/iimage.el b/lisp/iimage.el index e52a7d37301..87591724dbb 100644 --- a/lisp/iimage.el +++ b/lisp/iimage.el | |||
| @@ -55,19 +55,17 @@ | |||
| 55 | :group 'image) | 55 | :group 'image) |
| 56 | 56 | ||
| 57 | (defconst iimage-version "1.1") | 57 | (defconst iimage-version "1.1") |
| 58 | (defvar iimage-mode nil) | ||
| 59 | (defvar iimage-mode-map nil) | ||
| 60 | 58 | ||
| 61 | ;; Set up key map. | 59 | (defvar iimage-mode-map |
| 62 | (unless iimage-mode-map | 60 | (let ((map (make-sparse-keymap))) |
| 63 | (setq iimage-mode-map (make-sparse-keymap)) | 61 | (define-key map "\C-l" 'iimage-recenter) |
| 64 | (define-key iimage-mode-map "\C-l" 'iimage-recenter)) | 62 | map)) |
| 65 | 63 | ||
| 66 | (defun iimage-recenter (&optional arg) | 64 | (defun iimage-recenter (&optional arg) |
| 67 | "Re-draw images and recenter." | 65 | "Re-draw images and recenter." |
| 68 | (interactive "P") | 66 | (interactive "P") |
| 69 | (iimage-mode-buffer 0) | 67 | (iimage-mode-buffer nil) |
| 70 | (iimage-mode-buffer 1) | 68 | (iimage-mode-buffer t) |
| 71 | (recenter arg)) | 69 | (recenter arg)) |
| 72 | 70 | ||
| 73 | (defvar iimage-mode-image-filename-regex | 71 | (defvar iimage-mode-image-filename-regex |
| @@ -81,7 +79,7 @@ | |||
| 81 | `((,(concat "\\(`?file://\\|\\[\\[\\|<\\|`\\)?" | 79 | `((,(concat "\\(`?file://\\|\\[\\[\\|<\\|`\\)?" |
| 82 | "\\(" iimage-mode-image-filename-regex "\\)" | 80 | "\\(" iimage-mode-image-filename-regex "\\)" |
| 83 | "\\(\\]\\]\\|>\\|'\\)?") . 2)) | 81 | "\\(\\]\\]\\|>\\|'\\)?") . 2)) |
| 84 | "*Alist of filename REGEXP vs NUM. | 82 | "*Alist of filename REGEXP vs NUM. |
| 85 | Each element looks like (REGEXP . NUM). | 83 | Each element looks like (REGEXP . NUM). |
| 86 | NUM specifies which parenthesized expression in the regexp. | 84 | NUM specifies which parenthesized expression in the regexp. |
| 87 | 85 | ||
| @@ -90,54 +88,43 @@ Examples of image filename regexps: | |||
| 90 | `file://foo.png' | 88 | `file://foo.png' |
| 91 | \\[\\[foo.gif]] | 89 | \\[\\[foo.gif]] |
| 92 | <foo.png> | 90 | <foo.png> |
| 93 | foo.JPG | 91 | foo.JPG") |
| 94 | ") | ||
| 95 | 92 | ||
| 96 | (defvar iimage-mode-image-search-path nil | 93 | (defvar iimage-mode-image-search-path nil |
| 97 | "*List of directories to search for image files for iimage-mode.") | 94 | "*List of directories to search for image files for `iimage-mode'.") |
| 98 | 95 | ||
| 99 | ;;;###autoload | 96 | ;;;###autoload |
| 100 | (defun turn-on-iimage-mode () | 97 | (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1") |
| 101 | "Unconditionally turn on iimage mode." | ||
| 102 | (interactive) | ||
| 103 | (iimage-mode 1)) | ||
| 104 | 98 | ||
| 105 | (defun turn-off-iimage-mode () | 99 | (defun turn-off-iimage-mode () |
| 106 | "Unconditionally turn off iimage mode." | 100 | "Unconditionally turn off iimage mode." |
| 107 | (interactive) | 101 | (interactive) |
| 108 | (iimage-mode 0)) | 102 | (iimage-mode 0)) |
| 109 | 103 | ||
| 110 | (defalias 'iimage-locate-file 'locate-file) | ||
| 111 | |||
| 112 | (defun iimage-mode-buffer (arg) | 104 | (defun iimage-mode-buffer (arg) |
| 113 | "Display/undisplay images. | 105 | "Display images if ARG is non-nil, undisplay them otherwise." |
| 114 | With numeric ARG, display the images if and only if ARG is positive." | 106 | (let ((image-path (cons default-directory iimage-mode-image-search-path)) |
| 115 | (interactive) | 107 | file) |
| 116 | (let ((ing (if (numberp arg) | 108 | (with-silent-modifications |
| 117 | (> arg 0) | 109 | (save-excursion |
| 118 | iimage-mode)) | 110 | (goto-char (point-min)) |
| 119 | (modp (buffer-modified-p (current-buffer))) | 111 | (dolist (pair iimage-mode-image-regex-alist) |
| 120 | file buffer-read-only) | 112 | (while (re-search-forward (car pair) nil t) |
| 121 | (save-excursion | 113 | (if (and (setq file (match-string (cdr pair))) |
| 122 | (goto-char (point-min)) | 114 | (setq file (locate-file file image-path))) |
| 123 | (dolist (pair iimage-mode-image-regex-alist) | 115 | ;; FIXME: we don't mark our images, so we can't reliably |
| 124 | (while (re-search-forward (car pair) nil t) | 116 | ;; remove them either (we may leave some of ours, and we |
| 125 | (if (and (setq file (match-string (cdr pair))) | 117 | ;; may remove other packages's display properties). |
| 126 | (setq file (iimage-locate-file file | 118 | (if arg |
| 127 | (cons default-directory | 119 | (add-text-properties (match-beginning 0) (match-end 0) |
| 128 | iimage-mode-image-search-path)))) | 120 | (list 'display (create-image file))) |
| 129 | (if ing | 121 | (remove-text-properties (match-beginning 0) (match-end 0) |
| 130 | (add-text-properties (match-beginning 0) (match-end 0) | 122 | '(display)))))))))) |
| 131 | (list 'display (create-image file))) | ||
| 132 | (remove-text-properties (match-beginning 0) (match-end 0) | ||
| 133 | '(display))))))) | ||
| 134 | (set-buffer-modified-p modp))) | ||
| 135 | 123 | ||
| 136 | ;;;###autoload | 124 | ;;;###autoload |
| 137 | (define-minor-mode iimage-mode | 125 | (define-minor-mode iimage-mode |
| 138 | "Toggle inline image minor mode." | 126 | "Toggle inline image minor mode." |
| 139 | :group 'iimage :lighter " iImg" :keymap iimage-mode-map | 127 | :group 'iimage :lighter " iImg" :keymap iimage-mode-map |
| 140 | (run-hooks 'iimage-mode-hook) | ||
| 141 | (iimage-mode-buffer iimage-mode)) | 128 | (iimage-mode-buffer iimage-mode)) |
| 142 | 129 | ||
| 143 | (provide 'iimage) | 130 | (provide 'iimage) |
diff --git a/lisp/info.el b/lisp/info.el index f526ff22a0e..e76a8da146e 100644 --- a/lisp/info.el +++ b/lisp/info.el | |||
| @@ -266,6 +266,8 @@ with wrapping around the current Info node." | |||
| 266 | :group 'info) | 266 | :group 'info) |
| 267 | 267 | ||
| 268 | (defvar Info-isearch-initial-node nil) | 268 | (defvar Info-isearch-initial-node nil) |
| 269 | (defvar Info-isearch-initial-history nil) | ||
| 270 | (defvar Info-isearch-initial-history-list nil) | ||
| 269 | 271 | ||
| 270 | (defcustom Info-mode-hook | 272 | (defcustom Info-mode-hook |
| 271 | ;; Try to obey obsolete Info-fontify settings. | 273 | ;; Try to obey obsolete Info-fontify settings. |
| @@ -1914,7 +1916,27 @@ If DIRECTION is `backward', search in the reverse direction." | |||
| 1914 | (setq Info-isearch-initial-node | 1916 | (setq Info-isearch-initial-node |
| 1915 | ;; Don't stop at initial node for nonincremental search. | 1917 | ;; Don't stop at initial node for nonincremental search. |
| 1916 | ;; Otherwise this variable is set after first search failure. | 1918 | ;; Otherwise this variable is set after first search failure. |
| 1917 | (and isearch-nonincremental Info-current-node))) | 1919 | (and isearch-nonincremental Info-current-node)) |
| 1920 | (setq Info-isearch-initial-history Info-history | ||
| 1921 | Info-isearch-initial-history-list Info-history-list) | ||
| 1922 | (add-hook 'isearch-mode-end-hook 'Info-isearch-end nil t)) | ||
| 1923 | |||
| 1924 | (defun Info-isearch-end () | ||
| 1925 | ;; Remove intermediate nodes (visited while searching) | ||
| 1926 | ;; from the history. Add only the last node (where Isearch ended). | ||
| 1927 | (if (> (length Info-history) | ||
| 1928 | (length Info-isearch-initial-history)) | ||
| 1929 | (setq Info-history | ||
| 1930 | (nthcdr (- (length Info-history) | ||
| 1931 | (length Info-isearch-initial-history) | ||
| 1932 | 1) | ||
| 1933 | Info-history))) | ||
| 1934 | (if (> (length Info-history-list) | ||
| 1935 | (length Info-isearch-initial-history-list)) | ||
| 1936 | (setq Info-history-list | ||
| 1937 | (cons (car Info-history-list) | ||
| 1938 | Info-isearch-initial-history-list))) | ||
| 1939 | (remove-hook 'isearch-mode-end-hook 'Info-isearch-end t)) | ||
| 1918 | 1940 | ||
| 1919 | (defun Info-isearch-filter (beg-found found) | 1941 | (defun Info-isearch-filter (beg-found found) |
| 1920 | "Test whether the current search hit is a visible useful text. | 1942 | "Test whether the current search hit is a visible useful text. |
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index a51bd2872c3..5d08fd73e69 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 | |||
| @@ -195,11 +195,11 @@ | |||
| 195 | 195 | ||
| 196 | 2005-05-28 Bill Wohler <wohler@newt.com> | 196 | 2005-05-28 Bill Wohler <wohler@newt.com> |
| 197 | 197 | ||
| 198 | Released MH-E version 7.84. | 198 | Released MH-E version 7.84. |
| 199 | 199 | ||
| 200 | * MH-E-NEWS, README: Updated for release 7.84. | 200 | * MH-E-NEWS, README: Updated for release 7.84. |
| 201 | 201 | ||
| 202 | * mh-e.el (Version, mh-version): Updated for release 7.84. | 202 | * mh-e.el (Version, mh-version): Updated for release 7.84. |
| 203 | 203 | ||
| 204 | 2005-05-28 Bill Wohler <wohler@newt.com> | 204 | 2005-05-28 Bill Wohler <wohler@newt.com> |
| 205 | 205 | ||
| @@ -4396,7 +4396,6 @@ | |||
| 4396 | mh-xemacs-toolbar.el: Removed RCS keywords per Emacs conventions | 4396 | mh-xemacs-toolbar.el: Removed RCS keywords per Emacs conventions |
| 4397 | (closes SF #680731). | 4397 | (closes SF #680731). |
| 4398 | 4398 | ||
| 4399 | |||
| 4400 | 2003-03-26 Satyaki Das <satyaki@theforce.stanford.edu> | 4399 | 2003-03-26 Satyaki Das <satyaki@theforce.stanford.edu> |
| 4401 | 4400 | ||
| 4402 | * mh-index.el: Fix commentary to mention that mairix is supported | 4401 | * mh-index.el: Fix commentary to mention that mairix is supported |
| @@ -7556,10 +7555,10 @@ | |||
| 7556 | the MH pick command to give the user more information when | 7555 | the MH pick command to give the user more information when |
| 7557 | choosing between mh-search-folder and mh-index-folder. | 7556 | choosing between mh-search-folder and mh-index-folder. |
| 7558 | 7557 | ||
| 7559 | * mh-index.el (mh-index-search): Edited the docstring. Direct the | 7558 | * mh-index.el (mh-index-search): Edited the docstring. Direct the |
| 7560 | user to mh-index-program if necessary. | 7559 | user to mh-index-program if necessary. |
| 7561 | (mh-index-program): Edited this docstring too. Viewing the help | 7560 | (mh-index-program): Edited this docstring too. Viewing the help |
| 7562 | in a *Help* buffer really exposes grammatical flaws. | 7561 | in a *Help* buffer really exposes grammatical flaws. |
| 7563 | 7562 | ||
| 7564 | 2002-11-05 Peter S Galbraith <psg@debian.org> | 7563 | 2002-11-05 Peter S Galbraith <psg@debian.org> |
| 7565 | 7564 | ||
| @@ -7839,7 +7838,6 @@ | |||
| 7839 | (.PHONY): Added emacs, xemacs, autoloads, custom-loads. Broke up | 7838 | (.PHONY): Added emacs, xemacs, autoloads, custom-loads. Broke up |
| 7840 | target and moved pieces into their own sections. | 7839 | target and moved pieces into their own sections. |
| 7841 | 7840 | ||
| 7842 | |||
| 7843 | 2002-10-30 Peter S Galbraith <psg@debian.org> | 7841 | 2002-10-30 Peter S Galbraith <psg@debian.org> |
| 7844 | 7842 | ||
| 7845 | * mh-utils.el (mh-show-font-lock-keywords): Wrap an | 7843 | * mh-utils.el (mh-show-font-lock-keywords): Wrap an |
| @@ -8494,11 +8492,10 @@ | |||
| 8494 | 2002-10-22 Mark D. Baushke <mdb@gnu.org> | 8492 | 2002-10-22 Mark D. Baushke <mdb@gnu.org> |
| 8495 | 8493 | ||
| 8496 | * mh-mime.el (mh-graphical-smileys-flag): Renamed from | 8494 | * mh-mime.el (mh-graphical-smileys-flag): Renamed from |
| 8497 | mh-graphical-smileys-p. | 8495 | mh-graphical-smileys-p. |
| 8498 | (mh-display-smileys): Use it. | 8496 | (mh-display-smileys): Use it. |
| 8499 | (mh-graphical-emphasis-flag): Renamed from | 8497 | (mh-graphical-emphasis-flag): Renamed from mh-graphical-emphasis-p. |
| 8500 | mh-graphical-emphasis-p. | 8498 | (mh-display-emphasis): Use it. This addresses part of SF #627015. |
| 8501 | (mh-display-emphasis): Use it. This addresses part of SF #627015. | ||
| 8502 | 8499 | ||
| 8503 | 2002-10-22 Satyaki Das <satyaki@theforce.stanford.edu> | 8500 | 2002-10-22 Satyaki Das <satyaki@theforce.stanford.edu> |
| 8504 | 8501 | ||
| @@ -9301,7 +9298,7 @@ | |||
| 9301 | * mh-mime.el (mh-store-mime-parts-directory): New defcustom. | 9298 | * mh-mime.el (mh-store-mime-parts-directory): New defcustom. |
| 9302 | Default directory to use for mh-store-mime-parts. | 9299 | Default directory to use for mh-store-mime-parts. |
| 9303 | (mh-store-mime-parts): New Command. Store the MIME parts of the | 9300 | (mh-store-mime-parts): New Command. Store the MIME parts of the |
| 9304 | current message. | 9301 | current message. |
| 9305 | (mh-store-mime-parts-directory-default): New internal working | 9302 | (mh-store-mime-parts-directory-default): New internal working |
| 9306 | variable. Default to use for mh-store-mime-parts-directory, set | 9303 | variable. Default to use for mh-store-mime-parts-directory, set |
| 9307 | from last use. | 9304 | from last use. |
| @@ -9309,7 +9306,6 @@ | |||
| 9309 | * mh-e.el (mh-folder-seq-tool-bar-map): Add mh-store-mime-parts to | 9306 | * mh-e.el (mh-folder-seq-tool-bar-map): Add mh-store-mime-parts to |
| 9310 | toolbar. | 9307 | toolbar. |
| 9311 | 9308 | ||
| 9312 | |||
| 9313 | 2002-08-22 Satyaki Das <satyaki@theforce.stanford.edu> | 9309 | 2002-08-22 Satyaki Das <satyaki@theforce.stanford.edu> |
| 9314 | 9310 | ||
| 9315 | * mh-seq.el (mh-thread-generate-scan-lines): In threaded view, | 9311 | * mh-seq.el (mh-thread-generate-scan-lines): In threaded view, |
| @@ -10487,7 +10483,6 @@ | |||
| 10487 | (clean): New target that blows away MH-E-OBJ. | 10483 | (clean): New target that blows away MH-E-OBJ. |
| 10488 | (dist): Added $(MH-E-OBJ) to tarball. | 10484 | (dist): Added $(MH-E-OBJ) to tarball. |
| 10489 | 10485 | ||
| 10490 | |||
| 10491 | Attempt to quiet compilation errors to a dull roar. | 10486 | Attempt to quiet compilation errors to a dull roar. |
| 10492 | 10487 | ||
| 10493 | * mh-e.el: Require easymenu, added autoload of info. | 10488 | * mh-e.el: Require easymenu, added autoload of info. |
| @@ -10506,7 +10501,6 @@ | |||
| 10506 | * mh-comp.el: Require mh-e and easymenu, moved autoloads to top of | 10501 | * mh-comp.el: Require mh-e and easymenu, moved autoloads to top of |
| 10507 | file. | 10502 | file. |
| 10508 | 10503 | ||
| 10509 | |||
| 10510 | * Makefile: (EMACS): New constant to hold emacs calling sequence. | 10504 | * Makefile: (EMACS): New constant to hold emacs calling sequence. |
| 10511 | (install): Renamed to install-emacs. | 10505 | (install): Renamed to install-emacs. |
| 10512 | (compile): New target to compile all files. | 10506 | (compile): New target to compile all files. |
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 869ce937b66..b1ecae3801d 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el | |||
| @@ -76,6 +76,9 @@ | |||
| 76 | ;; the provided string (as is the case in filecache.el), in which | 76 | ;; the provided string (as is the case in filecache.el), in which |
| 77 | ;; case partial-completion (for example) doesn't make any sense | 77 | ;; case partial-completion (for example) doesn't make any sense |
| 78 | ;; and neither does the completions-first-difference highlight. | 78 | ;; and neither does the completions-first-difference highlight. |
| 79 | ;; - indicate how to display the completions in *Completions* (turn | ||
| 80 | ;; \n into something else, add special boundaries between | ||
| 81 | ;; completions). E.g. when completing from the kill-ring. | ||
| 79 | 82 | ||
| 80 | ;; - make partial-completion-mode obsolete: | 83 | ;; - make partial-completion-mode obsolete: |
| 81 | ;; - (?) <foo.h> style completion for file names. | 84 | ;; - (?) <foo.h> style completion for file names. |
| @@ -489,6 +492,18 @@ Moves point to the end of the new text." | |||
| 489 | (insert newtext) | 492 | (insert newtext) |
| 490 | (delete-region (point) (+ (point) (- end beg)))) | 493 | (delete-region (point) (+ (point) (- end beg)))) |
| 491 | 494 | ||
| 495 | (defcustom completion-cycle-threshold nil | ||
| 496 | "Number of completion candidates below which cycling is used. | ||
| 497 | Depending on this setting `minibuffer-complete' may use cycling, | ||
| 498 | like `minibuffer-force-complete'. | ||
| 499 | If nil, cycling is never used. | ||
| 500 | If t, cycling is always used. | ||
| 501 | If an integer, cycling is used as soon as there are fewer completion | ||
| 502 | candidates than this number." | ||
| 503 | :type '(choice (const :tag "No cycling" nil) | ||
| 504 | (const :tag "Always cycle" t) | ||
| 505 | (integer :tag "Threshold"))) | ||
| 506 | |||
| 492 | (defun completion--do-completion (&optional try-completion-function) | 507 | (defun completion--do-completion (&optional try-completion-function) |
| 493 | "Do the completion and return a summary of what happened. | 508 | "Do the completion and return a summary of what happened. |
| 494 | M = completion was performed, the text was Modified. | 509 | M = completion was performed, the text was Modified. |
| @@ -548,14 +563,43 @@ E = after completion we now have an Exact match. | |||
| 548 | ;; It did find a match. Do we match some possibility exactly now? | 563 | ;; It did find a match. Do we match some possibility exactly now? |
| 549 | (let ((exact (test-completion completion | 564 | (let ((exact (test-completion completion |
| 550 | minibuffer-completion-table | 565 | minibuffer-completion-table |
| 551 | minibuffer-completion-predicate))) | 566 | minibuffer-completion-predicate)) |
| 552 | (if completed | 567 | (comps |
| 568 | ;; Check to see if we want to do cycling. We do it | ||
| 569 | ;; here, after having performed the normal completion, | ||
| 570 | ;; so as to take advantage of the difference between | ||
| 571 | ;; try-completion and all-completions, for things | ||
| 572 | ;; like completion-ignored-extensions. | ||
| 573 | (when (and completion-cycle-threshold | ||
| 574 | ;; Check that the completion didn't make | ||
| 575 | ;; us jump to a different boundary. | ||
| 576 | (or (not completed) | ||
| 577 | (< (car (completion-boundaries | ||
| 578 | (substring completion 0 comp-pos) | ||
| 579 | minibuffer-completion-table | ||
| 580 | minibuffer-completion-predicate | ||
| 581 | "")) | ||
| 582 | comp-pos))) | ||
| 583 | (completion-all-sorted-completions)))) | ||
| 584 | (setq completion-all-sorted-completions nil) | ||
| 585 | (cond | ||
| 586 | ((and (not (ignore-errors | ||
| 587 | ;; This signal an (intended) error if comps is too | ||
| 588 | ;; short or if completion-cycle-threshold is t. | ||
| 589 | (consp (nthcdr completion-cycle-threshold comps)))) | ||
| 590 | ;; More than 1, so there's something to cycle. | ||
| 591 | (consp (cdr comps))) | ||
| 592 | ;; Fewer than completion-cycle-threshold remaining | ||
| 593 | ;; completions: let's cycle. | ||
| 594 | (setq completed t exact t) | ||
| 595 | (setq completion-all-sorted-completions comps) | ||
| 596 | (minibuffer-force-complete)) | ||
| 597 | (completed | ||
| 553 | ;; We could also decide to refresh the completions, | 598 | ;; We could also decide to refresh the completions, |
| 554 | ;; if they're displayed (and assuming there are | 599 | ;; if they're displayed (and assuming there are |
| 555 | ;; completions left). | 600 | ;; completions left). |
| 556 | (minibuffer-hide-completions) | 601 | (minibuffer-hide-completions)) |
| 557 | ;; Show the completion table, if requested. | 602 | ;; Show the completion table, if requested. |
| 558 | (cond | ||
| 559 | ((not exact) | 603 | ((not exact) |
| 560 | (if (case completion-auto-help | 604 | (if (case completion-auto-help |
| 561 | (lazy (eq this-command last-command)) | 605 | (lazy (eq this-command last-command)) |
| @@ -566,7 +610,7 @@ E = after completion we now have an Exact match. | |||
| 566 | ;; means we've already given a "Next char not unique" message | 610 | ;; means we've already given a "Next char not unique" message |
| 567 | ;; and the user's hit TAB again, so now we give him help. | 611 | ;; and the user's hit TAB again, so now we give him help. |
| 568 | ((eq this-command last-command) | 612 | ((eq this-command last-command) |
| 569 | (if completion-auto-help (minibuffer-completion-help))))) | 613 | (if completion-auto-help (minibuffer-completion-help)))) |
| 570 | 614 | ||
| 571 | (minibuffer--bitset completed t exact)))))))) | 615 | (minibuffer--bitset completed t exact)))))))) |
| 572 | 616 | ||
| @@ -580,21 +624,26 @@ scroll the window of possible completions." | |||
| 580 | ;; If the previous command was not this, | 624 | ;; If the previous command was not this, |
| 581 | ;; mark the completion buffer obsolete. | 625 | ;; mark the completion buffer obsolete. |
| 582 | (unless (eq this-command last-command) | 626 | (unless (eq this-command last-command) |
| 627 | (setq completion-all-sorted-completions nil) | ||
| 583 | (setq minibuffer-scroll-window nil)) | 628 | (setq minibuffer-scroll-window nil)) |
| 584 | 629 | ||
| 585 | (let ((window minibuffer-scroll-window)) | 630 | (cond |
| 586 | ;; If there's a fresh completion window with a live buffer, | 631 | ;; If there's a fresh completion window with a live buffer, |
| 587 | ;; and this command is repeated, scroll that window. | 632 | ;; and this command is repeated, scroll that window. |
| 588 | (if (window-live-p window) | 633 | ((window-live-p minibuffer-scroll-window) |
| 634 | (let ((window minibuffer-scroll-window)) | ||
| 589 | (with-current-buffer (window-buffer window) | 635 | (with-current-buffer (window-buffer window) |
| 590 | (if (pos-visible-in-window-p (point-max) window) | 636 | (if (pos-visible-in-window-p (point-max) window) |
| 591 | ;; If end is in view, scroll up to the beginning. | 637 | ;; If end is in view, scroll up to the beginning. |
| 592 | (set-window-start window (point-min) nil) | 638 | (set-window-start window (point-min) nil) |
| 593 | ;; Else scroll down one screen. | 639 | ;; Else scroll down one screen. |
| 594 | (scroll-other-window)) | 640 | (scroll-other-window)) |
| 595 | nil) | 641 | nil))) |
| 596 | 642 | ;; If we're cycling, keep on cycling. | |
| 597 | (case (completion--do-completion) | 643 | (completion-all-sorted-completions |
| 644 | (minibuffer-force-complete) | ||
| 645 | t) | ||
| 646 | (t (case (completion--do-completion) | ||
| 598 | (#b000 nil) | 647 | (#b000 nil) |
| 599 | (#b001 (minibuffer-message "Sole completion") | 648 | (#b001 (minibuffer-message "Sole completion") |
| 600 | t) | 649 | t) |
| @@ -1835,8 +1884,8 @@ or a symbol chosen among `any', `star', `point', `prefix'." | |||
| 1835 | (lambda (x) | 1884 | (lambda (x) |
| 1836 | (cond | 1885 | (cond |
| 1837 | ((stringp x) (regexp-quote x)) | 1886 | ((stringp x) (regexp-quote x)) |
| 1838 | ((if (consp group) (memq x group) group) | 1887 | ((if (consp group) (memq x group) group) "\\(.*?\\)") |
| 1839 | "\\(.*?\\)" ".*?"))) | 1888 | (t ".*?"))) |
| 1840 | pattern | 1889 | pattern |
| 1841 | "")))) | 1890 | "")))) |
| 1842 | ;; Avoid pathological backtracking. | 1891 | ;; Avoid pathological backtracking. |
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 434c2bad20d..00b282b83e3 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el | |||
| @@ -334,41 +334,41 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server. | |||
| 334 | PRESERVE-UID-GID is completely ignored." | 334 | PRESERVE-UID-GID is completely ignored." |
| 335 | (setq filename (expand-file-name filename) | 335 | (setq filename (expand-file-name filename) |
| 336 | newname (expand-file-name newname)) | 336 | newname (expand-file-name newname)) |
| 337 | (with-progress-reporter | ||
| 338 | (tramp-dissect-file-name (if (file-remote-p filename) filename newname)) | ||
| 339 | 0 (format "Copying %s to %s" filename newname) | ||
| 340 | |||
| 341 | (let ((tmpfile (file-local-copy filename))) | ||
| 342 | |||
| 343 | (if tmpfile | ||
| 344 | ;; Remote filename. | ||
| 345 | (condition-case err | ||
| 346 | (rename-file tmpfile newname ok-if-already-exists) | ||
| 347 | ((error quit) | ||
| 348 | (tramp-compat-delete-file tmpfile 'force) | ||
| 349 | (signal (car err) (cdr err)))) | ||
| 350 | |||
| 351 | ;; Remote newname. | ||
| 352 | (when (file-directory-p newname) | ||
| 353 | (setq newname | ||
| 354 | (expand-file-name (file-name-nondirectory filename) newname))) | ||
| 355 | |||
| 356 | (with-parsed-tramp-file-name newname nil | ||
| 357 | (when (and (not ok-if-already-exists) | ||
| 358 | (file-exists-p newname)) | ||
| 359 | (tramp-error v 'file-already-exists newname)) | ||
| 337 | 360 | ||
| 338 | (let ((tmpfile (file-local-copy filename))) | 361 | ;; We must also flush the cache of the directory, because |
| 339 | 362 | ;; `file-attributes' reads the values from there. | |
| 340 | (if tmpfile | 363 | (tramp-flush-file-property v (file-name-directory localname)) |
| 341 | ;; Remote filename. | 364 | (tramp-flush-file-property v localname) |
| 342 | (condition-case err | 365 | (unless (tramp-smb-get-share v) |
| 343 | (rename-file tmpfile newname ok-if-already-exists) | 366 | (tramp-error |
| 344 | ((error quit) | 367 | v 'file-error "Target `%s' must contain a share name" newname)) |
| 345 | (tramp-compat-delete-file tmpfile 'force) | 368 | (unless (tramp-smb-send-command |
| 346 | (signal (car err) (cdr err)))) | 369 | v (format "put \"%s\" \"%s\"" |
| 347 | 370 | filename (tramp-smb-get-localname v))) | |
| 348 | ;; Remote newname. | 371 | (tramp-error v 'file-error "Cannot copy `%s'" filename)))))) |
| 349 | (when (file-directory-p newname) | ||
| 350 | (setq newname (expand-file-name | ||
| 351 | (file-name-nondirectory filename) newname))) | ||
| 352 | |||
| 353 | (with-parsed-tramp-file-name newname nil | ||
| 354 | (when (and (not ok-if-already-exists) | ||
| 355 | (file-exists-p newname)) | ||
| 356 | (tramp-error v 'file-already-exists newname)) | ||
| 357 | |||
| 358 | ;; We must also flush the cache of the directory, because | ||
| 359 | ;; `file-attributes' reads the values from there. | ||
| 360 | (tramp-flush-file-property v (file-name-directory localname)) | ||
| 361 | (tramp-flush-file-property v localname) | ||
| 362 | (unless (tramp-smb-get-share v) | ||
| 363 | (tramp-error | ||
| 364 | v 'file-error "Target `%s' must contain a share name" newname)) | ||
| 365 | (tramp-message v 0 "Copying file %s to file %s..." filename newname) | ||
| 366 | (if (tramp-smb-send-command | ||
| 367 | v (format "put \"%s\" \"%s\"" | ||
| 368 | filename (tramp-smb-get-localname v))) | ||
| 369 | (tramp-message | ||
| 370 | v 0 "Copying file %s to file %s...done" filename newname) | ||
| 371 | (tramp-error v 'file-error "Cannot copy `%s'" filename))))) | ||
| 372 | 372 | ||
| 373 | ;; KEEP-DATE handling. | 373 | ;; KEEP-DATE handling. |
| 374 | (when keep-date (set-file-times newname (nth 5 (file-attributes filename))))) | 374 | (when keep-date (set-file-times newname (nth 5 (file-attributes filename))))) |
| @@ -605,15 +605,15 @@ PRESERVE-UID-GID is completely ignored." | |||
| 605 | v 'file-error | 605 | v 'file-error |
| 606 | "Cannot make local copy of non-existing file `%s'" filename)) | 606 | "Cannot make local copy of non-existing file `%s'" filename)) |
| 607 | (let ((tmpfile (tramp-compat-make-temp-file filename))) | 607 | (let ((tmpfile (tramp-compat-make-temp-file filename))) |
| 608 | (tramp-message v 4 "Fetching %s to tmp file %s..." filename tmpfile) | 608 | (with-progress-reporter |
| 609 | (if (tramp-smb-send-command | 609 | v 3 (format "Fetching %s to tmp file %s" filename tmpfile) |
| 610 | v (format "get \"%s\" \"%s\"" (tramp-smb-get-localname v) tmpfile)) | 610 | (unless (tramp-smb-send-command |
| 611 | (tramp-message | 611 | v (format "get \"%s\" \"%s\"" |
| 612 | v 4 "Fetching %s to tmp file %s...done" filename tmpfile) | 612 | (tramp-smb-get-localname v) tmpfile)) |
| 613 | ;; Oops, an error. We shall cleanup. | 613 | ;; Oops, an error. We shall cleanup. |
| 614 | (tramp-compat-delete-file tmpfile 'force) | 614 | (tramp-compat-delete-file tmpfile 'force) |
| 615 | (tramp-error | 615 | (tramp-error |
| 616 | v 'file-error "Cannot make local copy of file `%s'" filename)) | 616 | v 'file-error "Cannot make local copy of file `%s'" filename))) |
| 617 | tmpfile))) | 617 | tmpfile))) |
| 618 | 618 | ||
| 619 | ;; This function should return "foo/" for directories and "bar" for | 619 | ;; This function should return "foo/" for directories and "bar" for |
| @@ -850,38 +850,39 @@ target of the symlink differ." | |||
| 850 | "Like `rename-file' for Tramp files." | 850 | "Like `rename-file' for Tramp files." |
| 851 | (setq filename (expand-file-name filename) | 851 | (setq filename (expand-file-name filename) |
| 852 | newname (expand-file-name newname)) | 852 | newname (expand-file-name newname)) |
| 853 | (with-progress-reporter | ||
| 854 | (tramp-dissect-file-name (if (file-remote-p filename) filename newname)) | ||
| 855 | 0 (format "Renaming %s to %s" filename newname) | ||
| 856 | |||
| 857 | (let ((tmpfile (file-local-copy filename))) | ||
| 858 | |||
| 859 | (if tmpfile | ||
| 860 | ;; Remote filename. | ||
| 861 | (condition-case err | ||
| 862 | (rename-file tmpfile newname ok-if-already-exists) | ||
| 863 | ((error quit) | ||
| 864 | (tramp-compat-delete-file tmpfile 'force) | ||
| 865 | (signal (car err) (cdr err)))) | ||
| 866 | |||
| 867 | ;; Remote newname. | ||
| 868 | (when (file-directory-p newname) | ||
| 869 | (setq newname (expand-file-name | ||
| 870 | (file-name-nondirectory filename) newname))) | ||
| 871 | |||
| 872 | (with-parsed-tramp-file-name newname nil | ||
| 873 | (when (and (not ok-if-already-exists) | ||
| 874 | (file-exists-p newname)) | ||
| 875 | (tramp-error v 'file-already-exists newname)) | ||
| 876 | ;; We must also flush the cache of the directory, because | ||
| 877 | ;; `file-attributes' reads the values from there. | ||
| 878 | (tramp-flush-file-property v (file-name-directory localname)) | ||
| 879 | (tramp-flush-file-property v localname) | ||
| 880 | (unless (tramp-smb-send-command | ||
| 881 | v (format "put %s \"%s\"" | ||
| 882 | filename (tramp-smb-get-localname v))) | ||
| 883 | (tramp-error v 'file-error "Cannot rename `%s'" filename))))) | ||
| 853 | 884 | ||
| 854 | (let ((tmpfile (file-local-copy filename))) | 885 | (tramp-compat-delete-file filename 'force))) |
| 855 | |||
| 856 | (if tmpfile | ||
| 857 | ;; Remote filename. | ||
| 858 | (condition-case err | ||
| 859 | (rename-file tmpfile newname ok-if-already-exists) | ||
| 860 | ((error quit) | ||
| 861 | (tramp-compat-delete-file tmpfile 'force) | ||
| 862 | (signal (car err) (cdr err)))) | ||
| 863 | |||
| 864 | ;; Remote newname. | ||
| 865 | (when (file-directory-p newname) | ||
| 866 | (setq newname (expand-file-name | ||
| 867 | (file-name-nondirectory filename) newname))) | ||
| 868 | |||
| 869 | (with-parsed-tramp-file-name newname nil | ||
| 870 | (when (and (not ok-if-already-exists) | ||
| 871 | (file-exists-p newname)) | ||
| 872 | (tramp-error v 'file-already-exists newname)) | ||
| 873 | ;; We must also flush the cache of the directory, because | ||
| 874 | ;; `file-attributes' reads the values from there. | ||
| 875 | (tramp-flush-file-property v (file-name-directory localname)) | ||
| 876 | (tramp-flush-file-property v localname) | ||
| 877 | (tramp-message v 0 "Copying file %s to file %s..." filename newname) | ||
| 878 | (if (tramp-smb-send-command | ||
| 879 | v (format "put %s \"%s\"" filename (tramp-smb-get-localname v))) | ||
| 880 | (tramp-message | ||
| 881 | v 0 "Copying file %s to file %s...done" filename newname) | ||
| 882 | (tramp-error v 'file-error "Cannot rename `%s'" filename))))) | ||
| 883 | |||
| 884 | (tramp-compat-delete-file filename 'force)) | ||
| 885 | 886 | ||
| 886 | (defun tramp-smb-handle-set-file-modes (filename mode) | 887 | (defun tramp-smb-handle-set-file-modes (filename mode) |
| 887 | "Like `set-file-modes' for Tramp files." | 888 | "Like `set-file-modes' for Tramp files." |
| @@ -938,14 +939,14 @@ errors for shares like \"C$/\", which are common in Microsoft Windows." | |||
| 938 | (list start end tmpfile append 'no-message lockname confirm) | 939 | (list start end tmpfile append 'no-message lockname confirm) |
| 939 | (list start end tmpfile append 'no-message lockname))) | 940 | (list start end tmpfile append 'no-message lockname))) |
| 940 | 941 | ||
| 941 | (tramp-message v 5 "Writing tmp file %s to file %s..." tmpfile filename) | 942 | (with-progress-reporter |
| 942 | (unwind-protect | 943 | v 3 (format "Moving tmp file %s to %s" tmpfile filename) |
| 943 | (if (tramp-smb-send-command | 944 | (unwind-protect |
| 944 | v (format "put %s \"%s\"" tmpfile (tramp-smb-get-localname v))) | 945 | (unless (tramp-smb-send-command |
| 945 | (tramp-message | 946 | v (format "put %s \"%s\"" |
| 946 | v 5 "Writing tmp file %s to file %s...done" tmpfile filename) | 947 | tmpfile (tramp-smb-get-localname v))) |
| 947 | (tramp-error v 'file-error "Cannot write `%s'" filename)) | 948 | (tramp-error v 'file-error "Cannot write `%s'" filename)) |
| 948 | (tramp-compat-delete-file tmpfile 'force)) | 949 | (tramp-compat-delete-file tmpfile 'force))) |
| 949 | 950 | ||
| 950 | (unless (equal curbuf (current-buffer)) | 951 | (unless (equal curbuf (current-buffer)) |
| 951 | (tramp-error | 952 | (tramp-error |
| @@ -1302,60 +1303,57 @@ connection if a previous connection has died for some reason." | |||
| 1302 | (setq args (append args (list "-s" tramp-smb-conf)))) | 1303 | (setq args (append args (list "-s" tramp-smb-conf)))) |
| 1303 | 1304 | ||
| 1304 | ;; OK, let's go. | 1305 | ;; OK, let's go. |
| 1305 | (tramp-message | 1306 | (with-progress-reporter |
| 1306 | vec 3 "Opening connection for //%s%s/%s..." | 1307 | vec 3 |
| 1307 | (if (not (zerop (length user))) (concat user "@") "") | 1308 | (format "Opening connection for //%s%s/%s" |
| 1308 | host (or share "")) | 1309 | (if (not (zerop (length user))) (concat user "@") "") |
| 1309 | 1310 | host (or share "")) | |
| 1310 | (let* ((coding-system-for-read nil) | 1311 | |
| 1311 | (process-connection-type tramp-process-connection-type) | 1312 | (let* ((coding-system-for-read nil) |
| 1312 | (p (let ((default-directory | 1313 | (process-connection-type tramp-process-connection-type) |
| 1313 | (tramp-compat-temporary-file-directory))) | 1314 | (p (let ((default-directory |
| 1314 | (apply #'start-process | 1315 | (tramp-compat-temporary-file-directory))) |
| 1315 | (tramp-buffer-name vec) (tramp-get-buffer vec) | 1316 | (apply #'start-process |
| 1316 | tramp-smb-program args)))) | 1317 | (tramp-buffer-name vec) (tramp-get-buffer vec) |
| 1317 | 1318 | tramp-smb-program args)))) | |
| 1318 | (tramp-message | 1319 | |
| 1319 | vec 6 "%s" (mapconcat 'identity (process-command p) " ")) | 1320 | (tramp-message |
| 1320 | (tramp-set-process-query-on-exit-flag p nil) | 1321 | vec 6 "%s" (mapconcat 'identity (process-command p) " ")) |
| 1321 | 1322 | (tramp-set-process-query-on-exit-flag p nil) | |
| 1322 | ;; Set variables for computing the prompt for reading password. | 1323 | |
| 1323 | (setq tramp-current-method tramp-smb-method | 1324 | ;; Set variables for computing the prompt for reading password. |
| 1324 | tramp-current-user user | 1325 | (setq tramp-current-method tramp-smb-method |
| 1325 | tramp-current-host host) | 1326 | tramp-current-user user |
| 1326 | 1327 | tramp-current-host host) | |
| 1327 | ;; Play login scenario. | 1328 | |
| 1328 | (tramp-process-actions | 1329 | ;; Play login scenario. |
| 1329 | p vec | 1330 | (tramp-process-actions |
| 1330 | (if share | 1331 | p vec |
| 1331 | tramp-smb-actions-with-share | 1332 | (if share |
| 1332 | tramp-smb-actions-without-share)) | 1333 | tramp-smb-actions-with-share |
| 1333 | 1334 | tramp-smb-actions-without-share)) | |
| 1334 | ;; Check server version. | 1335 | |
| 1335 | (with-current-buffer (tramp-get-connection-buffer vec) | 1336 | ;; Check server version. |
| 1336 | (goto-char (point-min)) | 1337 | (with-current-buffer (tramp-get-connection-buffer vec) |
| 1337 | (search-forward-regexp | 1338 | (goto-char (point-min)) |
| 1338 | "Domain=\\[[^]]*\\] OS=\\[[^]]*\\] Server=\\[[^]]*\\]" nil t) | 1339 | (search-forward-regexp |
| 1339 | (let ((smbserver-version (match-string 0))) | 1340 | "Domain=\\[[^]]*\\] OS=\\[[^]]*\\] Server=\\[[^]]*\\]" nil t) |
| 1340 | (unless | 1341 | (let ((smbserver-version (match-string 0))) |
| 1341 | (string-equal | 1342 | (unless |
| 1342 | smbserver-version | 1343 | (string-equal |
| 1343 | (tramp-get-connection-property | 1344 | smbserver-version |
| 1344 | vec "smbserver-version" smbserver-version)) | 1345 | (tramp-get-connection-property |
| 1345 | (tramp-flush-directory-property vec "") | 1346 | vec "smbserver-version" smbserver-version)) |
| 1346 | (tramp-flush-connection-property vec)) | 1347 | (tramp-flush-directory-property vec "") |
| 1347 | (tramp-set-connection-property | 1348 | (tramp-flush-connection-property vec)) |
| 1348 | vec "smbserver-version" smbserver-version))) | 1349 | (tramp-set-connection-property |
| 1349 | 1350 | vec "smbserver-version" smbserver-version))) | |
| 1350 | ;; Set chunksize. Otherwise, `tramp-send-string' might | 1351 | |
| 1351 | ;; try it itself. | 1352 | ;; Set chunksize. Otherwise, `tramp-send-string' might |
| 1352 | (tramp-set-connection-property p "smb-share" share) | 1353 | ;; try it itself. |
| 1353 | (tramp-set-connection-property p "chunksize" tramp-chunksize) | 1354 | (tramp-set-connection-property p "smb-share" share) |
| 1354 | 1355 | (tramp-set-connection-property | |
| 1355 | (tramp-message | 1356 | p "chunksize" tramp-chunksize)))))))) |
| 1356 | vec 3 "Opening connection for //%s%s/%s...done" | ||
| 1357 | (if (not (zerop (length user))) (concat user "@") "") | ||
| 1358 | host (or share "")))))))) | ||
| 1359 | 1357 | ||
| 1360 | ;; We don't use timeouts. If needed, the caller shall wrap around. | 1358 | ;; We don't use timeouts. If needed, the caller shall wrap around. |
| 1361 | (defun tramp-smb-wait-for-output (vec) | 1359 | (defun tramp-smb-wait-for-output (vec) |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 3a291cfb695..c5addae8e5d 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -2271,14 +2271,18 @@ FILE must be a local file name on a connection identified via VEC." | |||
| 2271 | (tramp-message ,vec ,level "%s..." ,message) | 2271 | (tramp-message ,vec ,level "%s..." ,message) |
| 2272 | ;; We start a pulsing progress reporter after 3 seconds. Feature | 2272 | ;; We start a pulsing progress reporter after 3 seconds. Feature |
| 2273 | ;; introduced in Emacs 24.1. | 2273 | ;; introduced in Emacs 24.1. |
| 2274 | (when (<= ,level tramp-verbose) | 2274 | (when (and tramp-message-show-message |
| 2275 | ;; Display only when there is a minimum level. | ||
| 2276 | (<= ,level (min tramp-verbose 3))) | ||
| 2275 | (condition-case nil | 2277 | (condition-case nil |
| 2276 | (setq pr (tramp-compat-funcall 'make-progress-reporter ,message) | 2278 | (setq pr (tramp-compat-funcall 'make-progress-reporter ,message) |
| 2277 | tm (if pr (run-at-time 3 0.1 'progress-reporter-update pr))) | 2279 | tm (if pr (run-at-time 3 0.1 'progress-reporter-update pr))) |
| 2278 | (error nil))) | 2280 | (error nil))) |
| 2279 | (unwind-protect | 2281 | (unwind-protect |
| 2280 | ;; Execute the body. | 2282 | ;; Execute the body. |
| 2281 | (progn ,@body) | 2283 | (let ((tramp-message-show-message |
| 2284 | (and tramp-message-show-message (not tm)))) | ||
| 2285 | ,@body) | ||
| 2282 | ;; Stop progress reporter. | 2286 | ;; Stop progress reporter. |
| 2283 | (if tm (tramp-compat-funcall 'cancel-timer tm)) | 2287 | (if tm (tramp-compat-funcall 'cancel-timer tm)) |
| 2284 | (tramp-message ,vec ,level "%s...done" ,message)))) | 2288 | (tramp-message ,vec ,level "%s...done" ,message)))) |
| @@ -2558,13 +2562,13 @@ target of the symlink differ." | |||
| 2558 | (tramp-error v 'file-error "Cannot load nonexistent file `%s'" file))) | 2562 | (tramp-error v 'file-error "Cannot load nonexistent file `%s'" file))) |
| 2559 | (if (not (file-exists-p file)) | 2563 | (if (not (file-exists-p file)) |
| 2560 | nil | 2564 | nil |
| 2561 | (unless nomessage (tramp-message v 0 "Loading %s..." file)) | 2565 | (let ((tramp-message-show-message (not nomessage))) |
| 2562 | (let ((local-copy (file-local-copy file))) | 2566 | (with-progress-reporter v 0 (format "Loading %s" file) |
| 2563 | ;; MUST-SUFFIX doesn't exist on XEmacs, so let it default to nil. | 2567 | (let ((local-copy (file-local-copy file))) |
| 2564 | (unwind-protect | 2568 | ;; MUST-SUFFIX doesn't exist on XEmacs, so let it default to nil. |
| 2565 | (load local-copy noerror t t) | 2569 | (unwind-protect |
| 2566 | (tramp-compat-delete-file local-copy 'force))) | 2570 | (load local-copy noerror t t) |
| 2567 | (unless nomessage (tramp-message v 0 "Loading %s...done" file)) | 2571 | (tramp-compat-delete-file local-copy 'force))))) |
| 2568 | t))) | 2572 | t))) |
| 2569 | 2573 | ||
| 2570 | ;; Localname manipulation functions that grok Tramp localnames... | 2574 | ;; Localname manipulation functions that grok Tramp localnames... |
| @@ -2867,7 +2871,9 @@ target of the symlink differ." | |||
| 2867 | (tramp-send-command-and-read | 2871 | (tramp-send-command-and-read |
| 2868 | vec | 2872 | vec |
| 2869 | (format | 2873 | (format |
| 2870 | "((%s %s || %s -h %s) && %s -c '((\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)' %s || echo nil)" | 2874 | ;; On Opsware, pdksh (which is the true name of ksh there) doesn't |
| 2875 | ;; parse correctly the sequence "((". Therefore, we add a space. | ||
| 2876 | "( (%s %s || %s -h %s) && %s -c '( (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)' %s || echo nil)" | ||
| 2871 | (tramp-get-file-exists-command vec) | 2877 | (tramp-get-file-exists-command vec) |
| 2872 | (tramp-shell-quote-argument localname) | 2878 | (tramp-shell-quote-argument localname) |
| 2873 | (tramp-get-test-command vec) | 2879 | (tramp-get-test-command vec) |
| @@ -2920,12 +2926,14 @@ already know that the buffer is visiting a file and that | |||
| 2920 | function directly, unless those two cases are already taken care | 2926 | function directly, unless those two cases are already taken care |
| 2921 | of." | 2927 | of." |
| 2922 | (with-current-buffer buf | 2928 | (with-current-buffer buf |
| 2923 | ;; There is no file visiting the buffer, or the buffer has no | 2929 | (let ((f (buffer-file-name))) |
| 2924 | ;; recorded last modification time. | 2930 | ;; There is no file visiting the buffer, or the buffer has no |
| 2925 | (if (or (not (buffer-file-name)) | 2931 | ;; recorded last modification time, or there is no established |
| 2926 | (eq (visited-file-modtime) 0)) | 2932 | ;; connection. |
| 2927 | t | 2933 | (if (or (not f) |
| 2928 | (let ((f (buffer-file-name))) | 2934 | (eq (visited-file-modtime) 0) |
| 2935 | (not (tramp-file-name-handler 'file-remote-p f nil 'connected))) | ||
| 2936 | t | ||
| 2929 | (with-parsed-tramp-file-name f nil | 2937 | (with-parsed-tramp-file-name f nil |
| 2930 | (tramp-flush-file-property v localname) | 2938 | (tramp-flush-file-property v localname) |
| 2931 | (let* ((attr (file-attributes f)) | 2939 | (let* ((attr (file-attributes f)) |
| @@ -2984,16 +2992,11 @@ of." | |||
| 2984 | (let ((time (if (or (null time) (equal time '(0 0))) | 2992 | (let ((time (if (or (null time) (equal time '(0 0))) |
| 2985 | (current-time) | 2993 | (current-time) |
| 2986 | time)) | 2994 | time)) |
| 2987 | (utc | 2995 | ;; With GNU Emacs, `format-time-string' has an optional |
| 2988 | ;; With GNU Emacs, `format-time-string' has an | 2996 | ;; parameter UNIVERSAL. This is preferred, because we |
| 2989 | ;; optional parameter UNIVERSAL. This is preferred, | 2997 | ;; could handle the case when the remote host is |
| 2990 | ;; because we could handle the case when the remote | 2998 | ;; located in a different time zone as the local host. |
| 2991 | ;; host is located in a different time zone as the | 2999 | (utc (not (featurep 'xemacs)))) |
| 2992 | ;; local host. | ||
| 2993 | (and (functionp 'subr-arity) | ||
| 2994 | (subrp (symbol-function 'format-time-string)) | ||
| 2995 | (= 3 (cdr (tramp-compat-funcall | ||
| 2996 | 'subr-arity 'format-time-string)))))) | ||
| 2997 | (tramp-send-command-and-check | 3000 | (tramp-send-command-and-check |
| 2998 | v (format "%s touch -t %s %s" | 3001 | v (format "%s touch -t %s %s" |
| 2999 | (if utc "TZ=UTC; export TZ;" "") | 3002 | (if utc "TZ=UTC; export TZ;" "") |
| @@ -4154,7 +4157,7 @@ This is like `dired-recursive-delete-directory' for Tramp files." | |||
| 4154 | nil) | 4157 | nil) |
| 4155 | ((and suffix (nth 2 suffix)) | 4158 | ((and suffix (nth 2 suffix)) |
| 4156 | ;; We found an uncompression rule. | 4159 | ;; We found an uncompression rule. |
| 4157 | (with-progress-reporter v 0 (format "Uncompressing %s..." file) | 4160 | (with-progress-reporter v 0 (format "Uncompressing %s" file) |
| 4158 | (when (zerop | 4161 | (when (zerop |
| 4159 | (tramp-send-command-and-check | 4162 | (tramp-send-command-and-check |
| 4160 | v (concat (nth 2 suffix) " " | 4163 | v (concat (nth 2 suffix) " " |
| @@ -4166,7 +4169,7 @@ This is like `dired-recursive-delete-directory' for Tramp files." | |||
| 4166 | (t | 4169 | (t |
| 4167 | ;; We don't recognize the file as compressed, so compress it. | 4170 | ;; We don't recognize the file as compressed, so compress it. |
| 4168 | ;; Try gzip. | 4171 | ;; Try gzip. |
| 4169 | (with-progress-reporter v 0 (format "Compressing %s..." file) | 4172 | (with-progress-reporter v 0 (format "Compressing %s" file) |
| 4170 | (when (zerop | 4173 | (when (zerop |
| 4171 | (tramp-send-command-and-check | 4174 | (tramp-send-command-and-check |
| 4172 | v (concat "gzip -f " | 4175 | v (concat "gzip -f " |
| @@ -4748,11 +4751,11 @@ Lisp error raised when PROGRAM is nil is trapped also, returning 1." | |||
| 4748 | ;; Use inline encoding for file transfer. | 4751 | ;; Use inline encoding for file transfer. |
| 4749 | (rem-enc | 4752 | (rem-enc |
| 4750 | (save-excursion | 4753 | (save-excursion |
| 4751 | (tramp-message v 5 "Encoding remote file %s..." filename) | 4754 | (with-progress-reporter |
| 4752 | (tramp-barf-unless-okay | 4755 | v 5 (format "Encoding remote file %s" filename) |
| 4753 | v (format rem-enc (tramp-shell-quote-argument localname)) | 4756 | (tramp-barf-unless-okay |
| 4754 | "Encoding remote file failed") | 4757 | v (format rem-enc (tramp-shell-quote-argument localname)) |
| 4755 | (tramp-message v 5 "Encoding remote file %s...done" filename) | 4758 | "Encoding remote file failed")) |
| 4756 | 4759 | ||
| 4757 | (if (functionp loc-dec) | 4760 | (if (functionp loc-dec) |
| 4758 | ;; If local decoding is a function, we call it. We | 4761 | ;; If local decoding is a function, we call it. We |
| @@ -4762,15 +4765,15 @@ Lisp error raised when PROGRAM is nil is trapped also, returning 1." | |||
| 4762 | (with-temp-buffer | 4765 | (with-temp-buffer |
| 4763 | (set-buffer-multibyte nil) | 4766 | (set-buffer-multibyte nil) |
| 4764 | (insert-buffer-substring (tramp-get-buffer v)) | 4767 | (insert-buffer-substring (tramp-get-buffer v)) |
| 4765 | (tramp-message | 4768 | (with-progress-reporter |
| 4766 | v 5 "Decoding remote file %s with function %s..." | 4769 | v 3 (format "Decoding remote file %s with function %s" |
| 4767 | filename loc-dec) | 4770 | filename loc-dec) |
| 4768 | (funcall loc-dec (point-min) (point-max)) | 4771 | (funcall loc-dec (point-min) (point-max)) |
| 4769 | ;; Unset `file-name-handler-alist'. Otherwise, | 4772 | ;; Unset `file-name-handler-alist'. Otherwise, |
| 4770 | ;; epa-file gets confused. | 4773 | ;; epa-file gets confused. |
| 4771 | (let (file-name-handler-alist | 4774 | (let (file-name-handler-alist |
| 4772 | (coding-system-for-write 'binary)) | 4775 | (coding-system-for-write 'binary)) |
| 4773 | (write-region (point-min) (point-max) tmpfile))) | 4776 | (write-region (point-min) (point-max) tmpfile)))) |
| 4774 | 4777 | ||
| 4775 | ;; If tramp-decoding-function is not defined for this | 4778 | ;; If tramp-decoding-function is not defined for this |
| 4776 | ;; method, we invoke tramp-decoding-command instead. | 4779 | ;; method, we invoke tramp-decoding-command instead. |
| @@ -4780,14 +4783,14 @@ Lisp error raised when PROGRAM is nil is trapped also, returning 1." | |||
| 4780 | (let (file-name-handler-alist | 4783 | (let (file-name-handler-alist |
| 4781 | (coding-system-for-write 'binary)) | 4784 | (coding-system-for-write 'binary)) |
| 4782 | (write-region (point-min) (point-max) tmpfile2)) | 4785 | (write-region (point-min) (point-max) tmpfile2)) |
| 4783 | (tramp-message | 4786 | (with-progress-reporter |
| 4784 | v 5 "Decoding remote file %s with command %s..." | 4787 | v 3 (format "Decoding remote file %s with command %s" |
| 4785 | filename loc-dec) | 4788 | filename loc-dec) |
| 4786 | (unwind-protect | 4789 | (unwind-protect |
| 4787 | (tramp-call-local-coding-command loc-dec tmpfile2 tmpfile) | 4790 | (tramp-call-local-coding-command |
| 4788 | (tramp-compat-delete-file tmpfile2 'force)))) | 4791 | loc-dec tmpfile2 tmpfile) |
| 4792 | (tramp-compat-delete-file tmpfile2 'force))))) | ||
| 4789 | 4793 | ||
| 4790 | (tramp-message v 5 "Decoding remote file %s...done" filename) | ||
| 4791 | ;; Set proper permissions. | 4794 | ;; Set proper permissions. |
| 4792 | (set-file-modes tmpfile (tramp-default-file-modes filename)) | 4795 | (set-file-modes tmpfile (tramp-default-file-modes filename)) |
| 4793 | ;; Set local user ownership. | 4796 | ;; Set local user ownership. |
| @@ -4843,7 +4846,7 @@ coding system might not be determined. This function repairs it." | |||
| 4843 | "Like `insert-file-contents' for Tramp files." | 4846 | "Like `insert-file-contents' for Tramp files." |
| 4844 | (barf-if-buffer-read-only) | 4847 | (barf-if-buffer-read-only) |
| 4845 | (setq filename (expand-file-name filename)) | 4848 | (setq filename (expand-file-name filename)) |
| 4846 | (let (coding-system-used result local-copy remote-copy) | 4849 | (let (result local-copy remote-copy) |
| 4847 | (with-parsed-tramp-file-name filename nil | 4850 | (with-parsed-tramp-file-name filename nil |
| 4848 | (unwind-protect | 4851 | (unwind-protect |
| 4849 | (if (not (file-exists-p filename)) | 4852 | (if (not (file-exists-p filename)) |
| @@ -4914,27 +4917,16 @@ coding system might not be determined. This function repairs it." | |||
| 4914 | (setq tramp-temp-buffer-file-name local-copy) | 4917 | (setq tramp-temp-buffer-file-name local-copy) |
| 4915 | (put 'tramp-temp-buffer-file-name 'permanent-local t)) | 4918 | (put 'tramp-temp-buffer-file-name 'permanent-local t)) |
| 4916 | 4919 | ||
| 4917 | (tramp-message | 4920 | (with-progress-reporter |
| 4918 | v 4 "Inserting local temp file `%s'..." local-copy) | 4921 | v 3 (format "Inserting local temp file `%s'" local-copy) |
| 4919 | 4922 | ;; We must ensure that `file-coding-system-alist' | |
| 4920 | ;; We must ensure that `file-coding-system-alist' | 4923 | ;; matches `local-copy'. |
| 4921 | ;; matches `local-copy'. | 4924 | (let ((file-coding-system-alist |
| 4922 | (let ((file-coding-system-alist | 4925 | (tramp-find-file-name-coding-system-alist |
| 4923 | (tramp-find-file-name-coding-system-alist | 4926 | filename local-copy))) |
| 4924 | filename local-copy))) | 4927 | (setq result |
| 4925 | (setq result | 4928 | (insert-file-contents |
| 4926 | (insert-file-contents | 4929 | local-copy nil nil nil replace)))))) |
| 4927 | local-copy nil nil nil replace)) | ||
| 4928 | ;; Now `last-coding-system-used' has right value. | ||
| 4929 | ;; Remember it. | ||
| 4930 | (when (boundp 'last-coding-system-used) | ||
| 4931 | (setq coding-system-used | ||
| 4932 | (symbol-value 'last-coding-system-used)))) | ||
| 4933 | |||
| 4934 | (tramp-message | ||
| 4935 | v 4 "Inserting local temp file `%s'...done" local-copy) | ||
| 4936 | (when (boundp 'last-coding-system-used) | ||
| 4937 | (set 'last-coding-system-used coding-system-used)))) | ||
| 4938 | 4930 | ||
| 4939 | ;; Save exit. | 4931 | ;; Save exit. |
| 4940 | (progn | 4932 | (progn |
| @@ -5194,15 +5186,14 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file." | |||
| 5194 | ;; Use inline file transfer. | 5186 | ;; Use inline file transfer. |
| 5195 | (rem-dec | 5187 | (rem-dec |
| 5196 | ;; Encode tmpfile. | 5188 | ;; Encode tmpfile. |
| 5197 | (tramp-message v 5 "Encoding region...") | ||
| 5198 | (unwind-protect | 5189 | (unwind-protect |
| 5199 | (with-temp-buffer | 5190 | (with-temp-buffer |
| 5200 | (set-buffer-multibyte nil) | 5191 | (set-buffer-multibyte nil) |
| 5201 | ;; Use encoding function or command. | 5192 | ;; Use encoding function or command. |
| 5202 | (if (functionp loc-enc) | 5193 | (if (functionp loc-enc) |
| 5203 | (progn | 5194 | (with-progress-reporter |
| 5204 | (tramp-message | 5195 | v 3 (format "Encoding region using function `%s'" |
| 5205 | v 5 "Encoding region using function `%s'..." loc-enc) | 5196 | loc-enc) |
| 5206 | (let ((coding-system-for-read 'binary)) | 5197 | (let ((coding-system-for-read 'binary)) |
| 5207 | (insert-file-contents-literally tmpfile)) | 5198 | (insert-file-contents-literally tmpfile)) |
| 5208 | ;; The following `let' is a workaround for the | 5199 | ;; The following `let' is a workaround for the |
| @@ -5218,59 +5209,61 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file." | |||
| 5218 | (tramp-compat-temporary-file-directory))) | 5209 | (tramp-compat-temporary-file-directory))) |
| 5219 | (funcall loc-enc (point-min) (point-max)))) | 5210 | (funcall loc-enc (point-min) (point-max)))) |
| 5220 | 5211 | ||
| 5221 | (tramp-message | 5212 | (with-progress-reporter |
| 5222 | v 5 "Encoding region using command `%s'..." loc-enc) | 5213 | v 3 (format "Encoding region using command `%s'" |
| 5223 | (unless (zerop (tramp-call-local-coding-command | 5214 | loc-enc) |
| 5224 | loc-enc tmpfile t)) | 5215 | (unless (zerop (tramp-call-local-coding-command |
| 5225 | (tramp-error | 5216 | loc-enc tmpfile t)) |
| 5226 | v 'file-error | 5217 | (tramp-error |
| 5227 | "Cannot write to `%s', local encoding command `%s' failed" | 5218 | v 'file-error |
| 5228 | filename loc-enc))) | 5219 | (concat "Cannot write to `%s', " |
| 5220 | "local encoding command `%s' failed") | ||
| 5221 | filename loc-enc)))) | ||
| 5229 | 5222 | ||
| 5230 | ;; Send buffer into remote decoding command which | 5223 | ;; Send buffer into remote decoding command which |
| 5231 | ;; writes to remote file. Because this happens on | 5224 | ;; writes to remote file. Because this happens on |
| 5232 | ;; the remote host, we cannot use the function. | 5225 | ;; the remote host, we cannot use the function. |
| 5233 | (goto-char (point-max)) | 5226 | (with-progress-reporter |
| 5234 | (unless (bolp) (newline)) | 5227 | v 3 |
| 5235 | (tramp-message | 5228 | (format "Decoding region into remote file %s" filename) |
| 5236 | v 5 "Decoding region into remote file %s..." filename) | 5229 | (goto-char (point-max)) |
| 5237 | (tramp-send-command | 5230 | (unless (bolp) (newline)) |
| 5238 | v | 5231 | (tramp-send-command |
| 5239 | (format | 5232 | v |
| 5240 | (concat rem-dec " <<'EOF'\n%sEOF") | 5233 | (format |
| 5241 | (tramp-shell-quote-argument localname) | 5234 | (concat rem-dec " <<'EOF'\n%sEOF") |
| 5242 | (buffer-string))) | 5235 | (tramp-shell-quote-argument localname) |
| 5243 | (tramp-barf-unless-okay | 5236 | (buffer-string))) |
| 5244 | v nil | 5237 | (tramp-barf-unless-okay |
| 5245 | "Couldn't write region to `%s', decode using `%s' failed" | 5238 | v nil |
| 5246 | filename rem-dec) | 5239 | "Couldn't write region to `%s', decode using `%s' failed" |
| 5247 | ;; When `file-precious-flag' is set, the region is | 5240 | filename rem-dec) |
| 5248 | ;; written to a temporary file. Check that the | 5241 | ;; When `file-precious-flag' is set, the region is |
| 5249 | ;; checksum is equal to that from the local tmpfile. | 5242 | ;; written to a temporary file. Check that the |
| 5250 | (when file-precious-flag | 5243 | ;; checksum is equal to that from the local tmpfile. |
| 5251 | (erase-buffer) | 5244 | (when file-precious-flag |
| 5252 | (and | 5245 | (erase-buffer) |
| 5253 | ;; cksum runs locally, if possible. | 5246 | (and |
| 5254 | (zerop (tramp-local-call-process "cksum" tmpfile t)) | 5247 | ;; cksum runs locally, if possible. |
| 5255 | ;; cksum runs remotely. | 5248 | (zerop (tramp-local-call-process "cksum" tmpfile t)) |
| 5256 | (zerop | 5249 | ;; cksum runs remotely. |
| 5257 | (tramp-send-command-and-check | 5250 | (zerop |
| 5258 | v | 5251 | (tramp-send-command-and-check |
| 5259 | (format | 5252 | v |
| 5260 | "cksum <%s" (tramp-shell-quote-argument localname)))) | 5253 | (format |
| 5261 | ;; ... they are different. | 5254 | "cksum <%s" |
| 5262 | (not | 5255 | (tramp-shell-quote-argument localname)))) |
| 5263 | (string-equal | 5256 | ;; ... they are different. |
| 5264 | (buffer-string) | 5257 | (not |
| 5265 | (with-current-buffer (tramp-get-buffer v) | 5258 | (string-equal |
| 5266 | (buffer-string)))) | 5259 | (buffer-string) |
| 5267 | (tramp-error | 5260 | (with-current-buffer (tramp-get-buffer v) |
| 5268 | v 'file-error | 5261 | (buffer-string)))) |
| 5269 | (concat "Couldn't write region to `%s'," | 5262 | (tramp-error |
| 5270 | " decode using `%s' failed") | 5263 | v 'file-error |
| 5271 | filename rem-dec))) | 5264 | (concat "Couldn't write region to `%s'," |
| 5272 | (tramp-message | 5265 | " decode using `%s' failed") |
| 5273 | v 5 "Decoding region into remote file %s...done" filename)) | 5266 | filename rem-dec))))) |
| 5274 | 5267 | ||
| 5275 | ;; Save exit. | 5268 | ;; Save exit. |
| 5276 | (tramp-compat-delete-file tmpfile 'force))) | 5269 | (tramp-compat-delete-file tmpfile 'force))) |
| @@ -6287,14 +6280,13 @@ Only send the definition if it has not already been done." | |||
| 6287 | (let* ((p (tramp-get-connection-process vec)) | 6280 | (let* ((p (tramp-get-connection-process vec)) |
| 6288 | (scripts (tramp-get-connection-property p "scripts" nil))) | 6281 | (scripts (tramp-get-connection-property p "scripts" nil))) |
| 6289 | (unless (member name scripts) | 6282 | (unless (member name scripts) |
| 6290 | (tramp-message vec 5 "Sending script `%s'..." name) | 6283 | (with-progress-reporter vec 5 (format "Sending script `%s'" name) |
| 6291 | ;; The script could contain a call of Perl. This is masked with `%s'. | 6284 | ;; The script could contain a call of Perl. This is masked with `%s'. |
| 6292 | (tramp-send-command-and-check | 6285 | (tramp-send-command-and-check |
| 6293 | vec | 6286 | vec |
| 6294 | (format "%s () {\n%s\n}" name | 6287 | (format "%s () {\n%s\n}" name |
| 6295 | (format script (tramp-get-remote-perl vec)))) | 6288 | (format script (tramp-get-remote-perl vec)))) |
| 6296 | (tramp-set-connection-property p "scripts" (cons name scripts)) | 6289 | (tramp-set-connection-property p "scripts" (cons name scripts)))))) |
| 6297 | (tramp-message vec 5 "Sending script `%s'...done." name)))) | ||
| 6298 | 6290 | ||
| 6299 | (defun tramp-set-auto-save () | 6291 | (defun tramp-set-auto-save () |
| 6300 | (when (and ;; ange-ftp has its own auto-save mechanism | 6292 | (when (and ;; ange-ftp has its own auto-save mechanism |
| @@ -6573,7 +6565,7 @@ file exists and nonzero exit status otherwise." | |||
| 6573 | (setq extra-args (cdr item)))) | 6565 | (setq extra-args (cdr item)))) |
| 6574 | (when extra-args (setq shell (concat shell " " extra-args)))) | 6566 | (when extra-args (setq shell (concat shell " " extra-args)))) |
| 6575 | (tramp-message | 6567 | (tramp-message |
| 6576 | vec 5 "Starting remote shell `%s' for tilde expansion..." shell) | 6568 | vec 5 "Starting remote shell `%s' for tilde expansion" shell) |
| 6577 | (let ((tramp-end-of-output tramp-initial-end-of-output)) | 6569 | (let ((tramp-end-of-output tramp-initial-end-of-output)) |
| 6578 | (tramp-send-command | 6570 | (tramp-send-command |
| 6579 | vec | 6571 | vec |
| @@ -6581,13 +6573,12 @@ file exists and nonzero exit status otherwise." | |||
| 6581 | (shell-quote-argument tramp-end-of-output) shell) | 6573 | (shell-quote-argument tramp-end-of-output) shell) |
| 6582 | t)) | 6574 | t)) |
| 6583 | ;; Setting prompts. | 6575 | ;; Setting prompts. |
| 6584 | (tramp-message vec 5 "Setting remote shell prompt...") | 6576 | (with-progress-reporter vec 5 (format "Setting remote shell prompt") |
| 6585 | (tramp-send-command | 6577 | (tramp-send-command |
| 6586 | vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t) | 6578 | vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t) |
| 6587 | (tramp-send-command vec "PS2=''" t) | 6579 | (tramp-send-command vec "PS2=''" t) |
| 6588 | (tramp-send-command vec "PS3=''" t) | 6580 | (tramp-send-command vec "PS3=''" t) |
| 6589 | (tramp-send-command vec "PROMPT_COMMAND=''" t) | 6581 | (tramp-send-command vec "PROMPT_COMMAND=''" t))) |
| 6590 | (tramp-message vec 5 "Setting remote shell prompt...done")) | ||
| 6591 | 6582 | ||
| 6592 | (t (tramp-message | 6583 | (t (tramp-message |
| 6593 | vec 5 "Remote `%s' groks tilde expansion, good" | 6584 | vec 5 "Remote `%s' groks tilde expansion, good" |
| @@ -7424,11 +7415,11 @@ connection if a previous connection has died for some reason." | |||
| 7424 | (tramp-get-buffer vec) | 7415 | (tramp-get-buffer vec) |
| 7425 | (if (zerop (length (tramp-file-name-user vec))) | 7416 | (if (zerop (length (tramp-file-name-user vec))) |
| 7426 | (tramp-message | 7417 | (tramp-message |
| 7427 | vec 3 "Opening connection for %s using %s..." | 7418 | vec 3 "Opening connection for %s using %s" |
| 7428 | (tramp-file-name-host vec) | 7419 | (tramp-file-name-host vec) |
| 7429 | (tramp-file-name-method vec)) | 7420 | (tramp-file-name-method vec)) |
| 7430 | (tramp-message | 7421 | (tramp-message |
| 7431 | vec 3 "Opening connection for %s@%s using %s..." | 7422 | vec 3 "Opening connection for %s@%s using %s" |
| 7432 | (tramp-file-name-user vec) | 7423 | (tramp-file-name-user vec) |
| 7433 | (tramp-file-name-host vec) | 7424 | (tramp-file-name-host vec) |
| 7434 | (tramp-file-name-method vec))) | 7425 | (tramp-file-name-method vec))) |
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 7b55f97a21b..f157fc5d291 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog | |||
| @@ -127,7 +127,7 @@ | |||
| 127 | (org-ascii-replace-entities): New function. | 127 | (org-ascii-replace-entities): New function. |
| 128 | 128 | ||
| 129 | 2010-04-10 Carsten Dominik <carsten.dominik@gmail.com> | 129 | 2010-04-10 Carsten Dominik <carsten.dominik@gmail.com> |
| 130 | Ulf Stegemann <ulf@zeitform.de> | 130 | Ulf Stegemann <ulf@zeitform.de> |
| 131 | 131 | ||
| 132 | * org-entities.el: New file. | 132 | * org-entities.el: New file. |
| 133 | 133 | ||
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 56fc8032541..10267a6b2dc 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el | |||
| @@ -1501,6 +1501,11 @@ defun." | |||
| 1501 | (interactive "p") | 1501 | (interactive "p") |
| 1502 | (or arg (setq arg 1)) | 1502 | (or arg (setq arg 1)) |
| 1503 | 1503 | ||
| 1504 | (or (not (eq this-command 'c-beginning-of-defun)) | ||
| 1505 | (eq last-command 'c-beginning-of-defun) | ||
| 1506 | (and transient-mark-mode mark-active) | ||
| 1507 | (push-mark)) | ||
| 1508 | |||
| 1504 | (c-save-buffer-state | 1509 | (c-save-buffer-state |
| 1505 | (beginning-of-defun-function end-of-defun-function | 1510 | (beginning-of-defun-function end-of-defun-function |
| 1506 | (start (point)) | 1511 | (start (point)) |
| @@ -1604,6 +1609,11 @@ the open-parenthesis that starts a defun; see `beginning-of-defun'." | |||
| 1604 | (interactive "p") | 1609 | (interactive "p") |
| 1605 | (or arg (setq arg 1)) | 1610 | (or arg (setq arg 1)) |
| 1606 | 1611 | ||
| 1612 | (or (not (eq this-command 'c-end-of-defun)) | ||
| 1613 | (eq last-command 'c-end-of-defun) | ||
| 1614 | (and transient-mark-mode mark-active) | ||
| 1615 | (push-mark)) | ||
| 1616 | |||
| 1607 | (c-save-buffer-state | 1617 | (c-save-buffer-state |
| 1608 | (beginning-of-defun-function end-of-defun-function | 1618 | (beginning-of-defun-function end-of-defun-function |
| 1609 | (start (point)) | 1619 | (start (point)) |
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 610fa14489a..eca6d5fbe7b 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el | |||
| @@ -1480,7 +1480,7 @@ frequently editing existing scripts with different styles.") | |||
| 1480 | ;; mode-command and utility functions | 1480 | ;; mode-command and utility functions |
| 1481 | 1481 | ||
| 1482 | ;;;###autoload | 1482 | ;;;###autoload |
| 1483 | (defun sh-mode () | 1483 | (define-derived-mode sh-mode prog-mode "Shell-script" |
| 1484 | "Major mode for editing shell scripts. | 1484 | "Major mode for editing shell scripts. |
| 1485 | This mode works for many shells, since they all have roughly the same syntax, | 1485 | This mode works for many shells, since they all have roughly the same syntax, |
| 1486 | as far as commands, arguments, variables, pipes, comments etc. are concerned. | 1486 | as far as commands, arguments, variables, pipes, comments etc. are concerned. |
| @@ -1533,11 +1533,6 @@ indicate what shell it is use `sh-alias-alist' to translate. | |||
| 1533 | 1533 | ||
| 1534 | If your shell gives error messages with line numbers, you can use \\[executable-interpret] | 1534 | If your shell gives error messages with line numbers, you can use \\[executable-interpret] |
| 1535 | with your script for an edit-interpret-debug cycle." | 1535 | with your script for an edit-interpret-debug cycle." |
| 1536 | (interactive) | ||
| 1537 | (kill-all-local-variables) | ||
| 1538 | (setq major-mode 'sh-mode | ||
| 1539 | mode-name "Shell-script") | ||
| 1540 | (use-local-map sh-mode-map) | ||
| 1541 | (make-local-variable 'skeleton-end-hook) | 1536 | (make-local-variable 'skeleton-end-hook) |
| 1542 | (make-local-variable 'paragraph-start) | 1537 | (make-local-variable 'paragraph-start) |
| 1543 | (make-local-variable 'paragraph-separate) | 1538 | (make-local-variable 'paragraph-separate) |
| @@ -1613,8 +1608,7 @@ with your script for an edit-interpret-debug cycle." | |||
| 1613 | "sh") | 1608 | "sh") |
| 1614 | (t | 1609 | (t |
| 1615 | sh-shell-file)) | 1610 | sh-shell-file)) |
| 1616 | nil nil) | 1611 | nil nil)) |
| 1617 | (run-mode-hooks 'sh-mode-hook)) | ||
| 1618 | 1612 | ||
| 1619 | ;;;###autoload | 1613 | ;;;###autoload |
| 1620 | (defalias 'shell-script-mode 'sh-mode) | 1614 | (defalias 'shell-script-mode 'sh-mode) |
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el index 458e2be07a1..4f9747cb90a 100644 --- a/lisp/scroll-all.el +++ b/lisp/scroll-all.el | |||
| @@ -90,9 +90,9 @@ | |||
| 90 | (call-interactively 'scroll-all-scroll-down-all)) | 90 | (call-interactively 'scroll-all-scroll-down-all)) |
| 91 | ((eq this-command 'previous-line) | 91 | ((eq this-command 'previous-line) |
| 92 | (call-interactively 'scroll-all-scroll-up-all)) | 92 | (call-interactively 'scroll-all-scroll-up-all)) |
| 93 | ((eq this-command 'scroll-up) | 93 | ((memq this-command '(scroll-up scroll-up-command)) |
| 94 | (call-interactively 'scroll-all-page-down-all)) | 94 | (call-interactively 'scroll-all-page-down-all)) |
| 95 | ((eq this-command 'scroll-down) | 95 | ((memq this-command '(scroll-down scroll-down-command)) |
| 96 | (call-interactively 'scroll-all-page-up-all)) | 96 | (call-interactively 'scroll-all-page-up-all)) |
| 97 | ((eq this-command 'beginning-of-buffer) | 97 | ((eq this-command 'beginning-of-buffer) |
| 98 | (call-interactively 'scroll-all-beginning-of-buffer-all)) | 98 | (call-interactively 'scroll-all-beginning-of-buffer-all)) |
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index c88b32f64cc..94eb721e4cf 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el | |||
| @@ -2630,11 +2630,22 @@ Keeps argument list for future ispell invocations for no async support." | |||
| 2630 | (or ispell-local-dictionary ispell-dictionary "default")) | 2630 | (or ispell-local-dictionary ispell-dictionary "default")) |
| 2631 | (sit-for 0) | 2631 | (sit-for 0) |
| 2632 | (setq ispell-library-directory (ispell-check-version) | 2632 | (setq ispell-library-directory (ispell-check-version) |
| 2633 | ispell-process-directory default-directory | ||
| 2634 | ispell-process (ispell-start-process) | 2633 | ispell-process (ispell-start-process) |
| 2635 | ispell-filter nil | 2634 | ispell-filter nil |
| 2636 | ispell-filter-continue nil | 2635 | ispell-filter-continue nil) |
| 2637 | ispell-process-buffer-name (buffer-name)) | 2636 | ;; When spellchecking minibuffer contents, make sure ispell process |
| 2637 | ;; is not restarted every time the minibuffer is killed. | ||
| 2638 | (if (window-minibuffer-p) | ||
| 2639 | (if (fboundp 'minibuffer-selected-window) | ||
| 2640 | ;; Assign ispell process to parent buffer | ||
| 2641 | (setq ispell-process-directory default-directory | ||
| 2642 | ispell-process-buffer-name (window-buffer (minibuffer-selected-window))) | ||
| 2643 | ;; Force `ispell-process-directory' to $HOME and use a dummy name | ||
| 2644 | (setq ispell-process-directory (expand-file-name "~/") | ||
| 2645 | ispell-process-buffer-name " * Minibuffer-has-spellcheck-enabled")) | ||
| 2646 | ;; Not in a minibuffer | ||
| 2647 | (setq ispell-process-directory default-directory | ||
| 2648 | ispell-process-buffer-name (buffer-name))) | ||
| 2638 | (if ispell-async-processp | 2649 | (if ispell-async-processp |
| 2639 | (set-process-filter ispell-process 'ispell-filter)) | 2650 | (set-process-filter ispell-process 'ispell-filter)) |
| 2640 | ;; protect against bogus binding of `enable-multibyte-characters' in XEmacs | 2651 | ;; protect against bogus binding of `enable-multibyte-characters' in XEmacs |
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index b9d52acdeba..6cd4121bd10 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el | |||
| @@ -101,6 +101,11 @@ This takes effect when first loading the `sgml-mode' library.") | |||
| 101 | (define-key map "\C-c\^?" 'sgml-delete-tag) | 101 | (define-key map "\C-c\^?" 'sgml-delete-tag) |
| 102 | (define-key map "\C-c?" 'sgml-tag-help) | 102 | (define-key map "\C-c?" 'sgml-tag-help) |
| 103 | (define-key map "\C-c/" 'sgml-close-tag) | 103 | (define-key map "\C-c/" 'sgml-close-tag) |
| 104 | |||
| 105 | ;; Redundant keybindings, for consistency with TeX mode. | ||
| 106 | (define-key map "\C-c\C-o" 'sgml-tag) | ||
| 107 | (define-key map "\C-c\C-e" 'sgml-close-tag) | ||
| 108 | |||
| 104 | (define-key map "\C-c8" 'sgml-name-8bit-mode) | 109 | (define-key map "\C-c8" 'sgml-name-8bit-mode) |
| 105 | (define-key map "\C-c\C-v" 'sgml-validate) | 110 | (define-key map "\C-c\C-v" 'sgml-validate) |
| 106 | (when sgml-quick-keys | 111 | (when sgml-quick-keys |
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index 5fc92a92d37..da0c5396f2c 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el | |||
| @@ -808,6 +808,11 @@ END is the position of the first delimiter after \verb." | |||
| 808 | (define-key map "\C-c\C-c" 'tex-compile) | 808 | (define-key map "\C-c\C-c" 'tex-compile) |
| 809 | (define-key map "\C-c\C-i" 'tex-bibtex-file) | 809 | (define-key map "\C-c\C-i" 'tex-bibtex-file) |
| 810 | (define-key map "\C-c\C-o" 'latex-insert-block) | 810 | (define-key map "\C-c\C-o" 'latex-insert-block) |
| 811 | |||
| 812 | ;; Redundant keybindings, for consistency with SGML mode. | ||
| 813 | (define-key map "\C-c\C-t" 'latex-insert-block) | ||
| 814 | (define-key map "\C-c/" 'latex-close-block) | ||
| 815 | |||
| 811 | (define-key map "\C-c\C-e" 'latex-close-block) | 816 | (define-key map "\C-c\C-e" 'latex-close-block) |
| 812 | (define-key map "\C-c\C-u" 'tex-goto-last-unclosed-latex-block) | 817 | (define-key map "\C-c\C-u" 'tex-goto-last-unclosed-latex-block) |
| 813 | (define-key map "\C-c\C-m" 'tex-feed-input) | 818 | (define-key map "\C-c\C-m" 'tex-feed-input) |
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 8543b2336c0..dfa61888467 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-05-13 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * lwlib-Xaw.c (make_dialog): Remove extra arg to XtVaGetSubresources. | ||
| 4 | |||
| 1 | 2010-05-08 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2010-05-08 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * xlwmenu.c (XlwMenuDestroy): Remove XtDestroyWidget on subwidgets | 7 | * xlwmenu.c (XlwMenuDestroy): Remove XtDestroyWidget on subwidgets |
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c index d31b4602147..eaaf2b46d4e 100644 --- a/lwlib/lwlib-Xaw.c +++ b/lwlib/lwlib-Xaw.c | |||
| @@ -664,7 +664,7 @@ make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, | |||
| 664 | (XtPointer)"Sans-14" }}; | 664 | (XtPointer)"Sans-14" }}; |
| 665 | char *faceName; | 665 | char *faceName; |
| 666 | XtVaGetSubresources (dialog, &faceName, "Dialog", "dialog", | 666 | XtVaGetSubresources (dialog, &faceName, "Dialog", "dialog", |
| 667 | rec, 1, 0, NULL); | 667 | rec, 1, (String)NULL); |
| 668 | if (strcmp ("none", faceName) != 0) | 668 | if (strcmp ("none", faceName) != 0) |
| 669 | xft_font = openFont (dialog, faceName); | 669 | xft_font = openFont (dialog, faceName); |
| 670 | if (xft_font) | 670 | if (xft_font) |
| @@ -537,7 +537,7 @@ echo "Making links to \`nt/icons'" | |||
| 537 | echo "Making links to \`msdos'" | 537 | echo "Making links to \`msdos'" |
| 538 | (cd msdos | 538 | (cd msdos |
| 539 | ln ChangeLog INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos | 539 | ln ChangeLog INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos |
| 540 | ln is_exec.c sigaction.c mainmake mainmake.v2 sed*.inp ../${tempdir}/msdos | 540 | ln is_exec.c sigaction.c mainmake.v2 sed*.inp ../${tempdir}/msdos |
| 541 | cd ../${tempdir}/msdos | 541 | cd ../${tempdir}/msdos |
| 542 | rm -f =*) | 542 | rm -f =*) |
| 543 | 543 | ||
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 6922c6f55db..780ec198d47 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -1,3 +1,44 @@ | |||
| 1 | 2010-05-14 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * sed1v2.inp (MSDOS_OBJ): Edit to dosfns.o msdos.o. | ||
| 4 | (MSDOS_SUPPORT): Edit to $(MSDOS_SUPPORT_REAL). | ||
| 5 | * sed1x.inp (MSDOS_X_OBJ): Edit to w16select.o termcap.o. | ||
| 6 | |||
| 7 | * sed2x.inp (HAVE_WINDOW_SYSTEM): Define. | ||
| 8 | * sed1x.inp (TOOLTIP_SUPPORT): Edit to ${lispsource}tooltip.elc. | ||
| 9 | (WINDOW_SUPPORT): Edit to $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT). | ||
| 10 | * sed1v2.inp (MOUSE_SUPPORT): Edit to $(REAL_MOUSE_SUPPORT). | ||
| 11 | (TOOLTIP_SUPPORT, WINDOW_SUPPORT): Edit to empty. | ||
| 12 | |||
| 13 | * sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype). | ||
| 14 | |||
| 15 | * sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil. | ||
| 16 | |||
| 17 | 2010-05-13 Glenn Morris <rgm@gnu.org> | ||
| 18 | |||
| 19 | * sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a. | ||
| 20 | (LIBXMENU): Edit to ${OLDXMENU}. | ||
| 21 | (LIBX_OTHER): Edit to ${LIBXT} ${LIBX_EXTRA}. | ||
| 22 | |||
| 23 | * sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) | ||
| 24 | (FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS) | ||
| 25 | (LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS) | ||
| 26 | (GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBRESOLV, LIBGPM): | ||
| 27 | Edit to empty, | ||
| 28 | (LIB_MATH): Edit to -lm. | ||
| 29 | (UNEXEC_OBJ): Edit to unexec.o. | ||
| 30 | |||
| 31 | 2010-05-12 Glenn Morris <rgm@gnu.org> | ||
| 32 | |||
| 33 | * sed3v2.inp (INSTALLABLES): No more @LIB_SRC_EXTRA_INSTALLABLES@. | ||
| 34 | |||
| 35 | * sed1v2.inp (LIB_GCC): Edit to -Lgcc. | ||
| 36 | |||
| 37 | 2010-05-11 Glenn Morris <rgm@gnu.org> | ||
| 38 | |||
| 39 | * sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys. | ||
| 40 | * sed3x.inp: New file. | ||
| 41 | |||
| 1 | 2010-05-10 Glenn Morris <rgm@gnu.org> | 42 | 2010-05-10 Glenn Morris <rgm@gnu.org> |
| 2 | 43 | ||
| 3 | * sed1v2.inp, sed3v2.inp (LIBS_SYSTEM): Edit to empty. | 44 | * sed1v2.inp, sed3v2.inp (LIBS_SYSTEM): Edit to empty. |
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index db6944ec135..5ebaba06f60 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp | |||
| @@ -38,25 +38,38 @@ s/\.h\.in/.h-in/ | |||
| 38 | /^CPPFLAGS *=/s/@[^@\n]*@// | 38 | /^CPPFLAGS *=/s/@[^@\n]*@// |
| 39 | /^LDFLAGS *=/s/@[^@\n]*@// | 39 | /^LDFLAGS *=/s/@[^@\n]*@// |
| 40 | /^LIBS *=/s/@[^@\n]*@// | 40 | /^LIBS *=/s/@[^@\n]*@// |
| 41 | s/@LIB_MATH@/-lm/ | ||
| 42 | /^LIBES *=/,/^ *$/ { | 41 | /^LIBES *=/,/^ *$/ { |
| 43 | s/@[^@\n]*@//g | 42 | s/@[^@\n]*@//g |
| 44 | } | 43 | } |
| 45 | /^LIBOBJS *=/s/@[^@\n]*@/getloadavg.o/ | 44 | /^LIBOBJS *=/s/@[^@\n]*@/getloadavg.o/ |
| 46 | /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// | 45 | /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// |
| 47 | /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// | 46 | /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// |
| 47 | /^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@// | ||
| 48 | /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// | ||
| 49 | #/^LD_SWITCH_X_SITE *=/s/@LD_SWITCH_X_SITE@// | ||
| 48 | /^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@// | 50 | /^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@// |
| 49 | /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// | 51 | /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// |
| 50 | /^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@// | 52 | /^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@// |
| 51 | /^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@// | 53 | /^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@// |
| 52 | /^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@// | 54 | /^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@// |
| 53 | /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@// | 55 | /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@// |
| 56 | /^LIB_GCC *=/s/@LIB_GCC@/-Lgcc/ | ||
| 57 | /^LIB_STANDARD *=/s/@LIB_STANDARD@// | ||
| 58 | /^LIB_MATH *=/s/@LIB_MATH@/-lm/ | ||
| 54 | /^LIBTIFF *=/s/@LIBTIFF@// | 59 | /^LIBTIFF *=/s/@LIBTIFF@// |
| 55 | /^LIBJPEG *=/s/@LIBJPEG@// | 60 | /^LIBJPEG *=/s/@LIBJPEG@// |
| 56 | /^LIBPNG *=/s/@LIBPNG@// | 61 | /^LIBPNG *=/s/@LIBPNG@// |
| 57 | /^LIBGIF *=/s/@LIBGIF@// | 62 | /^LIBGIF *=/s/@LIBGIF@// |
| 58 | /^LIBXPM *=/s/@LIBXPM@// | 63 | /^LIBXPM *=/s/@LIBXPM@// |
| 59 | /^XFT_LIBS *=/s/@XFT_LIBS@// | 64 | /^XFT_LIBS *=/s/@XFT_LIBS@// |
| 65 | /^FONTCONFIG_CFLAGS *=/s/@FONTCONFIG_CFLAGS@// | ||
| 66 | /^FONTCONFIG_LIBS *=/s/@FONTCONFIG_LIBS@// | ||
| 67 | /^FREETYPE_CFLAGS *=/s/@FREETYPE_CFLAGS@// | ||
| 68 | /^FREETYPE_LIBS *=/s/@FREETYPE_LIBS@// | ||
| 69 | /^LIBOTF_CFLAGS *=/s/@LIBOTF_CFLAGS@// | ||
| 70 | /^LIBOTF_LIBS *=/s/@LIBOTF_LIBS@// | ||
| 71 | /^M17N_FLT_CFLAGS *=/s/@M17N_FLT_CFLAGS@// | ||
| 72 | /^M17N_FLT_LIBS *=/s/@M17N_FLT_LIBS@// | ||
| 60 | /^DBUS_CFLAGS *=/s/@DBUS_CFLAGS@// | 73 | /^DBUS_CFLAGS *=/s/@DBUS_CFLAGS@// |
| 61 | /^DBUS_LIBS *=/s/@DBUS_LIBS@// | 74 | /^DBUS_LIBS *=/s/@DBUS_LIBS@// |
| 62 | /^DBUS_OBJ *=/s/@DBUS_OBJ@// | 75 | /^DBUS_OBJ *=/s/@DBUS_OBJ@// |
| @@ -76,22 +89,32 @@ s/@LIB_MATH@/-lm/ | |||
| 76 | /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// | 89 | /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// |
| 77 | /^WIDGET_OBJ *=/s/@WIDGET_OBJ@// | 90 | /^WIDGET_OBJ *=/s/@WIDGET_OBJ@// |
| 78 | /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// | 91 | /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// |
| 92 | /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o/ | ||
| 93 | /^MSDOS_SUPPORT *=/s/= */= $(MSDOS_SUPPORT_REAL)/ | ||
| 79 | /^NS_OBJ *=/s/@NS_OBJ@// | 94 | /^NS_OBJ *=/s/@NS_OBJ@// |
| 80 | /^NS_SUPPORT *=/s/@NS_SUPPORT@// | 95 | /^NS_SUPPORT *=/s/@NS_SUPPORT@// |
| 96 | /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// | ||
| 97 | /^GNUSTEP_SYSTEM_LIBRARIES *=/s/@GNUSTEP_SYSTEM_LIBRARIES@// | ||
| 98 | /^LIBRESOLV *=/s/@LIBRESOLV@// | ||
| 81 | /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// | 99 | /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// |
| 82 | /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// | 100 | /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// |
| 83 | /^START_FILES *=/s/@START_FILES@// | 101 | /^START_FILES *=/s/@START_FILES@// |
| 84 | /^OTHER_FILES *=/s/@OTHER_FILES@// | 102 | /^OTHER_FILES *=/s/@OTHER_FILES@// |
| 85 | /^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ | 103 | /^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ |
| 86 | /^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o ftfont.o xftfont.o ftxfont.o/ | 104 | /^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o/ |
| 105 | /^MOUSE_SUPPORT *=/s/@MOUSE_SUPPORT@/$(REAL_MOUSE_SUPPORT)/ | ||
| 106 | /^TOOLTIP_SUPPORT *=/s/@TOOLTIP_SUPPORT@// | ||
| 107 | /^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@// | ||
| 108 | /^LIBGPM *=/s/@LIBGPM@// | ||
| 87 | /^EXEEXT *=/s/@EXEEXT@/.exe/ | 109 | /^EXEEXT *=/s/@EXEEXT@/.exe/ |
| 88 | /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ | 110 | /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ |
| 89 | /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ | 111 | /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ |
| 90 | s/@unexec@/unexec.o/g | 112 | /^UNEXEC_OBJ *=/s/@unexec@/unexec.o/ |
| 91 | /^version *=/s/@[^@\n]*@// | 113 | /^version *=/s/@[^@\n]*@// |
| 92 | /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! | 114 | /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! |
| 93 | /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! | 115 | /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! |
| 94 | /^@SET_MAKE@$/s/@SET_MAKE@// | 116 | /^@SET_MAKE@$/s/@SET_MAKE@// |
| 117 | /^@NS_IMPL_GNUSTEP_INC@/s/@NS_IMPL_GNUSTEP_INC@// | ||
| 95 | /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! | 118 | /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! |
| 96 | /^.\${libsrc}make-doc/s!>.*$!! | 119 | /^.\${libsrc}make-doc/s!>.*$!! |
| 97 | /^[ ]*$/d | 120 | /^[ ]*$/d |
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index 2a7ce82d528..bcdb0fec0ed 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp | |||
| @@ -4,7 +4,13 @@ | |||
| 4 | s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.! | 4 | s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.! |
| 5 | s!^ @true *$! @rem! | 5 | s!^ @true *$! @rem! |
| 6 | s/DOC/DOC-X/g | 6 | s/DOC/DOC-X/g |
| 7 | #/^LIBXMENU *=/s!= *!= ../oldxmenu/! | 7 | /^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a! |
| 8 | /^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}! | ||
| 9 | /^LIBX_OTHER *=/s!@LIBX_OTHER@!${LIBXT} ${LIBX_EXTRA}! | ||
| 10 | /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! | ||
| 11 | /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o! | ||
| 12 | /^TOOLTIP_SUPPORT *=/s!= *!= ${lispsource}tooltip.elc! | ||
| 13 | /^WINDOW_SUPPORT *=/s!= *!= $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT)! | ||
| 8 | /^temacs *:/s!OLDXMENU!LIBXMENU! | 14 | /^temacs *:/s!OLDXMENU!LIBXMENU! |
| 9 | 15 | ||
| 10 | # arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19 | 16 | # arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19 |
diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp index 64d138e1b09..d17dd85ace6 100644 --- a/msdos/sed2x.inp +++ b/msdos/sed2x.inp | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | # Extra configuration script for src/config.h for DesqView/X | 2 | # Extra configuration script for src/config.h for DesqView/X |
| 3 | # ---------------------------------------------------------------------- | 3 | # ---------------------------------------------------------------------- |
| 4 | # | 4 | # |
| 5 | # Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, | 5 | # Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 6 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 6 | # 2009, 2010 Free Software Foundation, Inc. |
| 7 | # | 7 | # |
| 8 | # This file is part of GNU Emacs. | 8 | # This file is part of GNU Emacs. |
| 9 | # | 9 | # |
| @@ -17,6 +17,7 @@ | |||
| 17 | # | 17 | # |
| 18 | # ---------------------------------------------------------------------- | 18 | # ---------------------------------------------------------------------- |
| 19 | /^#undef HAVE_X_WINDOWS *$/s/undef/define/ | 19 | /^#undef HAVE_X_WINDOWS *$/s/undef/define/ |
| 20 | /^#undef HAVE_WINDOW_SYSTEM *$/s/undef/define/ | ||
| 20 | /^#undef HAVE_X11 *$/s/undef/define/ | 21 | /^#undef HAVE_X11 *$/s/undef/define/ |
| 21 | /^#undef HAVE_X_MENU *$/s/undef/define/ | 22 | /^#undef HAVE_X_MENU *$/s/undef/define/ |
| 22 | /^#undef HAVE_XSCREENNUMBEROFSCREEN *$/s/undef/define/ | 23 | /^#undef HAVE_XSCREENNUMBEROFSCREEN *$/s/undef/define/ |
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index d5a4a3335be..323029ecf39 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | /^GETOPT_H *=/s!@GETOPT_H@!getopt.h! | 45 | /^GETOPT_H *=/s!@GETOPT_H@!getopt.h! |
| 46 | /^GETOPTOBJS *=/s!@GETOPTOBJS@!getopt.o getopt1.o! | 46 | /^GETOPTOBJS *=/s!@GETOPTOBJS@!getopt.o getopt1.o! |
| 47 | /^INSTALLABLES/s/emacsclient *// | 47 | /^INSTALLABLES/s/emacsclient *// |
| 48 | /^INSTALLABLES/s/ @LIB_SRC_EXTRA_INSTALLABLES@// | ||
| 49 | s!^ \./! ! | 48 | s!^ \./! ! |
| 50 | /^UTILITIES=/s/ wakeup// | 49 | /^UTILITIES=/s/ wakeup// |
| 51 | /^UTILITIES=/s/ movemail// | 50 | /^UTILITIES=/s/ movemail// |
diff --git a/msdos/sed3x.inp b/msdos/sed3x.inp new file mode 100644 index 00000000000..71148c9800d --- /dev/null +++ b/msdos/sed3x.inp | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | # -sed3x.inp------------------------------------------------------------ | ||
| 2 | # Extra configuration script for lib-src/makefile for DesqView/X | ||
| 3 | # ---------------------------------------------------------------------- | ||
| 4 | /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! | ||
| 5 | |||
diff --git a/nt/ChangeLog b/nt/ChangeLog index bbaaa0d136d..6db0eb744c9 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-05-13 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs. | ||
| 4 | |||
| 1 | 2010-05-07 Chong Yidong <cyd@stupidchicken.com> | 5 | 2010-05-07 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * Version 23.2 released. | 7 | * Version 23.2 released. |
| @@ -112,7 +116,7 @@ | |||
| 112 | * config.nt (HAVE_FACES): Remove, unused. | 116 | * config.nt (HAVE_FACES): Remove, unused. |
| 113 | 117 | ||
| 114 | 2008-06-26 Juanma Barranquero <lekktu@gmail.com> | 118 | 2008-06-26 Juanma Barranquero <lekktu@gmail.com> |
| 115 | Eli Zaretskii <eliz@gnu.org> | 119 | Eli Zaretskii <eliz@gnu.org> |
| 116 | 120 | ||
| 117 | * nmake.defs (FONT_CFLAGS): | 121 | * nmake.defs (FONT_CFLAGS): |
| 118 | * gmake.defs (FONT_CFLAGS): Remove. | 122 | * gmake.defs (FONT_CFLAGS): Remove. |
| @@ -128,7 +132,7 @@ | |||
| 128 | * config.nt: Remove reference to UNEXEC_SRC. | 132 | * config.nt: Remove reference to UNEXEC_SRC. |
| 129 | 133 | ||
| 130 | 2008-06-23 Juanma Barranquero <lekktu@gmail.com> | 134 | 2008-06-23 Juanma Barranquero <lekktu@gmail.com> |
| 131 | Eli Zaretskii <eliz@gnu.org> | 135 | Eli Zaretskii <eliz@gnu.org> |
| 132 | 136 | ||
| 133 | * gmake.defs (DEBUG_FLAG, DEBUG_LINK) [!NODEBUG]: | 137 | * gmake.defs (DEBUG_FLAG, DEBUG_LINK) [!NODEBUG]: |
| 134 | Don't hardcode -gstabs+, use DEBUG_INFO. | 138 | Don't hardcode -gstabs+, use DEBUG_INFO. |
diff --git a/nt/config.nt b/nt/config.nt index 9e223573ea3..7ec98fb7666 100644 --- a/nt/config.nt +++ b/nt/config.nt | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* GNU Emacs site configuration template file. -*- C -*- | 1 | /* GNU Emacs site configuration template file. -*- C -*- |
| 2 | Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, | 2 | |
| 3 | 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, |
| 4 | 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -318,20 +319,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 318 | 319 | ||
| 319 | #define subprocesses | 320 | #define subprocesses |
| 320 | 321 | ||
| 321 | /* Define LD_SWITCH_X_SITE to contain any special flags your loader | ||
| 322 | may need to deal with X Windows. For instance, if you've defined | ||
| 323 | HAVE_X_WINDOWS above and your X libraries aren't in a place that | ||
| 324 | your loader can find on its own, you might want to add "-L/..." or | ||
| 325 | something similar. */ | ||
| 326 | #undef LD_SWITCH_X_SITE | ||
| 327 | |||
| 328 | /* Define C_SWITCH_X_SITE to contain any special flags your compiler | ||
| 329 | may need to deal with X Windows. For instance, if you've defined | ||
| 330 | HAVE_X_WINDOWS above and your X include files aren't in a place | ||
| 331 | that your compiler can find on its own, you might want to add | ||
| 332 | "-I/..." or something similar. */ | ||
| 333 | #undef C_SWITCH_X_SITE | ||
| 334 | |||
| 335 | /* Define STACK_DIRECTION here, but not if m/foo.h did. */ | 322 | /* Define STACK_DIRECTION here, but not if m/foo.h did. */ |
| 336 | #ifndef STACK_DIRECTION | 323 | #ifndef STACK_DIRECTION |
| 337 | #undef STACK_DIRECTION | 324 | #undef STACK_DIRECTION |
diff --git a/src/ChangeLog b/src/ChangeLog index 084276a9f11..51a63c046c7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -17,6 +17,91 @@ | |||
| 17 | (next_element_from_composition): Pay attention to | 17 | (next_element_from_composition): Pay attention to |
| 18 | IT->cmp_it.reversed_p. | 18 | IT->cmp_it.reversed_p. |
| 19 | 19 | ||
| 20 | 2010-05-14 Kenichi Handa <handa@m17n.org> | ||
| 21 | |||
| 22 | * font.c (font_range): Return the range for the font found at | ||
| 23 | first. | ||
| 24 | |||
| 25 | 2010-05-14 Glenn Morris <rgm@gnu.org> | ||
| 26 | |||
| 27 | * Makefile.in (mktime, X11, register): Move undefs to configure. | ||
| 28 | |||
| 29 | * Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it. | ||
| 30 | (MSDOS_X_OBJ): New variable. | ||
| 31 | (MSDOS_SUPPORT_REAL): New constant. | ||
| 32 | (MSDOS_SUPPORT): Set as a variable, not with cpp. | ||
| 33 | (obj): Use MSDOS_X_OBJ. | ||
| 34 | (lisp): Use MSDOS_SUPPORT as a variable. | ||
| 35 | |||
| 36 | * Makefile.in (REAL_MOUSE_SUPPORT): New constant. | ||
| 37 | (GPM_MOUSE_SUPPORT): Now it's a constant. | ||
| 38 | (MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): Set with configure, | ||
| 39 | not cpp. | ||
| 40 | |||
| 41 | * Makefile.in (@NS_IMPL_GNUSTEP_INC@): Use in place of #ifdef. | ||
| 42 | (ns_appresdir): Remove, unused. | ||
| 43 | |||
| 44 | * Makefile.in (SHELL): Move outside cpp section. | ||
| 45 | |||
| 46 | * s/netbsd.h (AMPERSAND_FULL_NAME): Remove (defined in AH_BOTTOM). | ||
| 47 | |||
| 48 | 2010-05-13 Glenn Morris <rgm@gnu.org> | ||
| 49 | |||
| 50 | * Makefile.in (FONT_DRIVERS): Place with other HAVE_X_WINDOWS stuff. | ||
| 51 | (TOOLTIP_SUPPORT): Place with other HAVE_WINDOW_SYSTEM stuff. | ||
| 52 | |||
| 53 | * Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined, | ||
| 54 | HAVE_WINDOW_SYSTEM must be too. | ||
| 55 | |||
| 56 | * Makefile.in (WINNT_SUPPORT): Remove, nt build does not use this file. | ||
| 57 | (lisp): Remove WINNT_SUPPORT. | ||
| 58 | |||
| 59 | * Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]: | ||
| 60 | Let configure set these variables (to empty) in this case as well. | ||
| 61 | |||
| 62 | * Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp. | ||
| 63 | (LIBX_BASE): Use $LD_SWITCH_X_SITE. | ||
| 64 | |||
| 65 | * Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) | ||
| 66 | (LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS) | ||
| 67 | (FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS) | ||
| 68 | (M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM) | ||
| 69 | (LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold | ||
| 70 | the values output by configure. | ||
| 71 | (ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables. | ||
| 72 | |||
| 73 | 2010-05-12 Glenn Morris <rgm@gnu.org> | ||
| 74 | |||
| 75 | * Makefile.in (YMF_PASS_LDFLAGS, LD, LINKER): Simplify the logic. | ||
| 76 | (LINKER_WAS_SPECIFIED): Remove. | ||
| 77 | |||
| 78 | * Makefile.in (LIB_GCC): Set using configure, not cpp. | ||
| 79 | (GNULIB_VAR) [!ORDINARY_LINK]: Always set to $LIB_GCC. | ||
| 80 | * m/arm.h (LIB_GCC) [GNU_LINUX]: | ||
| 81 | * s/cygwin.h (LIB_GCC): | ||
| 82 | * s/freebsd.h (LIB_GCC): | ||
| 83 | * s/gnu-linux.h (LIB_GCC): | ||
| 84 | * s/msdos.h (LIB_GCC): | ||
| 85 | * s/netbsd.h (LIB_GCC): | ||
| 86 | Move to configure. | ||
| 87 | |||
| 88 | 2010-05-11 Karel Klic <kklic@redhat.com> | ||
| 89 | |||
| 90 | * ftfont.c: Fix incorrect parentheses of #if condition for | ||
| 91 | definining M17N_FLT_USE_NEW_FEATURE. | ||
| 92 | |||
| 93 | 2010-05-11 Glenn Morris <rgm@gnu.org> | ||
| 94 | |||
| 95 | * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. | ||
| 96 | * s/msdos.h (MSDOS_LIBS_SYSTEM): Remove. | ||
| 97 | |||
| 98 | 2010-05-10 Eli Zaretskii <eliz@gnu.org> | ||
| 99 | |||
| 100 | * xdisp.c (init_iterator): Don't turn on bidi reordering in | ||
| 101 | unibyte buffers. See | ||
| 102 | http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html. | ||
| 103 | >>>>>>> MERGE-SOURCE | ||
| 104 | |||
| 20 | 2010-05-10 Glenn Morris <rgm@gnu.org> | 105 | 2010-05-10 Glenn Morris <rgm@gnu.org> |
| 21 | 106 | ||
| 22 | * Makefile.in (LIBS_SYSTEM): Set using configure, not cpp. | 107 | * Makefile.in (LIBS_SYSTEM): Set using configure, not cpp. |
| @@ -750,7 +835,7 @@ | |||
| 750 | (Frename_file): Preserve selinux context when renaming by copy-file. | 835 | (Frename_file): Preserve selinux context when renaming by copy-file. |
| 751 | 836 | ||
| 752 | 2010-04-21 Juanma Barranquero <lekktu@gmail.com> | 837 | 2010-04-21 Juanma Barranquero <lekktu@gmail.com> |
| 753 | Eli Zaretskii <eliz@gnu.org> | 838 | Eli Zaretskii <eliz@gnu.org> |
| 754 | 839 | ||
| 755 | Don't depend on cm.c or termcap.c on Windows, use stubs. | 840 | Don't depend on cm.c or termcap.c on Windows, use stubs. |
| 756 | * makefile.w32-in (OBJ1): Remove cm.$(O) and termcap.$(O). | 841 | * makefile.w32-in (OBJ1): Remove cm.$(O) and termcap.$(O). |
| @@ -8941,7 +9026,7 @@ | |||
| 8941 | <after-change-functions>: Reflow docstrings. | 9026 | <after-change-functions>: Reflow docstrings. |
| 8942 | 9027 | ||
| 8943 | 2008-08-04 Adrian Robert <Adrian.B.Robert@gmail.com> | 9028 | 2008-08-04 Adrian Robert <Adrian.B.Robert@gmail.com> |
| 8944 | Ken Raeburn <raeburn@gnu.org> | 9029 | Ken Raeburn <raeburn@gnu.org> |
| 8945 | 9030 | ||
| 8946 | Dock menu customization, based on a patch by Ken Raeburn, plus some | 9031 | Dock menu customization, based on a patch by Ken Raeburn, plus some |
| 8947 | other fixes. | 9032 | other fixes. |
| @@ -10006,7 +10091,7 @@ | |||
| 10006 | batch-compiling for bootstrap). | 10091 | batch-compiling for bootstrap). |
| 10007 | 10092 | ||
| 10008 | 2008-07-15 Chris Hall <chris@web.workinglinux.com> (tiny change) | 10093 | 2008-07-15 Chris Hall <chris@web.workinglinux.com> (tiny change) |
| 10009 | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 10094 | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 10010 | 10095 | ||
| 10011 | (make_initial_frame): Call init_frame_faces(f) in CANNOT_DUMP case -- | 10096 | (make_initial_frame): Call init_frame_faces(f) in CANNOT_DUMP case -- |
| 10012 | fix crash due to different init order. | 10097 | fix crash due to different init order. |
| @@ -10624,7 +10709,7 @@ | |||
| 10624 | (USG_SHARED_LIBRARIES): Remove duplicate definition. | 10709 | (USG_SHARED_LIBRARIES): Remove duplicate definition. |
| 10625 | 10710 | ||
| 10626 | 2008-06-26 Juanma Barranquero <lekktu@gmail.com> | 10711 | 2008-06-26 Juanma Barranquero <lekktu@gmail.com> |
| 10627 | Eli Zaretskii <eliz@gnu.org> | 10712 | Eli Zaretskii <eliz@gnu.org> |
| 10628 | 10713 | ||
| 10629 | * makefile.w32-in (LOCAL_FLAGS): | 10714 | * makefile.w32-in (LOCAL_FLAGS): |
| 10630 | Don't include WINDOWSNT, DOS_NT and _UCHAR_T. | 10715 | Don't include WINDOWSNT, DOS_NT and _UCHAR_T. |
| @@ -10872,7 +10957,7 @@ | |||
| 10872 | the property of LFACE_FONT of LFACE (if any). | 10957 | the property of LFACE_FONT of LFACE (if any). |
| 10873 | 10958 | ||
| 10874 | 2008-06-21 Seiji Zenitani <zenitani@mac.com> | 10959 | 2008-06-21 Seiji Zenitani <zenitani@mac.com> |
| 10875 | Ryo Yoshitake <ryo@shiftmode.net> | 10960 | Ryo Yoshitake <ryo@shiftmode.net> |
| 10876 | 10961 | ||
| 10877 | * xterm.c (x_set_frame_alpha): Add x_catch_errors for bug#437. | 10962 | * xterm.c (x_set_frame_alpha): Add x_catch_errors for bug#437. |
| 10878 | 10963 | ||
| @@ -11968,7 +12053,7 @@ | |||
| 11968 | * xterm.c (x_set_frame_alpha): Move declarations before statements. | 12053 | * xterm.c (x_set_frame_alpha): Move declarations before statements. |
| 11969 | 12054 | ||
| 11970 | 2008-05-21 Seiji Zenitani <zenitani@mac.com> | 12055 | 2008-05-21 Seiji Zenitani <zenitani@mac.com> |
| 11971 | Ryo Yoshitake <ryo@shiftmode.net> | 12056 | Ryo Yoshitake <ryo@shiftmode.net> |
| 11972 | 12057 | ||
| 11973 | * frame.c (Qalpha): Add a new frame parameter `alpha'. | 12058 | * frame.c (Qalpha): Add a new frame parameter `alpha'. |
| 11974 | (Vframe_alpha_lower_limit): New variable. | 12059 | (Vframe_alpha_lower_limit): New variable. |
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1 index 921123f236a..8b4a9afbc6c 100644 --- a/src/ChangeLog.1 +++ b/src/ChangeLog.1 | |||
| @@ -1187,7 +1187,7 @@ | |||
| 1187 | prompt. | 1187 | prompt. |
| 1188 | (various): Pass window being displayed as arg to vmotion. | 1188 | (various): Pass window being displayed as arg to vmotion. |
| 1189 | (various): Compute starting-hpos arg to compute_motion | 1189 | (various): Compute starting-hpos arg to compute_motion |
| 1190 | using minibuf_prompt_width if in minibuf starting at top. | 1190 | using minibuf_prompt_width if in minibuf starting at top. |
| 1191 | 1191 | ||
| 1192 | * window.c (Fdisplay_buffer & callers): | 1192 | * window.c (Fdisplay_buffer & callers): |
| 1193 | Take second arg, non-nil means do not use selected window | 1193 | Take second arg, non-nil means do not use selected window |
| @@ -1645,8 +1645,8 @@ | |||
| 1645 | Use signal, not sigset, since we simulate signal on | 1645 | Use signal, not sigset, since we simulate signal on |
| 1646 | all system versions when nec. | 1646 | all system versions when nec. |
| 1647 | 1647 | ||
| 1648 | * buffer.c (syms_of_buffer, init_buffer_once, | 1648 | * buffer.c (syms_of_buffer, init_buffer_once) |
| 1649 | reset_buffer_local_variables): | 1649 | (reset_buffer_local_variables): |
| 1650 | Define default-abbrev-mode, and init new buffers' abbrev-mode | 1650 | Define default-abbrev-mode, and init new buffers' abbrev-mode |
| 1651 | from it. Move definition of abbrev-mode here from abbrev.c. | 1651 | from it. Move definition of abbrev-mode here from abbrev.c. |
| 1652 | 1652 | ||
| @@ -2861,7 +2861,7 @@ | |||
| 2861 | * keymap.c, callint.c, minibuf.c, fns.c, commands.h: | 2861 | * keymap.c, callint.c, minibuf.c, fns.c, commands.h: |
| 2862 | Rename MinbufLocalMap to Vminibuffer_local_map, etc. | 2862 | Rename MinbufLocalMap to Vminibuffer_local_map, etc. |
| 2863 | Rename minibuf-local-{,-ns,-completion,must-match}map, | 2863 | Rename minibuf-local-{,-ns,-completion,must-match}map, |
| 2864 | and DefLispVar them (document even!). | 2864 | and DefLispVar them (document even!). |
| 2865 | => New lisp variables minibuffer-local-map, minibuffer-local-ns-map, | 2865 | => New lisp variables minibuffer-local-map, minibuffer-local-ns-map, |
| 2866 | minibuffer-local-completion-map, minibuffer-local-must-match-map. | 2866 | minibuffer-local-completion-map, minibuffer-local-must-match-map. |
| 2867 | 2867 | ||
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index 265cc95e60d..7313f56ae8e 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 | |||
| @@ -984,7 +984,7 @@ | |||
| 984 | 1988-01-06 Richard Stallman (rms@frosted-flakes) | 984 | 1988-01-06 Richard Stallman (rms@frosted-flakes) |
| 985 | 985 | ||
| 986 | * s-hpux.h: Don't define nomultiplejobs, LDAV_SYMBOL, LIBS_DEBUG | 986 | * s-hpux.h: Don't define nomultiplejobs, LDAV_SYMBOL, LIBS_DEBUG |
| 987 | or BROKEN_FIONREAD. | 987 | or BROKEN_FIONREAD. |
| 988 | * m-hp9000s300.h: Define those four. | 988 | * m-hp9000s300.h: Define those four. |
| 989 | * s-hpux.h: Define BSTRING, and define bcopy, etc., as macros. | 989 | * s-hpux.h: Define BSTRING, and define bcopy, etc., as macros. |
| 990 | 990 | ||
| @@ -2817,7 +2817,7 @@ | |||
| 2817 | 1986-11-26 Richard M. Stallman (rms@prep) | 2817 | 1986-11-26 Richard M. Stallman (rms@prep) |
| 2818 | 2818 | ||
| 2819 | * sysdep.c (get_system_name): | 2819 | * sysdep.c (get_system_name): |
| 2820 | Eliminate internal static var in USG case. | 2820 | Eliminate internal static var in USG case. |
| 2821 | 2821 | ||
| 2822 | * lisp.h: New case testing and conversion macros | 2822 | * lisp.h: New case testing and conversion macros |
| 2823 | UPPERCASEP, LOWERCASEP, NOCASEP, UPCASE, DOWNCASE. | 2823 | UPPERCASEP, LOWERCASEP, NOCASEP, UPCASE, DOWNCASE. |
| @@ -3852,7 +3852,7 @@ | |||
| 3852 | (so now (let ((case-fold-search t))) doesn't force buffer-localness) | 3852 | (so now (let ((case-fold-search t))) doesn't force buffer-localness) |
| 3853 | However, setting a binding will still make it buffer-local. | 3853 | However, setting a binding will still make it buffer-local. |
| 3854 | (ie (let ((case-fold-search t)) (setq case-fold-search t)) | 3854 | (ie (let ((case-fold-search t)) (setq case-fold-search t)) |
| 3855 | will cause case-fold-search be buffer-local even outside the let) | 3855 | will cause case-fold-search be buffer-local even outside the let) |
| 3856 | 3856 | ||
| 3857 | * xfns.c: | 3857 | * xfns.c: |
| 3858 | Preserve studlycaps: "Gnuemacs" => "GNU Emacs" | 3858 | Preserve studlycaps: "Gnuemacs" => "GNU Emacs" |
| @@ -4452,16 +4452,16 @@ | |||
| 4452 | * search.c (Freplace_match): Delete unused some_multiletter_word init. | 4452 | * search.c (Freplace_match): Delete unused some_multiletter_word init. |
| 4453 | * alloc.c (gc_sweep): Delete unused next initializers. | 4453 | * alloc.c (gc_sweep): Delete unused next initializers. |
| 4454 | * fns.c (concat): After error on non-int elt for string, | 4454 | * fns.c (concat): After error on non-int elt for string, |
| 4455 | do store the new value from the error handler. | 4455 | do store the new value from the error handler. |
| 4456 | * lread.c (read1): Comment out unused end =. | 4456 | * lread.c (read1): Comment out unused end =. |
| 4457 | * lread.c (read_list): Delete unused tail =. | 4457 | * lread.c (read_list): Delete unused tail =. |
| 4458 | * data.c (Fmake_variable_buffer_local): | 4458 | * data.c (Fmake_variable_buffer_local): |
| 4459 | If value type is Lisp_Some_Buffer_Local_Value, | 4459 | If value type is Lisp_Some_Buffer_Local_Value, |
| 4460 | change it to Lisp_Buffer_Local_Value permanently. | 4460 | change it to Lisp_Buffer_Local_Value permanently. |
| 4461 | * undo.c (record_block): Delete unused cp =. | 4461 | * undo.c (record_block): Delete unused cp =. |
| 4462 | Don't bother reallocing if n = 0 after first batch. | 4462 | Don't bother reallocing if n = 0 after first batch. |
| 4463 | * fileio.c (Fverify_visited_file_modtime): | 4463 | * fileio.c (Fverify_visited_file_modtime): |
| 4464 | If CHECK_BUFFER changes buf, use the changed value. | 4464 | If CHECK_BUFFER changes buf, use the changed value. |
| 4465 | 4465 | ||
| 4466 | 1986-07-07 Richard M. Stallman (rms@prep) | 4466 | 1986-07-07 Richard M. Stallman (rms@prep) |
| 4467 | 4467 | ||
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index fbe3f752aed..241019b51c7 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 | |||
| @@ -14197,7 +14197,7 @@ | |||
| 14197 | 1989-12-14 Joseph Arceneaux (jla@spiff) | 14197 | 1989-12-14 Joseph Arceneaux (jla@spiff) |
| 14198 | 14198 | ||
| 14199 | * xfns.c: New variable Vx_no_window_manager. | 14199 | * xfns.c: New variable Vx_no_window_manager. |
| 14200 | (Fx_track_pointer): If bufp < 0, abort. | 14200 | (Fx_track_pointer): If bufp < 0, abort. |
| 14201 | 14201 | ||
| 14202 | * xterm.c (XTread_socket): When leaving window, set x_mouse_x and | 14202 | * xterm.c (XTread_socket): When leaving window, set x_mouse_x and |
| 14203 | x_mouse_y to -1. | 14203 | x_mouse_y to -1. |
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4 index 4f5d0b29e4c..c853ad7b4a6 100644 --- a/src/ChangeLog.4 +++ b/src/ChangeLog.4 | |||
| @@ -4411,7 +4411,7 @@ | |||
| 4411 | 4411 | ||
| 4412 | * keyboard.c (read_key_sequence): Don't declare first_event; it is | 4412 | * keyboard.c (read_key_sequence): Don't declare first_event; it is |
| 4413 | no longer used. Change "#if 0" for first_event reading to | 4413 | no longer used. Change "#if 0" for first_event reading to |
| 4414 | "#if defined (GOBBLE_FIRST_EVENT)". | 4414 | "#if defined (GOBBLE_FIRST_EVENT)". |
| 4415 | 4415 | ||
| 4416 | 1993-10-03 Brian J. Fox (bfox@ai.mit.edu) | 4416 | 1993-10-03 Brian J. Fox (bfox@ai.mit.edu) |
| 4417 | 4417 | ||
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index d30bd1bdb00..e4991971461 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 | |||
| @@ -6107,7 +6107,7 @@ | |||
| 6107 | * fileio.c (Fmake_symbolic_link, Ffile_accessible_directory_p, | 6107 | * fileio.c (Fmake_symbolic_link, Ffile_accessible_directory_p, |
| 6108 | Finsert_file_contents, auto_save_error, Fwrite_region): Likewise. | 6108 | Finsert_file_contents, auto_save_error, Fwrite_region): Likewise. |
| 6109 | (Fcopy_file, build_annotations, Fdo_auto_save): Delete unused | 6109 | (Fcopy_file, build_annotations, Fdo_auto_save): Delete unused |
| 6110 | variables. | 6110 | variables. |
| 6111 | 6111 | ||
| 6112 | 1994-08-23 Richard Stallman <rms@mole.gnu.ai.mit.edu> | 6112 | 1994-08-23 Richard Stallman <rms@mole.gnu.ai.mit.edu> |
| 6113 | 6113 | ||
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9 index b161a21eb72..6e53a39ac93 100644 --- a/src/ChangeLog.9 +++ b/src/ChangeLog.9 | |||
| @@ -3913,7 +3913,7 @@ | |||
| 3913 | 2001-01-05 Gerd Moellmann <gerd@gnu.org> | 3913 | 2001-01-05 Gerd Moellmann <gerd@gnu.org> |
| 3914 | 3914 | ||
| 3915 | * sysdep.c: Don't prototype srandom; it takes an unsigned argument | 3915 | * sysdep.c: Don't prototype srandom; it takes an unsigned argument |
| 3916 | on some systems, and an unsigned long on others, like FreeBSD 4.1. | 3916 | on some systems, and an unsigned long on others, like FreeBSD 4.1. |
| 3917 | 3917 | ||
| 3918 | 2001-01-04 Gerd Moellmann <gerd@gnu.org> | 3918 | 2001-01-04 Gerd Moellmann <gerd@gnu.org> |
| 3919 | 3919 | ||
| @@ -5161,9 +5161,9 @@ | |||
| 5161 | `vertical-line', `mode-line' and `header-line' events. | 5161 | `vertical-line', `mode-line' and `header-line' events. |
| 5162 | 5162 | ||
| 5163 | * xdisp.c (try_window_id): Avoid starting to display in the middle | 5163 | * xdisp.c (try_window_id): Avoid starting to display in the middle |
| 5164 | of a character, a TAB for instance. This is easier than to set | 5164 | of a character, a TAB for instance. This is easier than to set |
| 5165 | up the iterator exactly, and it's not a frequent case, so the | 5165 | up the iterator exactly, and it's not a frequent case, so the |
| 5166 | additional effort wouldn't really pay off. | 5166 | additional effort wouldn't really pay off. |
| 5167 | 5167 | ||
| 5168 | 2000-11-26 Andrew Choi <akochoi@i-cable.com> | 5168 | 2000-11-26 Andrew Choi <akochoi@i-cable.com> |
| 5169 | 5169 | ||
| @@ -5196,9 +5196,9 @@ | |||
| 5196 | 2000-11-24 Gerd Moellmann <gerd@gnu.org> | 5196 | 2000-11-24 Gerd Moellmann <gerd@gnu.org> |
| 5197 | 5197 | ||
| 5198 | * xdisp.c (init_from_display_pos): If POS says we're already after | 5198 | * xdisp.c (init_from_display_pos): If POS says we're already after |
| 5199 | an overlay string ending at POS, make sure to pop the iterator | 5199 | an overlay string ending at POS, make sure to pop the iterator |
| 5200 | because it will be in front of that overlay string. When POS is | 5200 | because it will be in front of that overlay string. When POS is |
| 5201 | ZV, we've thereby also ``processed'' overlay strings at ZV. | 5201 | ZV, we've thereby also ``processed'' overlay strings at ZV. |
| 5202 | 5202 | ||
| 5203 | * xfaces.c (lface_from_face_name): Function comment fix. | 5203 | * xfaces.c (lface_from_face_name): Function comment fix. |
| 5204 | 5204 | ||
diff --git a/src/Makefile.in b/src/Makefile.in index 69e37fb236a..3a0339a3f70 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # Makefile for GNU Emacs. | 1 | # Makefile for GNU Emacs. |
| 2 | # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, | 2 | # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, |
| 3 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 3 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
| 4 | # Free Software Foundation, Inc. | 4 | # Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | # This file is part of GNU Emacs. | 6 | # This file is part of GNU Emacs. |
| 7 | 7 | ||
| @@ -30,6 +30,7 @@ | |||
| 30 | # Some of the conditionals might be dead now. Finding them and | 30 | # Some of the conditionals might be dead now. Finding them and |
| 31 | # deleting them would be fine. | 31 | # deleting them would be fine. |
| 32 | 32 | ||
| 33 | SHELL = /bin/sh | ||
| 33 | 34 | ||
| 34 | # Here are the things that we expect ../configure to edit. | 35 | # Here are the things that we expect ../configure to edit. |
| 35 | # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. | 36 | # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. |
| @@ -72,25 +73,59 @@ CRT_DIR=@CRT_DIR@ | |||
| 72 | C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ | 73 | C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ |
| 73 | ## System-specific CFLAGS. | 74 | ## System-specific CFLAGS. |
| 74 | C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ | 75 | C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ |
| 76 | |||
| 77 | ## Currently only set if NS_IMPL_GNUSTEP. | ||
| 78 | ## C_SWITCH_X_SITE may override this. | ||
| 79 | C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ | ||
| 80 | |||
| 81 | ## Define C_SWITCH_X_SITE to contain any special flags your compiler | ||
| 82 | ## may need to deal with X Windows. For instance, if you've defined | ||
| 83 | ## HAVE_X_WINDOWS and your X include files aren't in a place that your | ||
| 84 | ## compiler can find on its own, you might want to add "-I/..." or | ||
| 85 | ## something similar. This is normally set by configure. | ||
| 86 | ## This is used before C_SWITCH_X_SYSTEM and may override it. | ||
| 87 | C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ | ||
| 88 | |||
| 89 | ## Define LD_SWITCH_X_SITE to contain any special flags your loader | ||
| 90 | ## may need to deal with X Windows. For instance, if your X libraries | ||
| 91 | ## aren't in a place that your loader can find on its own, you might | ||
| 92 | ## want to add "-L/..." or something similar. Only used if | ||
| 93 | ## HAVE_X_WINDOWS. | ||
| 94 | ## FIXME? configure sets a value for this, but it has never been | ||
| 95 | ## substituted in this or any other Makefile. Cf C_SWITCH_X_SITE. | ||
| 96 | LD_SWITCH_X_SITE= | ||
| 97 | |||
| 75 | ## This holds any special options for linking temacs only (ie, not | 98 | ## This holds any special options for linking temacs only (ie, not |
| 76 | ## used by configure). Not used elsewhere because it sometimes | 99 | ## used by configure). Not used elsewhere because it sometimes |
| 77 | ## contains options that have to do with using Emacs's crt0, | 100 | ## contains options that have to do with using Emacs's crt0, |
| 78 | ## which are only good with temacs. | 101 | ## which are only good with temacs. |
| 79 | LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ | 102 | LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ |
| 103 | |||
| 80 | ## Next two must come before LD_SWITCH_SYSTEM. | 104 | ## Next two must come before LD_SWITCH_SYSTEM. |
| 81 | ## If needed, a -R option that says where to find X windows at run time. | 105 | ## If needed, a -R option that says where to find X windows at run time. |
| 82 | LD_SWITCH_X_SITE_AUX=@LD_SWITCH_X_SITE_AUX@ | 106 | LD_SWITCH_X_SITE_AUX=@LD_SWITCH_X_SITE_AUX@ |
| 83 | ## As above, but using -rpath instead. | 107 | ## As above, but using -rpath instead. |
| 84 | LD_SWITCH_X_SITE_AUX_RPATH=@LD_SWITCH_X_SITE_AUX_RPATH@ | 108 | LD_SWITCH_X_SITE_AUX_RPATH=@LD_SWITCH_X_SITE_AUX_RPATH@ |
| 109 | |||
| 85 | ## System-specific LDFLAGS. | 110 | ## System-specific LDFLAGS. |
| 86 | LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@ | 111 | LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@ |
| 87 | LD_SWITCH_SYSTEM_EXTRA=@LD_SWITCH_SYSTEM_EXTRA@ | 112 | LD_SWITCH_SYSTEM_EXTRA=@LD_SWITCH_SYSTEM_EXTRA@ |
| 113 | |||
| 88 | ## Flags to pass to ld only for temacs. | 114 | ## Flags to pass to ld only for temacs. |
| 89 | TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_EXTRA) $(LD_SWITCH_SYSTEM_TEMACS) | 115 | TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_EXTRA) $(LD_SWITCH_SYSTEM_TEMACS) |
| 90 | 116 | ||
| 91 | ## Some systems define this to request special libraries. | 117 | ## Some systems define this to request special libraries. |
| 92 | LIBS_SYSTEM=@LIBS_SYSTEM@ | 118 | LIBS_SYSTEM=@LIBS_SYSTEM@ |
| 93 | 119 | ||
| 120 | ## Where to find libgcc.a, if using gcc and necessary. | ||
| 121 | LIB_GCC=@LIB_GCC@ | ||
| 122 | |||
| 123 | ## May use $CRT_DIR. | ||
| 124 | LIB_STANDARD=@LIB_STANDARD@ | ||
| 125 | |||
| 126 | ## -lm, or empty. | ||
| 127 | LIB_MATH=@LIB_MATH@ | ||
| 128 | |||
| 94 | LIBTIFF=@LIBTIFF@ | 129 | LIBTIFF=@LIBTIFF@ |
| 95 | LIBJPEG=@LIBJPEG@ | 130 | LIBJPEG=@LIBJPEG@ |
| 96 | LIBPNG=@LIBPNG@ | 131 | LIBPNG=@LIBPNG@ |
| @@ -99,6 +134,15 @@ LIBXPM=@LIBXPM@ | |||
| 99 | XFT_LIBS=@XFT_LIBS@ | 134 | XFT_LIBS=@XFT_LIBS@ |
| 100 | LIBX_EXTRA=$(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) -lX11 $(XFT_LIBS) | 135 | LIBX_EXTRA=$(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) -lX11 $(XFT_LIBS) |
| 101 | 136 | ||
| 137 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | ||
| 138 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | ||
| 139 | FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ | ||
| 140 | FREETYPE_LIBS = @FREETYPE_LIBS@ | ||
| 141 | LIBOTF_CFLAGS = @LIBOTF_CFLAGS@ | ||
| 142 | LIBOTF_LIBS = @LIBOTF_LIBS@ | ||
| 143 | M17N_FLT_CFLAGS = @M17N_FLT_CFLAGS@ | ||
| 144 | M17N_FLT_LIBS = @M17N_FLT_LIBS@ | ||
| 145 | |||
| 102 | DBUS_CFLAGS = @DBUS_CFLAGS@ | 146 | DBUS_CFLAGS = @DBUS_CFLAGS@ |
| 103 | DBUS_LIBS = @DBUS_LIBS@ | 147 | DBUS_LIBS = @DBUS_LIBS@ |
| 104 | DBUS_OBJ = @DBUS_OBJ@ | 148 | DBUS_OBJ = @DBUS_OBJ@ |
| @@ -140,15 +184,36 @@ WIDGET_OBJ=@WIDGET_OBJ@ | |||
| 140 | ## sheap.o if CYGWIN, otherwise empty. | 184 | ## sheap.o if CYGWIN, otherwise empty. |
| 141 | CYGWIN_OBJ=@CYGWIN_OBJ@ | 185 | CYGWIN_OBJ=@CYGWIN_OBJ@ |
| 142 | 186 | ||
| 187 | ## dosfns.o msdos.o if MSDOS. | ||
| 188 | MSDOS_OBJ = | ||
| 189 | ## w16select.o termcap.o if MSDOS && HAVE_X_WINDOWS. | ||
| 190 | MSDOS_X_OBJ = | ||
| 191 | MSDOS_SUPPORT_REAL = ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ | ||
| 192 | ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \ | ||
| 193 | ${lispsource}term/internal.elc ${lispsource}term/pc-win.elc | ||
| 194 | ## $MSDOS_SUPPORT_REAL if MSDOS. | ||
| 195 | MSDOS_SUPPORT = | ||
| 196 | |||
| 143 | NS_OBJ=@NS_OBJ@ | 197 | NS_OBJ=@NS_OBJ@ |
| 144 | NS_SUPPORT=@NS_SUPPORT@ | 198 | NS_SUPPORT=@NS_SUPPORT@ |
| 199 | ## Next two only set if NS_IMPL_GNUSTEP. | ||
| 200 | GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ | ||
| 201 | GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@ | ||
| 145 | 202 | ||
| 146 | ## Only used if HAVE_X_WINDOWS and HAVE_WINDOW_SYSTEM. | 203 | ## Only used if HAVE_X_WINDOWS. |
| 147 | FONT_OBJ=@FONT_OBJ@ | 204 | FONT_OBJ=@FONT_OBJ@ |
| 148 | 205 | ||
| 149 | ## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty. | 206 | ## Used if HAVE_MOUSE. |
| 150 | ## Not used if HAVE_MOUSE. | 207 | REAL_MOUSE_SUPPORT=${lispsource}mouse.elc ${lispsource}select.elc \ |
| 151 | GPM_MOUSE_SUPPORT=@GPM_MOUSE_SUPPORT@ | 208 | ${lispsource}scroll-bar.elc |
| 209 | ## Used if HAVE_GPM && !HAVE_MOUSE | ||
| 210 | GPM_MOUSE_SUPPORT=${lispsource}mouse.elc | ||
| 211 | LIBGPM = @LIBGPM@ | ||
| 212 | ## Either of the two preceding options, or empty. | ||
| 213 | MOUSE_SUPPORT=@MOUSE_SUPPORT@ | ||
| 214 | |||
| 215 | ## ${lispsource}tooltip.elc if HAVE_WINDOW_SYSTEM, else empty. | ||
| 216 | TOOLTIP_SUPPORT=@TOOLTIP_SUPPORT@ | ||
| 152 | 217 | ||
| 153 | BASE_WINDOW_SUPPORT=${lispsource}fringe.elc ${lispsource}image.elc \ | 218 | BASE_WINDOW_SUPPORT=${lispsource}fringe.elc ${lispsource}image.elc \ |
| 154 | ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ | 219 | ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ |
| @@ -157,6 +222,13 @@ BASE_WINDOW_SUPPORT=${lispsource}fringe.elc ${lispsource}image.elc \ | |||
| 157 | X_WINDOW_SUPPORT=${lispsource}x-dnd.elc ${lispsource}term/common-win.elc \ | 222 | X_WINDOW_SUPPORT=${lispsource}x-dnd.elc ${lispsource}term/common-win.elc \ |
| 158 | ${lispsource}term/x-win.elc ${lispsource}dynamic-setting.elc | 223 | ${lispsource}term/x-win.elc ${lispsource}dynamic-setting.elc |
| 159 | 224 | ||
| 225 | ## If HAVE_X_WINDOWS, both the above | ||
| 226 | ## else if HAVE_WINDOW_SYSTEM (ie, HAVE_NS) just the former; else empty. | ||
| 227 | WINDOW_SUPPORT=@WINDOW_SUPPORT@ | ||
| 228 | |||
| 229 | ## -lresolv, or empty. | ||
| 230 | LIBRESOLV = @LIBRESOLV@ | ||
| 231 | |||
| 160 | LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ | 232 | LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ |
| 161 | 233 | ||
| 162 | INTERVALS_H = dispextern.h intervals.h composite.h | 234 | INTERVALS_H = dispextern.h intervals.h composite.h |
| @@ -167,12 +239,11 @@ RUN_TEMACS = `/bin/pwd`/temacs | |||
| 167 | 239 | ||
| 168 | START_FILES = @START_FILES@ | 240 | START_FILES = @START_FILES@ |
| 169 | 241 | ||
| 242 | UNEXEC_OBJ = @unexec@ | ||
| 243 | |||
| 170 | # ========================== start of cpp stuff ======================= | 244 | # ========================== start of cpp stuff ======================= |
| 171 | /* From here on, comments must be done in C syntax. */ | 245 | /* From here on, comments must be done in C syntax. */ |
| 172 | 246 | ||
| 173 | /* just to be sure the sh is used */ | ||
| 174 | SHELL=/bin/sh | ||
| 175 | |||
| 176 | #define NOT_C_CODE | 247 | #define NOT_C_CODE |
| 177 | #include "config.h" | 248 | #include "config.h" |
| 178 | 249 | ||
| @@ -180,42 +251,13 @@ SHELL=/bin/sh | |||
| 180 | DEPFLAGS = -MMD -MF deps/$*.d | 251 | DEPFLAGS = -MMD -MF deps/$*.d |
| 181 | #endif | 252 | #endif |
| 182 | 253 | ||
| 183 | /* Do not let the file name mktime.c get messed up. */ | 254 | /* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here. */ |
| 184 | #ifdef mktime | 255 | @NS_IMPL_GNUSTEP_INC@ |
| 185 | #undef mktime | ||
| 186 | #endif | ||
| 187 | |||
| 188 | /* Use HAVE_X11 as an alias for X11 in this file | ||
| 189 | to avoid problems with X11 as a subdirectory name | ||
| 190 | in -I and other such options which pass through this file. */ | ||
| 191 | |||
| 192 | #ifdef X11 | ||
| 193 | #define HAVE_X11 | ||
| 194 | #undef X11 | ||
| 195 | #endif | ||
| 196 | |||
| 197 | /* On some machines #define register is done in config; | ||
| 198 | do not let it interfere with this file. */ | ||
| 199 | #undef register | ||
| 200 | |||
| 201 | /* This macro is for switches specifically related to X Windows. */ | ||
| 202 | #ifndef LD_SWITCH_X_SITE | ||
| 203 | #define LD_SWITCH_X_SITE | ||
| 204 | #endif | ||
| 205 | |||
| 206 | #ifdef NS_IMPL_GNUSTEP | ||
| 207 | /* Pull in stuff from GNUstep-make. */ | ||
| 208 | FOUNDATION_LIB=gnu | ||
| 209 | GUI_LIB=gnu | ||
| 210 | include @GNUSTEP_MAKEFILES@/Additional/base.make | ||
| 211 | include @GNUSTEP_MAKEFILES@/Additional/gui.make | ||
| 212 | shared=no | ||
| 213 | #endif | ||
| 214 | 256 | ||
| 215 | /* DO NOT use -R. There is a special hack described in lastfile.c | 257 | /* DO NOT use -R. There is a special hack described in lastfile.c |
| 216 | which is used instead. Some initialized data areas are modified | 258 | which is used instead. Some initialized data areas are modified |
| 217 | at initial startup, then labeled as part of the text area when | 259 | at initial startup, then labeled as part of the text area when |
| 218 | Emacs is dumped for the first time, and never changed again. */ | 260 | Emacs is dumped for the first time, and never changed again. */ |
| 219 | 261 | ||
| 220 | /* -Demacs is needed to make some files produce the correct version | 262 | /* -Demacs is needed to make some files produce the correct version |
| 221 | for use in Emacs. | 263 | for use in Emacs. |
| @@ -224,10 +266,10 @@ shared=no | |||
| 224 | the information in ``config.h''. */ | 266 | the information in ``config.h''. */ |
| 225 | 267 | ||
| 226 | /* C_SWITCH_X_SITE must come before C_SWITCH_X_SYSTEM | 268 | /* C_SWITCH_X_SITE must come before C_SWITCH_X_SYSTEM |
| 227 | since it may have -I options that should override those two. */ | 269 | since it may have -I options that should override those. */ |
| 228 | /* MYCPPFLAGS only referenced in etc/DEBUG. */ | 270 | /* MYCPPFLAGS only referenced in etc/DEBUG. */ |
| 229 | ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} ${C_SWITCH_MACHINE} ${C_SWITCH_SYSTEM} @C_SWITCH_X_SITE@ @C_SWITCH_X_SYSTEM@ ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS} | 271 | ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} ${C_SWITCH_MACHINE} ${C_SWITCH_SYSTEM} ${C_SWITCH_X_SITE} ${C_SWITCH_X_SYSTEM} ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} ${FREETYPE_CFLAGS} ${FONTCONFIG_CFLAGS} ${LIBOTF_CFLAGS} ${M17N_FLT_CFLAGS} ${DEPFLAGS} |
| 230 | ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ | 272 | ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) |
| 231 | 273 | ||
| 232 | .SUFFIXES: .m | 274 | .SUFFIXES: .m |
| 233 | .c.o: | 275 | .c.o: |
| @@ -242,29 +284,30 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ | |||
| 242 | $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< | 284 | $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< |
| 243 | 285 | ||
| 244 | #ifdef HAVE_X_WINDOWS | 286 | #ifdef HAVE_X_WINDOWS |
| 245 | /* This test needs to say in cpp for the time being, since s/msdos.h | ||
| 246 | defines HAVE_MENUS, and does not use the configure script. */ | ||
| 247 | #ifdef HAVE_MENUS | ||
| 248 | OLDXMENU=@OLDXMENU@ | 287 | OLDXMENU=@OLDXMENU@ |
| 249 | LIBXMENU=@LIBXMENU@ | 288 | LIBXMENU=@LIBXMENU@ |
| 250 | #else /* not HAVE_MENUS */ | ||
| 251 | OLDXMENU= | ||
| 252 | LIBXMENU= | ||
| 253 | #endif /* not HAVE_MENUS */ | ||
| 254 | |||
| 255 | LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) | 289 | LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) |
| 256 | LIBX_BASE=$(LIBXMENU) LD_SWITCH_X_SITE | 290 | LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) |
| 257 | LIBX_OTHER=@LIBX_OTHER@ | 291 | LIBX_OTHER=@LIBX_OTHER@ |
| 258 | #endif /* not HAVE_X_WINDOWS */ | 292 | FONT_DRIVERS=$(FONT_OBJ) |
| 293 | #endif /* HAVE_X_WINDOWS */ | ||
| 259 | 294 | ||
| 260 | #ifndef ORDINARY_LINK | ||
| 261 | /* Fix linking if compiled with GCC. */ | ||
| 262 | #ifdef __GNUC__ | ||
| 263 | 295 | ||
| 264 | #ifdef LINKER | 296 | /* A macro which other sections of Makefile can redefine to munge the |
| 265 | #define LINKER_WAS_SPECIFIED | 297 | flags before they are passed to LD. This is helpful if you have |
| 266 | #endif | 298 | redefined LD to something odd, like "gcc". |
| 299 | (The YMF prefix is a holdover from the old name "ymakefile".) */ | ||
| 300 | #define YMF_PASS_LDFLAGS(flags) flags | ||
| 301 | |||
| 302 | |||
| 303 | #ifdef ORDINARY_LINK | ||
| 304 | LD = $(CC) | ||
| 267 | 305 | ||
| 306 | #else /* not ORDINARY_LINK */ | ||
| 307 | GNULIB_VAR = $(LIB_GCC) | ||
| 308 | |||
| 309 | /* Fix linking if compiled with GCC. */ | ||
| 310 | #if defined (__GNUC__) && ! defined (LINKER) | ||
| 268 | /* Versions of GCC >= 2.0 put their library, libgcc.a, in obscure | 311 | /* Versions of GCC >= 2.0 put their library, libgcc.a, in obscure |
| 269 | places that are difficult to figure out at make time. Fortunately, | 312 | places that are difficult to figure out at make time. Fortunately, |
| 270 | these same versions allow you to pass arbitrary flags on to the | 313 | these same versions allow you to pass arbitrary flags on to the |
| @@ -273,78 +316,31 @@ LIBX_OTHER=@LIBX_OTHER@ | |||
| 273 | Well, it is not quite perfect. The "-nostdlib" keeps GCC from | 316 | Well, it is not quite perfect. The "-nostdlib" keeps GCC from |
| 274 | searching for libraries in its internal directories, so we have to | 317 | searching for libraries in its internal directories, so we have to |
| 275 | ask GCC explicitly where to find libgcc.a. */ | 318 | ask GCC explicitly where to find libgcc.a. */ |
| 276 | |||
| 277 | #ifndef LINKER | ||
| 278 | #define LINKER $(CC) -nostdlib | 319 | #define LINKER $(CC) -nostdlib |
| 279 | #endif | 320 | /* GCC passes any argument prefixed with -Xlinker directly to the linker. |
| 280 | 321 | See prefix-args.c for an explanation of why we do not do this with the | |
| 281 | #ifndef LIB_GCC | 322 | shell''s ``for'' construct. Note that sane people do not have '.' in |
| 282 | /* Ask GCC where to find libgcc.a. */ | 323 | their paths, so we must use ./prefix-args. */ |
| 283 | #define LIB_GCC `$(CC) -print-libgcc-file-name` | 324 | #undef YMF_PASS_LDFLAGS |
| 284 | #endif /* not LIB_GCC */ | ||
| 285 | |||
| 286 | GNULIB_VAR = LIB_GCC | ||
| 287 | |||
| 288 | #ifndef LINKER_WAS_SPECIFIED | ||
| 289 | /* GCC passes any argument prefixed with -Xlinker directly to the | ||
| 290 | linker. See prefix-args.c for an explanation of why we do not do | ||
| 291 | this with the shell''s ``for'' construct. | ||
| 292 | Note that some people do not have '.' in their paths, so we must | ||
| 293 | use ./prefix-args. */ | ||
| 294 | #define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags` | 325 | #define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags` |
| 295 | #else | 326 | #endif /* defined (__GNUC__) && ! defined (LINKER) */ |
| 296 | #define YMF_PASS_LDFLAGS(flags) flags | ||
| 297 | #endif | ||
| 298 | |||
| 299 | #else /* not __GNUC__ */ | ||
| 300 | GNULIB_VAR = | ||
| 301 | |||
| 302 | #endif /* not __GNUC__ */ | ||
| 303 | #endif /* not ORDINARY_LINK */ | ||
| 304 | 327 | ||
| 305 | #ifdef ORDINARY_LINK | ||
| 306 | LD = $(CC) | ||
| 307 | #else | ||
| 308 | #ifdef LINKER | 328 | #ifdef LINKER |
| 309 | LD=LINKER | 329 | LD=LINKER |
| 310 | #else /* not LINKER */ | 330 | #else /* not LINKER */ |
| 311 | LD=ld | 331 | LD=ld |
| 312 | #endif /* not LINKER */ | 332 | #endif /* not LINKER */ |
| 313 | #endif /* not ORDINARY_LINK */ | ||
| 314 | |||
| 315 | /* A macro which other sections of Makefile can redefine to munge the | ||
| 316 | flags before they are passed to LD. This is helpful if you have | ||
| 317 | redefined LD to something odd, like "gcc". | ||
| 318 | (The YMF prefix is a holdover from the old name "ymakefile".) | ||
| 319 | */ | ||
| 320 | #ifndef YMF_PASS_LDFLAGS | ||
| 321 | #define YMF_PASS_LDFLAGS(flags) flags | ||
| 322 | #endif | ||
| 323 | 333 | ||
| 324 | #ifdef MSDOS | 334 | #endif /* not ORDINARY_LINK */ |
| 325 | LIBS_SYSTEM = MSDOS_LIBS_SYSTEM | ||
| 326 | #ifdef HAVE_X_WINDOWS | ||
| 327 | MSDOS_OBJ = dosfns.o msdos.o | ||
| 328 | #else | ||
| 329 | MSDOS_OBJ = dosfns.o msdos.o w16select.o termcap.o | ||
| 330 | #endif | ||
| 331 | #endif | ||
| 332 | 335 | ||
| 333 | #ifdef HAVE_NS | 336 | #ifdef HAVE_NS |
| 334 | ns_appdir=@ns_appdir@/ | 337 | ns_appdir=@ns_appdir@/ |
| 335 | ns_appbindir=@ns_appbindir@/ | 338 | ns_appbindir=@ns_appbindir@/ |
| 336 | ns_appresdir=@ns_appresdir@/ | ||
| 337 | ns_appsrc=@ns_appsrc@ | 339 | ns_appsrc=@ns_appsrc@ |
| 338 | #endif /* HAVE_NS */ | 340 | #endif /* HAVE_NS */ |
| 339 | 341 | ||
| 340 | #ifdef HAVE_WINDOW_SYSTEM | 342 | /* lastfile must follow all files whose initialized data areas should |
| 341 | #ifdef HAVE_X_WINDOWS | 343 | be dumped as pure by dump-emacs. */ |
| 342 | FONT_DRIVERS=$(FONT_OBJ) | ||
| 343 | #endif /* HAVE_X_WINDOWS */ | ||
| 344 | #endif /* HAVE_WINDOW_SYSTEM */ | ||
| 345 | |||
| 346 | /* lastfile must follow all files | ||
| 347 | whose initialized data areas should be dumped as pure by dump-emacs. */ | ||
| 348 | obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ | 344 | obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ |
| 349 | charset.o coding.o category.o ccl.o character.o chartab.o bidi.o \ | 345 | charset.o coding.o category.o ccl.o character.o chartab.o bidi.o \ |
| 350 | cm.o term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ) \ | 346 | cm.o term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ) \ |
| @@ -354,15 +350,14 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ | |||
| 354 | cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \ | 350 | cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \ |
| 355 | alloc.o data.o doc.o editfns.o callint.o \ | 351 | alloc.o data.o doc.o editfns.o callint.o \ |
| 356 | eval.o floatfns.o fns.o font.o print.o lread.o \ | 352 | eval.o floatfns.o fns.o font.o print.o lread.o \ |
| 357 | syntax.o @unexec@ bytecode.o \ | 353 | syntax.o $(UNEXEC_OBJ) bytecode.o \ |
| 358 | process.o callproc.o \ | 354 | process.o callproc.o \ |
| 359 | region-cache.o sound.o atimer.o \ | 355 | region-cache.o sound.o atimer.o \ |
| 360 | doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \ | 356 | doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \ |
| 361 | $(MSDOS_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS) | 357 | $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS) |
| 362 | 358 | ||
| 363 | /* Object files used on some machine or other. | 359 | /* Object files used on some machine or other. |
| 364 | These go in the DOC file on all machines | 360 | These go in the DOC file on all machines in case they are needed. */ |
| 365 | in case they are needed there. */ | ||
| 366 | SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ | 361 | SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ |
| 367 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ | 362 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ |
| 368 | fontset.o dbusbind.o \ | 363 | fontset.o dbusbind.o \ |
| @@ -394,47 +389,6 @@ POST_ALLOC_OBJ=@POST_ALLOC_OBJ@ | |||
| 394 | otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \ | 389 | otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \ |
| 395 | $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS) | 390 | $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS) |
| 396 | 391 | ||
| 397 | #ifdef HAVE_MOUSE | ||
| 398 | #define MOUSE_SUPPORT ${lispsource}mouse.elc \ | ||
| 399 | ${lispsource}select.elc ${lispsource}scroll-bar.elc | ||
| 400 | #else | ||
| 401 | #define MOUSE_SUPPORT $(GPM_MOUSE_SUPPORT) | ||
| 402 | #endif | ||
| 403 | |||
| 404 | #ifdef MSDOS | ||
| 405 | #define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ | ||
| 406 | ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \ | ||
| 407 | ${lispsource}term/internal.elc ${lispsource}term/pc-win.elc | ||
| 408 | |||
| 409 | #else | ||
| 410 | #define MSDOS_SUPPORT | ||
| 411 | #endif | ||
| 412 | |||
| 413 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 414 | #ifdef HAVE_X_WINDOWS | ||
| 415 | #define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT) | ||
| 416 | #else | ||
| 417 | #define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) | ||
| 418 | #endif | ||
| 419 | #else | ||
| 420 | #define WINDOW_SUPPORT | ||
| 421 | #endif | ||
| 422 | |||
| 423 | #ifdef WINDOWSNT | ||
| 424 | #define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ | ||
| 425 | ${lispsource}dos-w32.elc ${lispsource}w32-vars.elc \ | ||
| 426 | ${lispsource}w32-fns.elc ${lispsource}term/common-win.elc \ | ||
| 427 | ${lispsource}term/w32-win.elc | ||
| 428 | #else | ||
| 429 | #define WINNT_SUPPORT | ||
| 430 | #endif | ||
| 431 | |||
| 432 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 433 | #define TOOLTIP_SUPPORT ${lispsource}tooltip.elc | ||
| 434 | #else | ||
| 435 | #define TOOLTIP_SUPPORT | ||
| 436 | #endif | ||
| 437 | |||
| 438 | /* This is the platform-specific list of Lisp files loaded into the | 392 | /* This is the platform-specific list of Lisp files loaded into the |
| 439 | dumped Emacs. It is arranged like this because it is easier to generate | 393 | dumped Emacs. It is arranged like this because it is easier to generate |
| 440 | it semi-mechanically from loadup.el this way. | 394 | it semi-mechanically from loadup.el this way. |
| @@ -468,7 +422,7 @@ lisp= \ | |||
| 468 | ${lispsource}files.elc \ | 422 | ${lispsource}files.elc \ |
| 469 | ${lispsource}format.elc \ | 423 | ${lispsource}format.elc \ |
| 470 | ${lispsource}facemenu.elc \ | 424 | ${lispsource}facemenu.elc \ |
| 471 | MOUSE_SUPPORT \ | 425 | ${MOUSE_SUPPORT} \ |
| 472 | ${lispsource}emacs-lisp/float-sup.elc \ | 426 | ${lispsource}emacs-lisp/float-sup.elc \ |
| 473 | ${lispsource}frame.elc \ | 427 | ${lispsource}frame.elc \ |
| 474 | ${lispsource}help.elc \ | 428 | ${lispsource}help.elc \ |
| @@ -531,10 +485,9 @@ lisp= \ | |||
| 531 | ${lispsource}vc-hooks.elc \ | 485 | ${lispsource}vc-hooks.elc \ |
| 532 | ${lispsource}ediff-hook.elc \ | 486 | ${lispsource}ediff-hook.elc \ |
| 533 | ${lispsource}epa-hook.elc \ | 487 | ${lispsource}epa-hook.elc \ |
| 534 | TOOLTIP_SUPPORT \ | 488 | ${TOOLTIP_SUPPORT} \ |
| 535 | MSDOS_SUPPORT \ | 489 | ${MSDOS_SUPPORT} \ |
| 536 | WINNT_SUPPORT \ | 490 | ${WINDOW_SUPPORT} \ |
| 537 | WINDOW_SUPPORT \ | ||
| 538 | ${NS_SUPPORT} \ | 491 | ${NS_SUPPORT} \ |
| 539 | ${lispsource}widget.elc \ | 492 | ${lispsource}widget.elc \ |
| 540 | ${lispsource}window.elc \ | 493 | ${lispsource}window.elc \ |
| @@ -654,10 +607,10 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \ | |||
| 654 | with GCC, we might need gnulib again after them. */ | 607 | with GCC, we might need gnulib again after them. */ |
| 655 | 608 | ||
| 656 | LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ | 609 | LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ |
| 657 | $(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ $(LIBS_SYSTEM) \ | 610 | $(RSVG_LIBS) $(DBUS_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ |
| 658 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \ | 611 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \ |
| 659 | @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ | 612 | $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ |
| 660 | $(GNULIB_VAR) @LIB_MATH@ @LIB_STANDARD@ $(GNULIB_VAR) | 613 | $(GNULIB_VAR) $(LIB_MATH) $(LIB_STANDARD) $(GNULIB_VAR) |
| 661 | 614 | ||
| 662 | all: emacs${EXEEXT} $(OTHER_FILES) | 615 | all: emacs${EXEEXT} $(OTHER_FILES) |
| 663 | 616 | ||
| @@ -702,7 +655,7 @@ buildobj.h: Makefile | |||
| 702 | temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} | 655 | temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} |
| 703 | #ifdef NS_IMPL_GNUSTEP | 656 | #ifdef NS_IMPL_GNUSTEP |
| 704 | $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ | 657 | $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ |
| 705 | -L@GNUSTEP_SYSTEM_LIBRARIES@ -lgnustep-gui -lgnustep-base \ | 658 | -L$(GNUSTEP_SYSTEM_LIBRARIES) -lgnustep-gui -lgnustep-base \ |
| 706 | -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs \ | 659 | -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs \ |
| 707 | ${obj} ${otherobj} ${LIBES} | 660 | ${obj} ${otherobj} ${LIBES} |
| 708 | #else | 661 | #else |
| @@ -716,9 +669,8 @@ prefix-args${EXEEXT}: prefix-args.o $(config_h) | |||
| 716 | 669 | ||
| 717 | #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK) | 670 | #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK) |
| 718 | 671 | ||
| 719 | /* We use stamp-xmenu with these two deps | 672 | /* We use stamp-xmenu with these two deps to both ensure that lwlib |
| 720 | to both ensure that lwlib gets remade based on its dependencies | 673 | gets remade based on its dependencies in its own makefile, |
| 721 | in its own makefile, | ||
| 722 | and remake temacs if lwlib gets changed by this. */ | 674 | and remake temacs if lwlib gets changed by this. */ |
| 723 | stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) | 675 | stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) |
| 724 | touch stamp-oldxmenu | 676 | touch stamp-oldxmenu |
| @@ -772,6 +724,8 @@ doc.o: buildobj.h | |||
| 772 | Eg callproc.c only depends on w32.h for WINDOWSNT builds. | 724 | Eg callproc.c only depends on w32.h for WINDOWSNT builds. |
| 773 | One way to fix this would be to replace w32.h (etc) by $(W32_H), | 725 | One way to fix this would be to replace w32.h (etc) by $(W32_H), |
| 774 | a variable set by configure. Does not seem worth the trouble. | 726 | a variable set by configure. Does not seem worth the trouble. |
| 727 | Since the w32 build does not even use this file, you might ask | ||
| 728 | why these dependencies are here at all... | ||
| 775 | 729 | ||
| 776 | nsgui.h: In fact, every .o file depends directly or indirectly on | 730 | nsgui.h: In fact, every .o file depends directly or indirectly on |
| 777 | dispextern.h and hence nsgui.h under NS. But the ones that actually | 731 | dispextern.h and hence nsgui.h under NS. But the ones that actually |
| @@ -981,8 +935,8 @@ xsmfns.o: xsmfns.c lisp.h $(config_h) systime.h sysselect.h termhooks.h xterm.h | |||
| 981 | xsettings.o: xterm.h xsettings.h lisp.h frame.h termhooks.h $(config_h) \ | 935 | xsettings.o: xterm.h xsettings.h lisp.h frame.h termhooks.h $(config_h) \ |
| 982 | dispextern.h keyboard.h systime.h coding.h composite.h blockinput.h atimer.h \ | 936 | dispextern.h keyboard.h systime.h coding.h composite.h blockinput.h atimer.h \ |
| 983 | termopts.h | 937 | termopts.h |
| 984 | /* The files of Lisp proper */ | ||
| 985 | 938 | ||
| 939 | /* The files of Lisp proper. */ | ||
| 986 | alloc.o: alloc.c process.h frame.h window.h buffer.h puresize.h syssignal.h \ | 940 | alloc.o: alloc.c process.h frame.h window.h buffer.h puresize.h syssignal.h \ |
| 987 | keyboard.h blockinput.h atimer.h systime.h character.h lisp.h $(config_h) \ | 941 | keyboard.h blockinput.h atimer.h systime.h character.h lisp.h $(config_h) \ |
| 988 | $(INTERVALS_H) termhooks.h | 942 | $(INTERVALS_H) termhooks.h |
| @@ -1004,7 +958,7 @@ lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \ | |||
| 1004 | charset.h lisp.h $(config_h) $(INTERVALS_H) termhooks.h coding.h msdos.h \ | 958 | charset.h lisp.h $(config_h) $(INTERVALS_H) termhooks.h coding.h msdos.h \ |
| 1005 | systime.h frame.h blockinput.h atimer.h | 959 | systime.h frame.h blockinput.h atimer.h |
| 1006 | 960 | ||
| 1007 | /* Text properties support */ | 961 | /* Text properties support. */ |
| 1008 | composite.o: composite.c buffer.h character.h coding.h font.h ccl.h \ | 962 | composite.o: composite.c buffer.h character.h coding.h font.h ccl.h \ |
| 1009 | frame.h termhooks.h $(INTERVALS_H) window.h lisp.h $(config_h) | 963 | frame.h termhooks.h $(INTERVALS_H) window.h lisp.h $(config_h) |
| 1010 | intervals.o: intervals.c buffer.h $(INTERVALS_H) keyboard.h puresize.h \ | 964 | intervals.o: intervals.c buffer.h $(INTERVALS_H) keyboard.h puresize.h \ |
| @@ -1015,8 +969,7 @@ textprop.o: textprop.c buffer.h window.h $(INTERVALS_H) \ | |||
| 1015 | #endif /* ! AUTO_DEPEND */ | 969 | #endif /* ! AUTO_DEPEND */ |
| 1016 | 970 | ||
| 1017 | /* System-specific programs to be made. | 971 | /* System-specific programs to be made. |
| 1018 | OTHER_FILES | 972 | OTHER_FILES select which of these should be compiled. */ |
| 1019 | select which of these should be compiled. */ | ||
| 1020 | 973 | ||
| 1021 | #ifdef HAVE_NS | 974 | #ifdef HAVE_NS |
| 1022 | ${ns_appdir}: ${ns_appsrc} | 975 | ${ns_appdir}: ${ns_appsrc} |
diff --git a/src/config.in b/src/config.in index 5fb0cd7d569..35530943682 100644 --- a/src/config.in +++ b/src/config.in | |||
| @@ -44,12 +44,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 44 | /* Define to 1 if using `getloadavg.c'. */ | 44 | /* Define to 1 if using `getloadavg.c'. */ |
| 45 | #undef C_GETLOADAVG | 45 | #undef C_GETLOADAVG |
| 46 | 46 | ||
| 47 | /* Define C_SWITCH_X_SITE to contain any special flags your compiler may need | ||
| 48 | to deal with X Windows. For instance, if you've defined HAVE_X_WINDOWS | ||
| 49 | above and your X include files aren't in a place that your compiler can | ||
| 50 | find on its own, you might want to add "-I/..." or something similar. */ | ||
| 51 | #undef C_SWITCH_X_SITE | ||
| 52 | |||
| 53 | /* Define to 1 for DGUX with <sys/dg_sys_info.h>. */ | 47 | /* Define to 1 for DGUX with <sys/dg_sys_info.h>. */ |
| 54 | #undef DGUX | 48 | #undef DGUX |
| 55 | 49 | ||
| @@ -488,6 +482,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 488 | /* Define to 1 if you have a working `mmap' system call. */ | 482 | /* Define to 1 if you have a working `mmap' system call. */ |
| 489 | #undef HAVE_MMAP | 483 | #undef HAVE_MMAP |
| 490 | 484 | ||
| 485 | /* Define if you have mouse support. */ | ||
| 486 | #undef HAVE_MOUSE | ||
| 487 | |||
| 491 | /* Define to 1 if you have the `mremap' function. */ | 488 | /* Define to 1 if you have the `mremap' function. */ |
| 492 | #undef HAVE_MREMAP | 489 | #undef HAVE_MREMAP |
| 493 | 490 | ||
| @@ -743,6 +740,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 743 | /* Define to 1 if you have the <vfork.h> header file. */ | 740 | /* Define to 1 if you have the <vfork.h> header file. */ |
| 744 | #undef HAVE_VFORK_H | 741 | #undef HAVE_VFORK_H |
| 745 | 742 | ||
| 743 | /* Define if you have a window system. */ | ||
| 744 | #undef HAVE_WINDOW_SYSTEM | ||
| 745 | |||
| 746 | /* Define to 1 if `fork' works. */ | 746 | /* Define to 1 if `fork' works. */ |
| 747 | #undef HAVE_WORKING_FORK | 747 | #undef HAVE_WORKING_FORK |
| 748 | 748 | ||
| @@ -804,12 +804,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 804 | /* Define to use Kerberos 5 instead of Kerberos 4. */ | 804 | /* Define to use Kerberos 5 instead of Kerberos 4. */ |
| 805 | #undef KERBEROS5 | 805 | #undef KERBEROS5 |
| 806 | 806 | ||
| 807 | /* Define LD_SWITCH_X_SITE to contain any special flags your loader may need | ||
| 808 | to deal with X Windows. For instance, if you've defined HAVE_X_WINDOWS | ||
| 809 | above and your X libraries aren't in a place that your loader can find on | ||
| 810 | its own, you might want to add "-L/..." or something similar. */ | ||
| 811 | #undef LD_SWITCH_X_SITE | ||
| 812 | |||
| 813 | /* Define to 1 if localtime caches TZ. */ | 807 | /* Define to 1 if localtime caches TZ. */ |
| 814 | #undef LOCALTIME_CACHE | 808 | #undef LOCALTIME_CACHE |
| 815 | 809 | ||
| @@ -1016,12 +1010,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1016 | #undef volatile | 1010 | #undef volatile |
| 1017 | 1011 | ||
| 1018 | 1012 | ||
| 1019 | /* If we're using X11/Carbon/GNUstep, define some consequences. */ | ||
| 1020 | #if defined(HAVE_X_WINDOWS) || defined(HAVE_NS) | ||
| 1021 | #define HAVE_WINDOW_SYSTEM | ||
| 1022 | #define HAVE_MOUSE | ||
| 1023 | #endif | ||
| 1024 | |||
| 1025 | /* Define AMPERSAND_FULL_NAME if you use the convention | 1013 | /* Define AMPERSAND_FULL_NAME if you use the convention |
| 1026 | that & in the full name stands for the login id. */ | 1014 | that & in the full name stands for the login id. */ |
| 1027 | /* Turned on June 1996 supposing nobody will mind it. */ | 1015 | /* Turned on June 1996 supposing nobody will mind it. */ |
| @@ -1046,7 +1034,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1046 | #endif | 1034 | #endif |
| 1047 | #endif /* __FreeBSD__ || __NetBSD__ || __linux__ */ | 1035 | #endif /* __FreeBSD__ || __NetBSD__ || __linux__ */ |
| 1048 | 1036 | ||
| 1049 | /* If using GNU, then support inline function declarations. */ | 1037 | /* If using GNU, then support inline function declarations. */ |
| 1050 | /* Don't try to switch on inline handling as detected by AC_C_INLINE | 1038 | /* Don't try to switch on inline handling as detected by AC_C_INLINE |
| 1051 | generally, because even if non-gcc compilers accept `inline', they | 1039 | generally, because even if non-gcc compilers accept `inline', they |
| 1052 | may reject `extern inline'. */ | 1040 | may reject `extern inline'. */ |
| @@ -1071,7 +1059,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1071 | /* Set up some defines, C and LD flags for NeXTstep interface on GNUstep. | 1059 | /* Set up some defines, C and LD flags for NeXTstep interface on GNUstep. |
| 1072 | (There is probably a better place to do this, but right now the Cocoa | 1060 | (There is probably a better place to do this, but right now the Cocoa |
| 1073 | side does this in s/darwin.h and we cannot | 1061 | side does this in s/darwin.h and we cannot |
| 1074 | parallel this exactly since GNUstep is multi-OS. */ | 1062 | parallel this exactly since GNUstep is multi-OS. */ |
| 1075 | #ifdef HAVE_NS | 1063 | #ifdef HAVE_NS |
| 1076 | # ifdef NS_IMPL_GNUSTEP | 1064 | # ifdef NS_IMPL_GNUSTEP |
| 1077 | /* GNUstep needs a bit more pure memory. Of the existing knobs, | 1065 | /* GNUstep needs a bit more pure memory. Of the existing knobs, |
| @@ -1168,7 +1156,7 @@ extern char *getenv (); | |||
| 1168 | #include "string.h" | 1156 | #include "string.h" |
| 1169 | #endif | 1157 | #endif |
| 1170 | #ifdef HAVE_STRINGS_H | 1158 | #ifdef HAVE_STRINGS_H |
| 1171 | #include "strings.h" /* May be needed for bcopy & al. */ | 1159 | #include "strings.h" /* May be needed for bcopy & al. */ |
| 1172 | #endif | 1160 | #endif |
| 1173 | #ifdef HAVE_STDLIB_H | 1161 | #ifdef HAVE_STDLIB_H |
| 1174 | #include <stdlib.h> | 1162 | #include <stdlib.h> |
diff --git a/src/font.c b/src/font.c index 2d55065e9c8..5ee51a6474c 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -3961,7 +3961,7 @@ font_range (pos, limit, w, face, string) | |||
| 3961 | struct face *face; | 3961 | struct face *face; |
| 3962 | Lisp_Object string; | 3962 | Lisp_Object string; |
| 3963 | { | 3963 | { |
| 3964 | EMACS_INT pos_byte, ignore, start, start_byte; | 3964 | EMACS_INT pos_byte, ignore; |
| 3965 | int c; | 3965 | int c; |
| 3966 | Lisp_Object font_object = Qnil; | 3966 | Lisp_Object font_object = Qnil; |
| 3967 | 3967 | ||
| @@ -3983,7 +3983,6 @@ font_range (pos, limit, w, face, string) | |||
| 3983 | pos_byte = string_char_to_byte (string, pos); | 3983 | pos_byte = string_char_to_byte (string, pos); |
| 3984 | } | 3984 | } |
| 3985 | 3985 | ||
| 3986 | start = pos, start_byte = pos_byte; | ||
| 3987 | while (pos < *limit) | 3986 | while (pos < *limit) |
| 3988 | { | 3987 | { |
| 3989 | Lisp_Object category; | 3988 | Lisp_Object category; |
| @@ -3992,6 +3991,10 @@ font_range (pos, limit, w, face, string) | |||
| 3992 | FETCH_CHAR_ADVANCE_NO_CHECK (c, pos, pos_byte); | 3991 | FETCH_CHAR_ADVANCE_NO_CHECK (c, pos, pos_byte); |
| 3993 | else | 3992 | else |
| 3994 | FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, string, pos, pos_byte); | 3993 | FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, string, pos, pos_byte); |
| 3994 | category = CHAR_TABLE_REF (Vunicode_category_table, c); | ||
| 3995 | if (EQ (category, QCf) | ||
| 3996 | || CHAR_VARIATION_SELECTOR_P (c)) | ||
| 3997 | continue; | ||
| 3995 | if (NILP (font_object)) | 3998 | if (NILP (font_object)) |
| 3996 | { | 3999 | { |
| 3997 | font_object = font_for_char (face, c, pos - 1, string); | 4000 | font_object = font_for_char (face, c, pos - 1, string); |
| @@ -3999,40 +4002,8 @@ font_range (pos, limit, w, face, string) | |||
| 3999 | return Qnil; | 4002 | return Qnil; |
| 4000 | continue; | 4003 | continue; |
| 4001 | } | 4004 | } |
| 4002 | 4005 | if (font_encode_char (font_object, c) == FONT_INVALID_CODE) | |
| 4003 | category = CHAR_TABLE_REF (Vunicode_category_table, c); | 4006 | *limit = pos - 1; |
| 4004 | if (! EQ (category, QCf) | ||
| 4005 | && ! CHAR_VARIATION_SELECTOR_P (c) | ||
| 4006 | && font_encode_char (font_object, c) == FONT_INVALID_CODE) | ||
| 4007 | { | ||
| 4008 | Lisp_Object f = font_for_char (face, c, pos - 1, string); | ||
| 4009 | EMACS_INT i, i_byte; | ||
| 4010 | |||
| 4011 | |||
| 4012 | if (NILP (f)) | ||
| 4013 | { | ||
| 4014 | *limit = pos - 1; | ||
| 4015 | return font_object; | ||
| 4016 | } | ||
| 4017 | i = start, i_byte = start_byte; | ||
| 4018 | while (i < pos - 1) | ||
| 4019 | { | ||
| 4020 | |||
| 4021 | if (NILP (string)) | ||
| 4022 | FETCH_CHAR_ADVANCE_NO_CHECK (c, i, i_byte); | ||
| 4023 | else | ||
| 4024 | FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, string, i, i_byte); | ||
| 4025 | category = CHAR_TABLE_REF (Vunicode_category_table, c); | ||
| 4026 | if (! EQ (category, QCf) | ||
| 4027 | && ! CHAR_VARIATION_SELECTOR_P (c) | ||
| 4028 | && font_encode_char (f, c) == FONT_INVALID_CODE) | ||
| 4029 | { | ||
| 4030 | *limit = pos - 1; | ||
| 4031 | return font_object; | ||
| 4032 | } | ||
| 4033 | } | ||
| 4034 | font_object = f; | ||
| 4035 | } | ||
| 4036 | } | 4007 | } |
| 4037 | return font_object; | 4008 | return font_object; |
| 4038 | } | 4009 | } |
diff --git a/src/ftfont.c b/src/ftfont.c index 6956c134a7c..9699dc58009 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -1578,8 +1578,8 @@ ftfont_otf_capability (font) | |||
| 1578 | 1578 | ||
| 1579 | #ifdef HAVE_M17N_FLT | 1579 | #ifdef HAVE_M17N_FLT |
| 1580 | 1580 | ||
| 1581 | #if ((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10) \ | 1581 | #if (((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10)) \ |
| 1582 | && (M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6)) | 1582 | && ((M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6))) |
| 1583 | /* We can use the new feature of libotf and m17n-flt to handle the | 1583 | /* We can use the new feature of libotf and m17n-flt to handle the |
| 1584 | character encoding scheme introduced in Unicode 5.1 and 5.2 for | 1584 | character encoding scheme introduced in Unicode 5.1 and 5.2 for |
| 1585 | some Agian scripts. */ | 1585 | some Agian scripts. */ |
diff --git a/src/m/alpha.h b/src/m/alpha.h index 8f71b37a219..04ad9eaaf8f 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* Machine description file for the alpha chip. | 1 | /* Machine description file for the alpha chip. |
| 2 | Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006, | 2 | |
| 3 | 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006, |
| 4 | 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | Author: Rainer Schoepf | 6 | Author: Rainer Schoepf |
| 6 | (according to authors.el) | 7 | (according to authors.el) |
| @@ -30,7 +31,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 30 | 31 | ||
| 31 | /* Now define a symbol for the cpu type, if your compiler | 32 | /* Now define a symbol for the cpu type, if your compiler |
| 32 | does not define it automatically. */ | 33 | does not define it automatically. */ |
| 33 | |||
| 34 | /* __alpha defined automatically */ | 34 | /* __alpha defined automatically */ |
| 35 | 35 | ||
| 36 | 36 | ||
| @@ -75,12 +75,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 75 | #else /* not __ELF__ */ | 75 | #else /* not __ELF__ */ |
| 76 | 76 | ||
| 77 | /* Describe layout of the address space in an executing process. */ | 77 | /* Describe layout of the address space in an executing process. */ |
| 78 | |||
| 79 | #define TEXT_START 0x120000000 | 78 | #define TEXT_START 0x120000000 |
| 80 | #define DATA_START 0x140000000 | 79 | #define DATA_START 0x140000000 |
| 81 | 80 | ||
| 82 | /* The program to be used for unexec. */ | 81 | /* The program to be used for unexec. */ |
| 83 | |||
| 84 | #define UNEXEC unexalpha.o | 82 | #define UNEXEC unexalpha.o |
| 85 | 83 | ||
| 86 | #endif /* __ELF__ */ | 84 | #endif /* __ELF__ */ |
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 7839c6f8473..1910c37bffc 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* machine description file for AMD x86-64. | 1 | /* machine description file for AMD x86-64. |
| 2 | Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 2 | |
| 3 | Free Software Foundation, Inc. | 3 | Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
| 4 | Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -17,16 +18,11 @@ GNU General Public License for more details. | |||
| 17 | You should have received a copy of the GNU General Public License | 18 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 20 | ||
| 20 | /* The following line tells the configuration script what sort of | ||
| 21 | operating system this machine is likely to run. | ||
| 22 | USUAL-OPSYS="linux" */ | ||
| 23 | |||
| 24 | #define BITS_PER_LONG 64 | 21 | #define BITS_PER_LONG 64 |
| 25 | #define BITS_PER_EMACS_INT 64 | 22 | #define BITS_PER_EMACS_INT 64 |
| 26 | 23 | ||
| 27 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 24 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 28 | is the most significant byte. */ | 25 | is the most significant byte. */ |
| 29 | |||
| 30 | #undef WORDS_BIG_ENDIAN | 26 | #undef WORDS_BIG_ENDIAN |
| 31 | 27 | ||
| 32 | /* Now define a symbol for the cpu type, if your compiler | 28 | /* Now define a symbol for the cpu type, if your compiler |
| @@ -44,15 +40,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 44 | are always unsigned. | 40 | are always unsigned. |
| 45 | 41 | ||
| 46 | This flag only matters if you use USE_LISP_UNION_TYPE. */ | 42 | This flag only matters if you use USE_LISP_UNION_TYPE. */ |
| 47 | |||
| 48 | #define EXPLICIT_SIGN_EXTEND | 43 | #define EXPLICIT_SIGN_EXTEND |
| 49 | 44 | ||
| 50 | /* Data type of load average, as read out of kmem. */ | 45 | /* Data type of load average, as read out of kmem. */ |
| 51 | |||
| 52 | #define LOAD_AVE_TYPE long | 46 | #define LOAD_AVE_TYPE long |
| 53 | 47 | ||
| 54 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 48 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 55 | |||
| 56 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | 49 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) |
| 57 | 50 | ||
| 58 | /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ | 51 | /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ |
diff --git a/src/m/arm.h b/src/m/arm.h index 441c3bd6289..cf30e2e1b19 100644 --- a/src/m/arm.h +++ b/src/m/arm.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* Machine description file for ARM-based non-RISCiX machines. | 1 | /* Machine description file for ARM-based non-RISCiX machines. |
| 2 | Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | |
| 3 | 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 4 | 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -17,20 +18,11 @@ GNU General Public License for more details. | |||
| 17 | You should have received a copy of the GNU General Public License | 18 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 20 | ||
| 20 | |||
| 21 | |||
| 22 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 21 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 23 | is the most significant byte. */ | 22 | is the most significant byte. */ |
| 24 | |||
| 25 | #undef WORDS_BIG_ENDIAN | 23 | #undef WORDS_BIG_ENDIAN |
| 26 | 24 | ||
| 27 | #define NO_REMAP | 25 | #define NO_REMAP |
| 28 | 26 | ||
| 29 | /* armin76@gentoo.org reported that the lgcc_s flag is necessary to | ||
| 30 | build on ARM EABI under GNU/Linux (Bug#5518). */ | ||
| 31 | #ifdef GNU_LINUX | ||
| 32 | #define LIB_GCC -lgcc_s | ||
| 33 | #endif | ||
| 34 | |||
| 35 | /* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42 | 27 | /* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42 |
| 36 | (do not change this comment) */ | 28 | (do not change this comment) */ |
diff --git a/src/m/hp800.h b/src/m/hp800.h index 7b6ebafeaa5..9bc361e3cc4 100644 --- a/src/m/hp800.h +++ b/src/m/hp800.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* machine description file for hp9000 series 800 machines. | 1 | /* machine description file for hp9000 series 800 machines. |
| 2 | Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | |
| 3 | 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 4 | 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -17,14 +18,8 @@ GNU General Public License for more details. | |||
| 17 | You should have received a copy of the GNU General Public License | 18 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 20 | ||
| 20 | |||
| 21 | /* The following line tells the configuration script what sort of | ||
| 22 | operating system this machine is likely to run. | ||
| 23 | USUAL-OPSYS="hpux" */ | ||
| 24 | |||
| 25 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 21 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 26 | is the most significant byte. */ | 22 | is the most significant byte. */ |
| 27 | |||
| 28 | #define WORDS_BIG_ENDIAN | 23 | #define WORDS_BIG_ENDIAN |
| 29 | 24 | ||
| 30 | /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend | 25 | /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend |
| @@ -32,7 +27,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 32 | are always unsigned. | 27 | are always unsigned. |
| 33 | 28 | ||
| 34 | This flag only matters if you use USE_LISP_UNION_TYPE. */ | 29 | This flag only matters if you use USE_LISP_UNION_TYPE. */ |
| 35 | |||
| 36 | #define EXPLICIT_SIGN_EXTEND | 30 | #define EXPLICIT_SIGN_EXTEND |
| 37 | 31 | ||
| 38 | /* Systems with GCC don't need to lose. */ | 32 | /* Systems with GCC don't need to lose. */ |
diff --git a/src/m/ia64.h b/src/m/ia64.h index 85e0f825202..acf6c25844f 100644 --- a/src/m/ia64.h +++ b/src/m/ia64.h | |||
| @@ -1,7 +1,9 @@ | |||
| 1 | /* machine description file for the IA-64 architecture. | 1 | /* machine description file for the IA-64 architecture. |
| 2 | Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | |
| 3 | 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 4 | Contributed by David Mosberger <davidm@hpl.hp.com> | 4 | 2009, 2010 Free Software Foundation, Inc. |
| 5 | |||
| 6 | Contributed by David Mosberger <davidm@hpl.hp.com> | ||
| 5 | 7 | ||
| 6 | This file is part of GNU Emacs. | 8 | This file is part of GNU Emacs. |
| 7 | 9 | ||
| @@ -23,15 +25,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 23 | 25 | ||
| 24 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 26 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 25 | is the most significant byte. */ | 27 | is the most significant byte. */ |
| 26 | |||
| 27 | #undef WORDS_BIG_ENDIAN | 28 | #undef WORDS_BIG_ENDIAN |
| 28 | 29 | ||
| 29 | /* Now define a symbol for the cpu type, if your compiler | 30 | /* Now define a symbol for the cpu type, if your compiler |
| 30 | does not define it automatically. */ | 31 | does not define it automatically. */ |
| 31 | |||
| 32 | /* __ia64__ defined automatically */ | 32 | /* __ia64__ defined automatically */ |
| 33 | 33 | ||
| 34 | |||
| 35 | /* Define the type to use. */ | 34 | /* Define the type to use. */ |
| 36 | #define EMACS_INT long | 35 | #define EMACS_INT long |
| 37 | #define EMACS_UINT unsigned long | 36 | #define EMACS_UINT unsigned long |
| @@ -41,15 +40,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 41 | are always unsigned. | 40 | are always unsigned. |
| 42 | 41 | ||
| 43 | This flag only matters if you use USE_LISP_UNION_TYPE. */ | 42 | This flag only matters if you use USE_LISP_UNION_TYPE. */ |
| 44 | |||
| 45 | #define EXPLICIT_SIGN_EXTEND | 43 | #define EXPLICIT_SIGN_EXTEND |
| 46 | 44 | ||
| 47 | /* Data type of load average, as read out of kmem. */ | 45 | /* Data type of load average, as read out of kmem. */ |
| 48 | |||
| 49 | #define LOAD_AVE_TYPE long | 46 | #define LOAD_AVE_TYPE long |
| 50 | 47 | ||
| 51 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 48 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 52 | |||
| 53 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | 49 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) |
| 54 | 50 | ||
| 55 | #ifdef __ELF__ | 51 | #ifdef __ELF__ |
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index 8cc0b0155a3..3831e500641 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* R2 AIX machine/system dependent defines | 1 | /* R2 AIX machine/system dependent defines |
| 2 | Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, | 2 | |
| 3 | 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 4 | 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -21,7 +22,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 21 | /* The data segment in this machine always starts at address 0x20000000. | 22 | /* The data segment in this machine always starts at address 0x20000000. |
| 22 | An address of data cannot be stored correctly in a Lisp object; | 23 | An address of data cannot be stored correctly in a Lisp object; |
| 23 | we always lose the high bits. We must tell XPNTR to add them back. */ | 24 | we always lose the high bits. We must tell XPNTR to add them back. */ |
| 24 | |||
| 25 | #define TEXT_START 0x10000000 | 25 | #define TEXT_START 0x10000000 |
| 26 | #define DATA_START 0x20000000 | 26 | #define DATA_START 0x20000000 |
| 27 | #define WORDS_BIG_ENDIAN | 27 | #define WORDS_BIG_ENDIAN |
diff --git a/src/m/ibms390.h b/src/m/ibms390.h index 9a8897e443d..1dce4ffbf47 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* machine description file template. | 1 | /* machine description file template. |
| 2 | Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | |
| 3 | 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h index 4d83dc6e69a..fda3007cb74 100644 --- a/src/m/ibms390x.h +++ b/src/m/ibms390x.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* machine description file for IBM S390 in 64-bit mode | 1 | /* machine description file for IBM S390 in 64-bit mode |
| 2 | Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 2 | |
| 3 | Free Software Foundation, Inc. | 3 | Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
| 4 | Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -20,7 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 20 | /* This file was made by copying the significant parts of amdx86-64.h | 21 | /* This file was made by copying the significant parts of amdx86-64.h |
| 21 | into ibms390.h. */ | 22 | into ibms390.h. */ |
| 22 | 23 | ||
| 23 | |||
| 24 | /* Used for machine IBM s390 64 bits with opsys gnu-linux. */ | 24 | /* Used for machine IBM s390 64 bits with opsys gnu-linux. */ |
| 25 | #define BITS_PER_LONG 64 | 25 | #define BITS_PER_LONG 64 |
| 26 | #define BITS_PER_EMACS_INT 64 | 26 | #define BITS_PER_EMACS_INT 64 |
diff --git a/src/m/intel386.h b/src/m/intel386.h index 3f9a49c4f46..984a9959736 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* Machine description file for intel 386. | 1 | /* Machine description file for intel 386. |
| 2 | Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, | 2 | |
| 3 | 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 4 | 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
diff --git a/src/m/iris4d.h b/src/m/iris4d.h index 54ebcdf74bd..e7f332057e5 100644 --- a/src/m/iris4d.h +++ b/src/m/iris4d.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* machine description file for Iris-4D machines. Use with s/irix*.h. | 1 | /* machine description file for Iris-4D machines. Use with s/irix*.h. |
| 2 | Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | |
| 3 | 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 4 | 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -20,7 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 20 | 21 | ||
| 21 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 22 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 22 | is the most significant byte. */ | 23 | is the most significant byte. */ |
| 23 | |||
| 24 | #define WORDS_BIG_ENDIAN | 24 | #define WORDS_BIG_ENDIAN |
| 25 | 25 | ||
| 26 | /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend | 26 | /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend |
| @@ -28,17 +28,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 28 | are always unsigned. | 28 | are always unsigned. |
| 29 | 29 | ||
| 30 | This flag only matters if you use USE_LISP_UNION_TYPE. */ | 30 | This flag only matters if you use USE_LISP_UNION_TYPE. */ |
| 31 | |||
| 32 | #define EXPLICIT_SIGN_EXTEND | 31 | #define EXPLICIT_SIGN_EXTEND |
| 33 | 32 | ||
| 34 | #define TEXT_START 0x400000 | 33 | #define TEXT_START 0x400000 |
| 35 | 34 | ||
| 36 | /* | 35 | /* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which |
| 37 | * DATA_SEG_BITS forces extra bits to be or'd in with any pointers which | 36 | were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for |
| 38 | * were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for | 37 | the value field of a LISP_OBJECT). */ |
| 39 | * the value field of a LISP_OBJECT). | ||
| 40 | */ | ||
| 41 | |||
| 42 | #define DATA_START 0x10000000 | 38 | #define DATA_START 0x10000000 |
| 43 | #define DATA_SEG_BITS 0x10000000 | 39 | #define DATA_SEG_BITS 0x10000000 |
| 44 | 40 | ||
| @@ -48,7 +44,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 48 | 44 | ||
| 49 | /* The standard definitions of these macros would work ok, | 45 | /* The standard definitions of these macros would work ok, |
| 50 | but these are faster because the constants are short. */ | 46 | but these are faster because the constants are short. */ |
| 51 | |||
| 52 | #define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS) | 47 | #define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS) |
| 53 | 48 | ||
| 54 | #define XSET(var, type, ptr) \ | 49 | #define XSET(var, type, ptr) \ |
diff --git a/src/m/m68k.h b/src/m/m68k.h index b844f12fd6f..668db282593 100644 --- a/src/m/m68k.h +++ b/src/m/m68k.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* Machine description file for generic Motorola 68k. | 1 | /* Machine description file for generic Motorola 68k. |
| 2 | Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | |
| 3 | 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -19,12 +20,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 19 | 20 | ||
| 20 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 21 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 21 | is the most significant byte. */ | 22 | is the most significant byte. */ |
| 22 | |||
| 23 | #define WORDS_BIG_ENDIAN | 23 | #define WORDS_BIG_ENDIAN |
| 24 | 24 | ||
| 25 | /* Now define a symbol for the cpu type, if your compiler | 25 | /* Now define a symbol for the cpu type, if your compiler |
| 26 | does not define it automatically. */ | 26 | does not define it automatically. */ |
| 27 | |||
| 28 | #ifndef m68k | 27 | #ifndef m68k |
| 29 | #define m68k | 28 | #define m68k |
| 30 | #endif | 29 | #endif |
| @@ -34,7 +33,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 34 | are always unsigned. | 33 | are always unsigned. |
| 35 | 34 | ||
| 36 | This flag only matters if you use USE_LISP_UNION_TYPE. */ | 35 | This flag only matters if you use USE_LISP_UNION_TYPE. */ |
| 37 | |||
| 38 | #define EXPLICIT_SIGN_EXTEND | 36 | #define EXPLICIT_SIGN_EXTEND |
| 39 | 37 | ||
| 40 | #ifdef GNU_LINUX | 38 | #ifdef GNU_LINUX |
diff --git a/src/m/macppc.h b/src/m/macppc.h index d58592d915a..b9dcf3bdc92 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* machine description file For the powerpc Macintosh. | 1 | /* machine description file For the powerpc Macintosh. |
| 2 | Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | |
| 3 | 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 4 | 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -19,15 +20,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 19 | 20 | ||
| 20 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 21 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 21 | is the most significant byte. */ | 22 | is the most significant byte. */ |
| 22 | |||
| 23 | #define WORDS_BIG_ENDIAN | 23 | #define WORDS_BIG_ENDIAN |
| 24 | 24 | ||
| 25 | /* Data type of load average, as read out of kmem. */ | 25 | /* Data type of load average, as read out of kmem. */ |
| 26 | |||
| 27 | #define LOAD_AVE_TYPE long | 26 | #define LOAD_AVE_TYPE long |
| 28 | 27 | ||
| 29 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 28 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 30 | |||
| 31 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | 29 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) |
| 32 | 30 | ||
| 33 | #if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__) | 31 | #if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__) |
| @@ -36,7 +34,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 36 | 34 | ||
| 37 | /* NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says this is needed | 35 | /* NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says this is needed |
| 38 | For MkLinux/LinuxPPC. */ | 36 | For MkLinux/LinuxPPC. */ |
| 39 | |||
| 40 | #ifdef GNU_LINUX | 37 | #ifdef GNU_LINUX |
| 41 | #define LINKER $(CC) -nostdlib | 38 | #define LINKER $(CC) -nostdlib |
| 42 | #endif | 39 | #endif |
diff --git a/src/m/mips.h b/src/m/mips.h index e93ab281093..8e81c077426 100644 --- a/src/m/mips.h +++ b/src/m/mips.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* m- file for Mips machines. | 1 | /* m- file for Mips machines. |
| 2 | Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, | 2 | |
| 3 | 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, |
| 4 | 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -17,18 +18,8 @@ GNU General Public License for more details. | |||
| 17 | You should have received a copy of the GNU General Public License | 18 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 20 | ||
| 20 | |||
| 21 | /* The following line tells the configuration script what sort of | ||
| 22 | operating system this machine is likely to run. | ||
| 23 | USUAL-OPSYS="note" | ||
| 24 | |||
| 25 | NOTE-START | ||
| 26 | This is used on GNU/Linux and netbsd. | ||
| 27 | NOTE-END */ | ||
| 28 | |||
| 29 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 21 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 30 | is the most significant byte. */ | 22 | is the most significant byte. */ |
| 31 | |||
| 32 | #if ! (defined (__MIPSEL__) || defined (MIPSEL) || defined (_MIPSEL)) | 23 | #if ! (defined (__MIPSEL__) || defined (MIPSEL) || defined (_MIPSEL)) |
| 33 | #define WORDS_BIG_ENDIAN | 24 | #define WORDS_BIG_ENDIAN |
| 34 | #endif | 25 | #endif |
| @@ -38,13 +29,10 @@ NOTE-END */ | |||
| 38 | are always unsigned. | 29 | are always unsigned. |
| 39 | 30 | ||
| 40 | This flag only matters if you use USE_LISP_UNION_TYPE. */ | 31 | This flag only matters if you use USE_LISP_UNION_TYPE. */ |
| 41 | |||
| 42 | #define EXPLICIT_SIGN_EXTEND | 32 | #define EXPLICIT_SIGN_EXTEND |
| 43 | 33 | ||
| 44 | /* Describe layout of the address space in an executing process. */ | 34 | /* Describe layout of the address space in an executing process. */ |
| 45 | |||
| 46 | #define TEXT_START 0x00400000 | 35 | #define TEXT_START 0x00400000 |
| 47 | 36 | ||
| 48 | /* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee | 37 | /* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee |
| 49 | (do not change this comment) */ | 38 | (do not change this comment) */ |
| 50 | |||
diff --git a/src/m/sparc.h b/src/m/sparc.h index b949b56de32..39240dcbf5c 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* machine description file for Sun 4 SPARC. | 1 | /* machine description file for Sun 4 SPARC. |
| 2 | Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, | 2 | |
| 3 | 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 4 | 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
diff --git a/src/m/template.h b/src/m/template.h index d96af80a84e..9b8d2d63055 100644 --- a/src/m/template.h +++ b/src/m/template.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* machine description file template. | 1 | /* machine description file template. |
| 2 | Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | |
| 3 | 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -17,14 +18,8 @@ GNU General Public License for more details. | |||
| 17 | You should have received a copy of the GNU General Public License | 18 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 20 | ||
| 20 | |||
| 21 | /* The following line tells the configuration script what sort of | ||
| 22 | operating system this machine is likely to run. | ||
| 23 | USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */ | ||
| 24 | |||
| 25 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 21 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 26 | is the most significant byte. */ | 22 | is the most significant byte. */ |
| 27 | |||
| 28 | #define WORDS_BIG_ENDIAN | 23 | #define WORDS_BIG_ENDIAN |
| 29 | 24 | ||
| 30 | /* Now define a symbol for the cpu type, if your compiler | 25 | /* Now define a symbol for the cpu type, if your compiler |
| @@ -36,21 +31,17 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 36 | are always unsigned. | 31 | are always unsigned. |
| 37 | 32 | ||
| 38 | This flag only matters if you use USE_LISP_UNION_TYPE. */ | 33 | This flag only matters if you use USE_LISP_UNION_TYPE. */ |
| 39 | |||
| 40 | #define EXPLICIT_SIGN_EXTEND | 34 | #define EXPLICIT_SIGN_EXTEND |
| 41 | 35 | ||
| 42 | /* Data type of load average, as read out of kmem. */ | 36 | /* Data type of load average, as read out of kmem. */ |
| 43 | |||
| 44 | #define LOAD_AVE_TYPE long | 37 | #define LOAD_AVE_TYPE long |
| 45 | 38 | ||
| 46 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 39 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 47 | |||
| 48 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | 40 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) |
| 49 | 41 | ||
| 50 | /* Define CANNOT_DUMP on machines where unexec does not work. | 42 | /* Define CANNOT_DUMP on machines where unexec does not work. |
| 51 | Then the function dump-emacs will not be defined | 43 | Then the function dump-emacs will not be defined |
| 52 | and temacs will do (load "loadup") automatically unless told otherwise. */ | 44 | and temacs will do (load "loadup") automatically unless told otherwise. */ |
| 53 | |||
| 54 | #define CANNOT_DUMP | 45 | #define CANNOT_DUMP |
| 55 | 46 | ||
| 56 | /* Define VIRT_ADDR_VARIES if the virtual addresses of | 47 | /* Define VIRT_ADDR_VARIES if the virtual addresses of |
| @@ -59,31 +50,25 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 59 | 50 | ||
| 60 | Otherwise Emacs assumes that text space precedes data space, | 51 | Otherwise Emacs assumes that text space precedes data space, |
| 61 | numerically. */ | 52 | numerically. */ |
| 62 | |||
| 63 | #define VIRT_ADDR_VARIES | 53 | #define VIRT_ADDR_VARIES |
| 64 | 54 | ||
| 65 | /* Define NO_REMAP if memory segmentation makes it not work well | 55 | /* Define NO_REMAP if memory segmentation makes it not work well |
| 66 | to change the boundary between the text section and data section | 56 | to change the boundary between the text section and data section |
| 67 | when Emacs is dumped. If you define this, the preloaded Lisp | 57 | when Emacs is dumped. If you define this, the preloaded Lisp |
| 68 | code will not be sharable; but that's better than failing completely. */ | 58 | code will not be sharable; but that's better than failing completely. */ |
| 69 | |||
| 70 | #define NO_REMAP | 59 | #define NO_REMAP |
| 71 | 60 | ||
| 72 | /* Some really obscure 4.2-based systems (like Sequent DYNIX) | 61 | /* Some really obscure 4.2-based systems (like Sequent DYNIX) |
| 73 | * do not support asynchronous I/O (using SIGIO) on sockets, | 62 | do not support asynchronous I/O (using SIGIO) on sockets, |
| 74 | * even though it works fine on tty's. If you have one of | 63 | even though it works fine on tty's. If you have one of |
| 75 | * these systems, define the following, and then use it in | 64 | these systems, define the following, and then use it in |
| 76 | * config.h (or elsewhere) to decide when (not) to use SIGIO. | 65 | config.h (or elsewhere) to decide when (not) to use SIGIO. |
| 77 | * | 66 | |
| 78 | * You'd think this would go in an operating-system description file, | 67 | You'd think this would go in an operating-system description file, |
| 79 | * but since it only occurs on some, but not all, BSD systems, the | 68 | but since it only occurs on some, but not all, BSD systems, the |
| 80 | * reasonable place to select for it is in the machine description | 69 | reasonable place to select for it is in the machine description file. */ |
| 81 | * file. | ||
| 82 | */ | ||
| 83 | |||
| 84 | #define NO_SOCK_SIGIO | 70 | #define NO_SOCK_SIGIO |
| 85 | 71 | ||
| 86 | |||
| 87 | /* After adding support for a new system, modify the large case | 72 | /* After adding support for a new system, modify the large case |
| 88 | statement in the `configure' script to recognize reasonable | 73 | statement in the `configure' script to recognize reasonable |
| 89 | configuration names, and add a description of the system to | 74 | configuration names, and add a description of the system to |
diff --git a/src/m/vax.h b/src/m/vax.h index 1670d2b5f48..3426a20d55e 100644 --- a/src/m/vax.h +++ b/src/m/vax.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* machine description file for vax. | 1 | /* machine description file for vax. |
| 2 | Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | |
| 3 | 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h index 8f506cb1822..cdb97b7f9fa 100644 --- a/src/s/aix4-2.h +++ b/src/s/aix4-2.h | |||
| @@ -17,68 +17,48 @@ GNU General Public License for more details. | |||
| 17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 19 | ||
| 20 | /* | 20 | /* Define symbols to identify the version of Unix this is. |
| 21 | * Define symbols to identify the version of Unix this is. | 21 | Define all the symbols that apply correctly. */ |
| 22 | * Define all the symbols that apply correctly. | ||
| 23 | */ | ||
| 24 | |||
| 25 | #define USG /* System III, System V, etc */ | 22 | #define USG /* System III, System V, etc */ |
| 26 | #define USG5 | 23 | #define USG5 |
| 27 | 24 | ||
| 28 | /* This symbol should be defined on AIX Version 3 ??????? */ | 25 | /* This symbol should be defined on AIX Version 3 ??????? */ |
| 29 | #ifndef _AIX | 26 | #ifndef _AIX |
| 30 | #define _AIX | 27 | #define _AIX |
| 31 | #endif | 28 | #endif |
| 32 | 29 | ||
| 33 | /* SYSTEM_TYPE should indicate the kind of system you are using. | 30 | /* SYSTEM_TYPE should indicate the kind of system you are using. |
| 34 | It sets the Lisp variable system-type. */ | 31 | It sets the Lisp variable system-type. */ |
| 35 | |||
| 36 | #define SYSTEM_TYPE "aix" | 32 | #define SYSTEM_TYPE "aix" |
| 37 | 33 | ||
| 38 | /* In AIX, you allocate a pty by opening /dev/ptc to get the master side. | 34 | /* In AIX, you allocate a pty by opening /dev/ptc to get the master side. |
| 39 | To get the name of the slave side, you just ttyname() the master side. */ | 35 | To get the name of the slave side, you just ttyname() the master side. */ |
| 40 | |||
| 41 | #define PTY_ITERATION for (c = 0; !c ; c++) | 36 | #define PTY_ITERATION for (c = 0; !c ; c++) |
| 42 | #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptc"); | 37 | #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptc"); |
| 43 | #define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd)); | 38 | #define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd)); |
| 44 | 39 | ||
| 45 | /* | 40 | /* Define HAVE_TERMIO if the system provides sysV-style ioctls |
| 46 | * Define HAVE_TERMIO if the system provides sysV-style ioctls | 41 | for terminal control. */ |
| 47 | * for terminal control. | ||
| 48 | */ | ||
| 49 | |||
| 50 | #define HAVE_TERMIOS | 42 | #define HAVE_TERMIOS |
| 51 | 43 | ||
| 52 | /* | 44 | /* Define HAVE_PTYS if the system supports pty devices. */ |
| 53 | * Define HAVE_PTYS if the system supports pty devices. | ||
| 54 | */ | ||
| 55 | |||
| 56 | #define HAVE_PTYS | 45 | #define HAVE_PTYS |
| 57 | 46 | ||
| 58 | /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ | 47 | /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ |
| 59 | |||
| 60 | #define HAVE_SOCKETS | 48 | #define HAVE_SOCKETS |
| 61 | 49 | ||
| 62 | 50 | ||
| 63 | /* | 51 | /* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library |
| 64 | * Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir | 52 | functions. Almost, but not quite the same as the 4.2 functions. */ |
| 65 | * library functions. Almost, but not quite the same as | ||
| 66 | * the 4.2 functions | ||
| 67 | */ | ||
| 68 | |||
| 69 | #define SYSV_SYSTEM_DIR | 53 | #define SYSV_SYSTEM_DIR |
| 70 | 54 | ||
| 71 | /* Define this symbol if your system has the functions bcopy, etc. */ | 55 | /* Define this symbol if your system has the functions bcopy, etc. */ |
| 72 | |||
| 73 | #define BSTRING | 56 | #define BSTRING |
| 74 | 57 | ||
| 75 | /* The file containing the kernel's symbol table is called /unix. */ | 58 | /* The file containing the kernel's symbol table is called /unix. */ |
| 76 | |||
| 77 | #define KERNEL_FILE "/unix" | 59 | #define KERNEL_FILE "/unix" |
| 78 | 60 | ||
| 79 | /* The symbol in the kernel where the load average is found | 61 | /* The kernel symbol where the load average is found is named avenrun. */ |
| 80 | is named avenrun. */ | ||
| 81 | |||
| 82 | #define LDAV_SYMBOL "avenrun" | 62 | #define LDAV_SYMBOL "avenrun" |
| 83 | 63 | ||
| 84 | /* Special itemss needed to make Emacs run on this system. */ | 64 | /* Special itemss needed to make Emacs run on this system. */ |
| @@ -125,8 +105,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 125 | that shared library. | 105 | that shared library. |
| 126 | 106 | ||
| 127 | Emacs currently calls xrealloc on the results of get_current_dir name, | 107 | Emacs currently calls xrealloc on the results of get_current_dir name, |
| 128 | to avoid a crash just use the Emacs implementation for that function. | 108 | to avoid a crash just use the Emacs implementation for that function. */ |
| 129 | */ | ||
| 130 | #define BROKEN_GET_CURRENT_DIR_NAME 1 | 109 | #define BROKEN_GET_CURRENT_DIR_NAME 1 |
| 131 | 110 | ||
| 132 | #define UNEXEC unexaix.o | 111 | #define UNEXEC unexaix.o |
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h index ef79d71e3c6..2a8934d7f50 100644 --- a/src/s/bsd-common.h +++ b/src/s/bsd-common.h | |||
| @@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License | |||
| 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | /* Define symbols to identify the version of Unix this is. | 22 | /* Define symbols to identify the version of Unix this is. |
| 23 | * Define all the symbols that apply correctly. */ | 23 | Define all the symbols that apply correctly. */ |
| 24 | 24 | ||
| 25 | /* We give these symbols the numeric values found in <sys/param.h> to | 25 | /* We give these symbols the numeric values found in <sys/param.h> to |
| 26 | avoid warnings about redefined macros. */ | 26 | avoid warnings about redefined macros. */ |
| @@ -84,8 +84,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 84 | /* The file containing the kernel's symbol table is called /vmunix. */ | 84 | /* The file containing the kernel's symbol table is called /vmunix. */ |
| 85 | #define KERNEL_FILE "/vmunix" | 85 | #define KERNEL_FILE "/vmunix" |
| 86 | 86 | ||
| 87 | /* The symbol in the kernel where the load average is found | 87 | /* The kernel symbol where the load average is found is named _avenrun. */ |
| 88 | is named _avenrun. */ | ||
| 89 | #define LDAV_SYMBOL "_avenrun" | 88 | #define LDAV_SYMBOL "_avenrun" |
| 90 | 89 | ||
| 91 | /* Send signals to subprocesses by "typing" special chars at them. */ | 90 | /* Send signals to subprocesses by "typing" special chars at them. */ |
diff --git a/src/s/cygwin.h b/src/s/cygwin.h index 296b1970a97..e2afb7ddc44 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* System description header file for Cygwin. | 1 | /* System description header file for Cygwin. |
| 2 | Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006, | 2 | |
| 3 | 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006, |
| 4 | 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 5 | ||
| 5 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| 6 | 7 | ||
| @@ -19,7 +20,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 19 | 20 | ||
| 20 | /* SYSTEM_TYPE should indicate the kind of system you are using. | 21 | /* SYSTEM_TYPE should indicate the kind of system you are using. |
| 21 | It sets the Lisp variable system-type. */ | 22 | It sets the Lisp variable system-type. */ |
| 22 | |||
| 23 | #define SYSTEM_TYPE "cygwin" | 23 | #define SYSTEM_TYPE "cygwin" |
| 24 | 24 | ||
| 25 | /* Emacs can read input using SIGIO and buffering characters itself, | 25 | /* Emacs can read input using SIGIO and buffering characters itself, |
| @@ -43,26 +43,19 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 43 | It would have Emacs fork off a separate process | 43 | It would have Emacs fork off a separate process |
| 44 | to read the input and send it to the true Emacs process | 44 | to read the input and send it to the true Emacs process |
| 45 | through a pipe. */ | 45 | through a pipe. */ |
| 46 | |||
| 47 | #undef INTERRUPT_INPUT | 46 | #undef INTERRUPT_INPUT |
| 48 | 47 | ||
| 49 | /* | 48 | /* Define HAVE_TERMIOS if the system provides POSIX-style |
| 50 | * Define HAVE_TERMIOS if the system provides POSIX-style | 49 | functions and macros for terminal control. |
| 51 | * functions and macros for terminal control. | ||
| 52 | * | ||
| 53 | * Define HAVE_TERMIO if the system provides sysV-style ioctls | ||
| 54 | * for terminal control. | ||
| 55 | * | ||
| 56 | * Do not define both. HAVE_TERMIOS is preferred, if it is | ||
| 57 | * supported on your system. | ||
| 58 | */ | ||
| 59 | 50 | ||
| 60 | #define HAVE_TERMIOS | 51 | Define HAVE_TERMIO if the system provides sysV-style ioctls |
| 52 | for terminal control. | ||
| 61 | 53 | ||
| 62 | /* | 54 | Do not define both. HAVE_TERMIOS is preferred, if it is |
| 63 | * Define HAVE_PTYS if the system supports pty devices. | 55 | supported on your system. */ |
| 64 | */ | 56 | #define HAVE_TERMIOS |
| 65 | 57 | ||
| 58 | /* Define HAVE_PTYS if the system supports pty devices. */ | ||
| 66 | #define HAVE_PTYS | 59 | #define HAVE_PTYS |
| 67 | #define PTY_ITERATION for (i = 0; i < 1; i++) /* ick */ | 60 | #define PTY_ITERATION for (i = 0; i < 1; i++) /* ick */ |
| 68 | #define PTY_NAME_SPRINTF /* none */ | 61 | #define PTY_NAME_SPRINTF /* none */ |
| @@ -81,13 +74,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 81 | while (0) | 74 | while (0) |
| 82 | 75 | ||
| 83 | /* Define this symbol if your system has the functions bcopy, etc. */ | 76 | /* Define this symbol if your system has the functions bcopy, etc. */ |
| 84 | |||
| 85 | #define BSTRING | 77 | #define BSTRING |
| 86 | 78 | ||
| 87 | /* Define CLASH_DETECTION if you want lock files to be written | 79 | /* Define CLASH_DETECTION if you want lock files to be written |
| 88 | so that Emacs can tell instantly when you try to modify | 80 | so that Emacs can tell instantly when you try to modify |
| 89 | a file that someone else has modified in his Emacs. */ | 81 | a file that someone else has modified in his Emacs. */ |
| 90 | |||
| 91 | #define CLASH_DETECTION | 82 | #define CLASH_DETECTION |
| 92 | 83 | ||
| 93 | /* If the system's imake configuration file defines `NeedWidePrototypes' | 84 | /* If the system's imake configuration file defines `NeedWidePrototypes' |
| @@ -95,10 +86,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 95 | generated in the Makefile generated by `xmkmf'. If we don't | 86 | generated in the Makefile generated by `xmkmf'. If we don't |
| 96 | define NARROWPROTO, we will see the wrong function prototypes | 87 | define NARROWPROTO, we will see the wrong function prototypes |
| 97 | for X functions taking float or double parameters. */ | 88 | for X functions taking float or double parameters. */ |
| 98 | |||
| 99 | #define NARROWPROTO 1 | 89 | #define NARROWPROTO 1 |
| 100 | 90 | ||
| 101 | /* used in various places to enable cygwin-specific code changes */ | 91 | /* Used in various places to enable cygwin-specific code changes. */ |
| 102 | #define CYGWIN 1 | 92 | #define CYGWIN 1 |
| 103 | 93 | ||
| 104 | #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) | 94 | #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) |
| @@ -127,10 +117,5 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 127 | returns ENOSYS. A workaround is to set G_SLICE=always-malloc. */ | 117 | returns ENOSYS. A workaround is to set G_SLICE=always-malloc. */ |
| 128 | #define G_SLICE_ALWAYS_MALLOC | 118 | #define G_SLICE_ALWAYS_MALLOC |
| 129 | 119 | ||
| 130 | /* Don't link against static libgcc */ | ||
| 131 | #define LIB_GCC | ||
| 132 | |||
| 133 | /* the end */ | ||
| 134 | |||
| 135 | /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b | 120 | /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b |
| 136 | (do not change this comment) */ | 121 | (do not change this comment) */ |
diff --git a/src/s/darwin.h b/src/s/darwin.h index 01544631aaa..76c0054cd3f 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h | |||
| @@ -19,9 +19,8 @@ You should have received a copy of the GNU General Public License | |||
| 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | /* Define symbols to identify the version of Unix this is. | 22 | /* Define symbols to identify the version of Unix this is. |
| 23 | * Define all the symbols that apply correctly. */ | 23 | Define all the symbols that apply correctly. */ |
| 24 | |||
| 25 | #define BSD4_2 | 24 | #define BSD4_2 |
| 26 | /* BSD4_3 and BSD4_4 are already defined in sys/param.h */ | 25 | /* BSD4_3 and BSD4_4 are already defined in sys/param.h */ |
| 27 | #define BSD_SYSTEM | 26 | #define BSD_SYSTEM |
| @@ -29,12 +28,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 29 | /* More specific than the above two. We cannot use __APPLE__ as this | 28 | /* More specific than the above two. We cannot use __APPLE__ as this |
| 30 | may not be defined on non-OSX Darwin, and we cannot define DARWIN | 29 | may not be defined on non-OSX Darwin, and we cannot define DARWIN |
| 31 | here because Panther and lower CoreFoundation.h uses DARWIN to | 30 | here because Panther and lower CoreFoundation.h uses DARWIN to |
| 32 | distinguish OS X from pure Darwin. */ | 31 | distinguish OS X from pure Darwin. */ |
| 33 | #define DARWIN_OS | 32 | #define DARWIN_OS |
| 34 | 33 | ||
| 35 | 34 | ||
| 36 | /* SYSTEM_TYPE should indicate the kind of system you are using. | 35 | /* SYSTEM_TYPE should indicate the kind of system you are using. |
| 37 | It sets the Lisp variable system-type. */ | 36 | It sets the Lisp variable system-type. */ |
| 38 | #define SYSTEM_TYPE "darwin" | 37 | #define SYSTEM_TYPE "darwin" |
| 39 | 38 | ||
| 40 | /* Emacs can read input using SIGIO and buffering characters itself, | 39 | /* Emacs can read input using SIGIO and buffering characters itself, |
| @@ -64,26 +63,21 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 64 | if system supports pty's. 'a' means it is /dev/ptya0 */ | 63 | if system supports pty's. 'a' means it is /dev/ptya0 */ |
| 65 | #define FIRST_PTY_LETTER 'p' | 64 | #define FIRST_PTY_LETTER 'p' |
| 66 | 65 | ||
| 67 | /* | 66 | /* Define HAVE_TERMIOS if the system provides POSIX-style |
| 68 | * Define HAVE_TERMIOS if the system provides POSIX-style | 67 | functions and macros for terminal control. |
| 69 | * functions and macros for terminal control. | 68 | |
| 70 | * | 69 | Define HAVE_TERMIO if the system provides sysV-style ioctls |
| 71 | * Define HAVE_TERMIO if the system provides sysV-style ioctls | 70 | for terminal control. |
| 72 | * for terminal control. | 71 | |
| 73 | * | 72 | Do not define both. HAVE_TERMIOS is preferred, if it is supported |
| 74 | * Do not define both. HAVE_TERMIOS is preferred, if it is | 73 | on your system. */ |
| 75 | * supported on your system. | ||
| 76 | */ | ||
| 77 | #define HAVE_TERMIOS | 74 | #define HAVE_TERMIOS |
| 78 | #define NO_TERMIO | 75 | #define NO_TERMIO |
| 79 | 76 | ||
| 80 | /* | 77 | /* Define HAVE_PTYS if the system supports pty devices. |
| 81 | * Define HAVE_PTYS if the system supports pty devices. | 78 | Note: PTYs are broken on darwin <6. Use at your own risk. */ |
| 82 | * Note: PTYs are broken on darwin <6. Use at your own risk. | ||
| 83 | */ | ||
| 84 | #define HAVE_PTYS | 79 | #define HAVE_PTYS |
| 85 | /* Run only once. We need a `for'-loop because the code uses | 80 | /* Run only once. We need a `for'-loop because the code uses `continue'. */ |
| 86 | `continue'. */ | ||
| 87 | #define PTY_ITERATION for (i = 0; i < 1; i++) | 81 | #define PTY_ITERATION for (i = 0; i < 1; i++) |
| 88 | #define PTY_NAME_SPRINTF /* none */ | 82 | #define PTY_NAME_SPRINTF /* none */ |
| 89 | #define PTY_TTY_NAME_SPRINTF /* none */ | 83 | #define PTY_TTY_NAME_SPRINTF /* none */ |
| @@ -101,11 +95,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 101 | } \ | 95 | } \ |
| 102 | while (0) | 96 | while (0) |
| 103 | 97 | ||
| 104 | /** | 98 | /* PTYs only work correctly on Darwin 7 or higher. So make the default |
| 105 | * PTYs only work correctly on Darwin 7 or higher. So make the | 99 | for process-connection-type dependent on the kernel version. */ |
| 106 | * default for process-connection-type dependent on the kernel | ||
| 107 | * version. | ||
| 108 | */ | ||
| 109 | #define MIN_PTY_KERNEL_VERSION '7' | 100 | #define MIN_PTY_KERNEL_VERSION '7' |
| 110 | 101 | ||
| 111 | /* Define this symbol if your system has the functions bcopy, etc. */ | 102 | /* Define this symbol if your system has the functions bcopy, etc. */ |
| @@ -123,12 +114,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 123 | /* Used in dispnew.c. Copied from freebsd.h. */ | 114 | /* Used in dispnew.c. Copied from freebsd.h. */ |
| 124 | #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) | 115 | #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) |
| 125 | 116 | ||
| 126 | /* System uses OXTABS instead of the expected TAB3. (Copied from | 117 | /* System uses OXTABS instead of the expected TAB3. (Copied from bsd386.h.) */ |
| 127 | bsd386.h.) */ | ||
| 128 | #define TAB3 OXTABS | 118 | #define TAB3 OXTABS |
| 129 | 119 | ||
| 130 | /* Darwin ld insists on the use of malloc routines in the System | 120 | /* Darwin ld insists on the use of malloc routines in the System framework. */ |
| 131 | framework. */ | ||
| 132 | #define SYSTEM_MALLOC | 121 | #define SYSTEM_MALLOC |
| 133 | 122 | ||
| 134 | /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ | 123 | /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ |
| @@ -154,8 +143,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 154 | #define malloc unexec_malloc | 143 | #define malloc unexec_malloc |
| 155 | #define realloc unexec_realloc | 144 | #define realloc unexec_realloc |
| 156 | #define free unexec_free | 145 | #define free unexec_free |
| 157 | /* Don't use posix_memalign because it is not compatible with | 146 | /* Don't use posix_memalign because it is not compatible with unexmacosx.c. */ |
| 158 | unexmacosx.c. */ | ||
| 159 | #undef HAVE_POSIX_MEMALIGN | 147 | #undef HAVE_POSIX_MEMALIGN |
| 160 | #endif | 148 | #endif |
| 161 | 149 | ||
| @@ -183,8 +171,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 183 | ioctl TIOCSCTTY. */ | 171 | ioctl TIOCSCTTY. */ |
| 184 | #define DONT_REOPEN_PTY | 172 | #define DONT_REOPEN_PTY |
| 185 | 173 | ||
| 186 | /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the | 174 | /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack. */ |
| 187 | stack. */ | ||
| 188 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS | 175 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS |
| 189 | 176 | ||
| 190 | /* arch-tag: 481d443d-4f89-43ea-b5fb-49706d95fa41 | 177 | /* arch-tag: 481d443d-4f89-43ea-b5fb-49706d95fa41 |
diff --git a/src/s/freebsd.h b/src/s/freebsd.h index 78c7dfdf6bb..2b53ec0413f 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h | |||
| @@ -30,13 +30,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 30 | 30 | ||
| 31 | #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) | 31 | #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) |
| 32 | 32 | ||
| 33 | #undef LIB_GCC | ||
| 34 | #define LIB_GCC | ||
| 35 | |||
| 36 | #define HAVE_GETLOADAVG 1 | 33 | #define HAVE_GETLOADAVG 1 |
| 37 | #define DECLARE_GETPWUID_WITH_UID_T | 34 | #define DECLARE_GETPWUID_WITH_UID_T |
| 38 | 35 | ||
| 39 | /* this silences a few compilation warnings */ | 36 | /* This silences a few compilation warnings. */ |
| 40 | #undef BSD_SYSTEM | 37 | #undef BSD_SYSTEM |
| 41 | #if __FreeBSD__ == 1 | 38 | #if __FreeBSD__ == 1 |
| 42 | #define BSD_SYSTEM 199103 | 39 | #define BSD_SYSTEM 199103 |
| @@ -64,23 +61,17 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 64 | successfully after processing (for example with CRs added if the | 61 | successfully after processing (for example with CRs added if the |
| 65 | terminal is set up that way which it is here). The same bytes will | 62 | terminal is set up that way which it is here). The same bytes will |
| 66 | be seen again in a later read(2), without the CRs. */ | 63 | be seen again in a later read(2), without the CRs. */ |
| 67 | |||
| 68 | #define BROKEN_PTY_READ_AFTER_EAGAIN 1 | 64 | #define BROKEN_PTY_READ_AFTER_EAGAIN 1 |
| 69 | 65 | ||
| 70 | /* Tell that garbage collector that setjmp is known to save all | 66 | /* Tell that garbage collector that setjmp is known to save all |
| 71 | registers relevant for conservative garbage collection in the | 67 | registers relevant for conservative garbage collection in the jmp_buf. */ |
| 72 | jmp_buf. */ | ||
| 73 | |||
| 74 | #define GC_SETJMP_WORKS 1 | 68 | #define GC_SETJMP_WORKS 1 |
| 75 | 69 | ||
| 76 | /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the | 70 | /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack. */ |
| 77 | stack. */ | ||
| 78 | |||
| 79 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS | 71 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS |
| 80 | 72 | ||
| 81 | /* Define USE_MMAP_FOR_BUFFERS to let Emacs use mmap(2) to allocate | 73 | /* Define USE_MMAP_FOR_BUFFERS to let Emacs use mmap(2) to allocate |
| 82 | buffer text. This overrides REL_ALLOC. */ | 74 | buffer text. This overrides REL_ALLOC. */ |
| 83 | |||
| 84 | #define USE_MMAP_FOR_BUFFERS 1 | 75 | #define USE_MMAP_FOR_BUFFERS 1 |
| 85 | 76 | ||
| 86 | /* arch-tag: 426529ca-b7c4-448f-b10a-d4dcdc9c78eb | 77 | /* arch-tag: 426529ca-b7c4-448f-b10a-d4dcdc9c78eb |
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 5c94a4369ce..3aa2dc16f42 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004, | 3 | Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004, |
| 4 | 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | This file was put together by Michael K. Johnson and Rik Faith. | ||
| 7 | |||
| 6 | This file is part of GNU Emacs. | 8 | This file is part of GNU Emacs. |
| 7 | 9 | ||
| 8 | GNU Emacs is free software: you can redistribute it and/or modify | 10 | GNU Emacs is free software: you can redistribute it and/or modify |
| @@ -18,20 +20,13 @@ GNU General Public License for more details. | |||
| 18 | You should have received a copy of the GNU General Public License | 20 | You should have received a copy of the GNU General Public License |
| 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 21 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 20 | 22 | ||
| 21 | /* This file was put together by Michael K. Johnson and Rik Faith. */ | 23 | /* Define symbols to identify the version of Unix this is. |
| 22 | 24 | Define all the symbols that apply correctly. */ | |
| 23 | |||
| 24 | /* | ||
| 25 | * Define symbols to identify the version of Unix this is. | ||
| 26 | * Define all the symbols that apply correctly. | ||
| 27 | */ | ||
| 28 | |||
| 29 | #define USG | 25 | #define USG |
| 30 | #define GNU_LINUX | 26 | #define GNU_LINUX |
| 31 | 27 | ||
| 32 | /* SYSTEM_TYPE should indicate the kind of system you are using. | 28 | /* SYSTEM_TYPE should indicate the kind of system you are using. |
| 33 | It sets the Lisp variable system-type. */ | 29 | It sets the Lisp variable system-type. */ |
| 34 | |||
| 35 | #define SYSTEM_TYPE "gnu/linux" /* All the best software is free. */ | 30 | #define SYSTEM_TYPE "gnu/linux" /* All the best software is free. */ |
| 36 | 31 | ||
| 37 | #ifndef NOT_C_CODE | 32 | #ifndef NOT_C_CODE |
| @@ -50,9 +45,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 50 | #if defined HAVE_GRANTPT | 45 | #if defined HAVE_GRANTPT |
| 51 | #define UNIX98_PTYS | 46 | #define UNIX98_PTYS |
| 52 | 47 | ||
| 53 | /* Run only once. We need a `for'-loop because the code uses | 48 | /* Run only once. We need a `for'-loop because the code uses `continue'. */ |
| 54 | `continue'. */ | ||
| 55 | |||
| 56 | #define PTY_ITERATION for (i = 0; i < 1; i++) | 49 | #define PTY_ITERATION for (i = 0; i < 1; i++) |
| 57 | 50 | ||
| 58 | #ifdef HAVE_GETPT | 51 | #ifdef HAVE_GETPT |
| @@ -64,7 +57,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 64 | 57 | ||
| 65 | /* Note that grantpt and unlockpt may fork. We must block SIGCHLD to | 58 | /* Note that grantpt and unlockpt may fork. We must block SIGCHLD to |
| 66 | prevent sigchld_handler from intercepting the child's death. */ | 59 | prevent sigchld_handler from intercepting the child's death. */ |
| 67 | |||
| 68 | #define PTY_TTY_NAME_SPRINTF \ | 60 | #define PTY_TTY_NAME_SPRINTF \ |
| 69 | { \ | 61 | { \ |
| 70 | char *ptyname; \ | 62 | char *ptyname; \ |
| @@ -86,23 +78,20 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 86 | 78 | ||
| 87 | /* Letter to use in finding device name of first pty, | 79 | /* Letter to use in finding device name of first pty, |
| 88 | if system supports pty's. 'p' means it is /dev/ptyp0 */ | 80 | if system supports pty's. 'p' means it is /dev/ptyp0 */ |
| 89 | |||
| 90 | #define FIRST_PTY_LETTER 'p' | 81 | #define FIRST_PTY_LETTER 'p' |
| 91 | 82 | ||
| 92 | #endif /* not HAVE_GRANTPT */ | 83 | #endif /* not HAVE_GRANTPT */ |
| 93 | 84 | ||
| 94 | /* Define HAVE_TERMIOS if the system provides POSIX-style | 85 | /* Define HAVE_TERMIOS if the system provides POSIX-style |
| 95 | functions and macros for terminal control. */ | 86 | functions and macros for terminal control. */ |
| 96 | |||
| 97 | #define HAVE_TERMIOS | 87 | #define HAVE_TERMIOS |
| 98 | 88 | ||
| 99 | /* Define HAVE_PTYS if the system supports pty devices. */ | 89 | /* Define HAVE_PTYS if the system supports pty devices. */ |
| 100 | |||
| 101 | #define HAVE_PTYS | 90 | #define HAVE_PTYS |
| 102 | 91 | ||
| 103 | #define HAVE_SOCKETS | 92 | #define HAVE_SOCKETS |
| 104 | 93 | ||
| 105 | /* Define this symbol if your system has the functions bcopy, etc. */ | 94 | /* Define this symbol if your system has the functions bcopy, etc. */ |
| 106 | #define BSTRING | 95 | #define BSTRING |
| 107 | 96 | ||
| 108 | /* This is used in list_system_processes. */ | 97 | /* This is used in list_system_processes. */ |
| @@ -121,28 +110,24 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 121 | your system and must be used only through an encapsulation | 110 | your system and must be used only through an encapsulation |
| 122 | (Which you should place, by convention, in sysdep.c). */ | 111 | (Which you should place, by convention, in sysdep.c). */ |
| 123 | 112 | ||
| 124 | /* This is needed for dispnew.c:update_frame */ | 113 | /* This is needed for dispnew.c:update_frame. */ |
| 125 | |||
| 126 | #ifdef emacs | 114 | #ifdef emacs |
| 127 | #include <stdio.h> /* Get the definition of _IO_STDIO_H. */ | 115 | #include <stdio.h> /* Get the definition of _IO_STDIO_H. */ |
| 128 | #if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM) | 116 | #if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM) |
| 129 | /* new C libio names */ | 117 | /* New C libio names. */ |
| 130 | #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ | 118 | #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ |
| 131 | ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base) | 119 | ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base) |
| 132 | #elif defined (__UCLIBC__) | 120 | #elif defined (__UCLIBC__) |
| 133 | /* using the uClibc library */ | 121 | /* Using the uClibc library. */ |
| 134 | #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ | 122 | #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ |
| 135 | ((FILE)->__bufpos - (FILE)->__bufstart) | 123 | ((FILE)->__bufpos - (FILE)->__bufstart) |
| 136 | #else /* !_IO_STDIO_H && ! __UCLIBC__ */ | 124 | #else /* !_IO_STDIO_H && ! __UCLIBC__ */ |
| 137 | /* old C++ iostream names */ | 125 | /* Old C++ iostream names. */ |
| 138 | #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ | 126 | #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ |
| 139 | ((FILE)->_pptr - (FILE)->_pbase) | 127 | ((FILE)->_pptr - (FILE)->_pbase) |
| 140 | #endif /* !_IO_STDIO_H && ! __UCLIBC__ */ | 128 | #endif /* !_IO_STDIO_H && ! __UCLIBC__ */ |
| 141 | #endif /* emacs */ | 129 | #endif /* emacs */ |
| 142 | 130 | ||
| 143 | /* Ask GCC where to find libgcc.a. */ | ||
| 144 | #define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name` | ||
| 145 | |||
| 146 | #ifdef emacs | 131 | #ifdef emacs |
| 147 | #define INTERRUPT_INPUT | 132 | #define INTERRUPT_INPUT |
| 148 | #endif | 133 | #endif |
| @@ -151,9 +136,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 151 | 136 | ||
| 152 | #define POSIX /* affects getpagesize.h and systty.h */ | 137 | #define POSIX /* affects getpagesize.h and systty.h */ |
| 153 | 138 | ||
| 154 | #undef LIB_GCC | ||
| 155 | #define LIB_GCC | ||
| 156 | |||
| 157 | #define UNEXEC unexelf.o | 139 | #define UNEXEC unexelf.o |
| 158 | 140 | ||
| 159 | /* This is to work around mysterious gcc failures in some system versions. | 141 | /* This is to work around mysterious gcc failures in some system versions. |
| @@ -171,8 +153,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 171 | #endif | 153 | #endif |
| 172 | 154 | ||
| 173 | /* Tell that garbage collector that setjmp is known to save all | 155 | /* Tell that garbage collector that setjmp is known to save all |
| 174 | registers relevant for conservative garbage collection in the | 156 | registers relevant for conservative garbage collection in the jmp_buf. */ |
| 175 | jmp_buf. */ | ||
| 176 | /* Not all the architectures are tested, but there are Debian packages | 157 | /* Not all the architectures are tested, but there are Debian packages |
| 177 | for SCM and/or Guile on them, so the technique must work. See also | 158 | for SCM and/or Guile on them, so the technique must work. See also |
| 178 | comments in alloc.c concerning setjmp and gcc. Fixme: it's | 159 | comments in alloc.c concerning setjmp and gcc. Fixme: it's |
| @@ -180,7 +161,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 180 | register window-flushing. */ | 161 | register window-flushing. */ |
| 181 | /* Don't use #cpu here since in newest development versions of GCC, | 162 | /* Don't use #cpu here since in newest development versions of GCC, |
| 182 | we must call cpp with -traditional, and that disables #cpu. */ | 163 | we must call cpp with -traditional, and that disables #cpu. */ |
| 183 | |||
| 184 | #if defined __i386__ || defined __sparc__ || defined __mc68000__ \ | 164 | #if defined __i386__ || defined __sparc__ || defined __mc68000__ \ |
| 185 | || defined __alpha__ || defined __mips__ || defined __s390__ \ | 165 | || defined __alpha__ || defined __mips__ || defined __s390__ \ |
| 186 | || defined __arm__ || defined __powerpc__ || defined __amd64__ \ | 166 | || defined __arm__ || defined __powerpc__ || defined __amd64__ \ |
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index 0dc8276c44e..91988ef6727 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h | |||
| @@ -21,56 +21,39 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 21 | 21 | ||
| 22 | #define RUN_TIME_REMAP | 22 | #define RUN_TIME_REMAP |
| 23 | 23 | ||
| 24 | /* | 24 | /* Define symbols to identify the version of Unix this is. |
| 25 | * Define symbols to identify the version of Unix this is. | 25 | Define all the symbols that apply correctly. */ |
| 26 | * Define all the symbols that apply correctly. | ||
| 27 | */ | ||
| 28 | |||
| 29 | #define USG /* System III, System V, etc */ | 26 | #define USG /* System III, System V, etc */ |
| 30 | |||
| 31 | #define USG5 | 27 | #define USG5 |
| 32 | |||
| 33 | #define HPUX | 28 | #define HPUX |
| 34 | 29 | ||
| 35 | /* SYSTEM_TYPE should indicate the kind of system you are using. | 30 | /* SYSTEM_TYPE should indicate the kind of system you are using. |
| 36 | It sets the Lisp variable system-type. */ | 31 | It sets the Lisp variable system-type. */ |
| 37 | |||
| 38 | #define SYSTEM_TYPE "hpux" | 32 | #define SYSTEM_TYPE "hpux" |
| 39 | 33 | ||
| 40 | /* Letter to use in finding device name of first pty, | 34 | /* Letter to use in finding device name of first pty, |
| 41 | if system supports pty's. 'p' means it is /dev/ptym/ptyp0 */ | 35 | if system supports pty's. 'p' means it is /dev/ptym/ptyp0 */ |
| 42 | |||
| 43 | #define FIRST_PTY_LETTER 'p' | 36 | #define FIRST_PTY_LETTER 'p' |
| 44 | 37 | ||
| 45 | /* | 38 | /* Define HAVE_TERMIO if the system provides sysV-style ioctls |
| 46 | * Define HAVE_TERMIO if the system provides sysV-style ioctls | 39 | for terminal control. */ |
| 47 | * for terminal control. | ||
| 48 | */ | ||
| 49 | |||
| 50 | #define HAVE_TERMIO | 40 | #define HAVE_TERMIO |
| 51 | 41 | ||
| 52 | /* | 42 | /* Define HAVE_PTYS if the system supports pty devices. */ |
| 53 | * Define HAVE_PTYS if the system supports pty devices. | ||
| 54 | */ | ||
| 55 | |||
| 56 | #define HAVE_PTYS | 43 | #define HAVE_PTYS |
| 57 | 44 | ||
| 58 | /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ | 45 | /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ |
| 59 | |||
| 60 | #define HAVE_SOCKETS | 46 | #define HAVE_SOCKETS |
| 61 | 47 | ||
| 62 | /* Define this symbol if your system has the functions bcopy, etc. | 48 | /* Define this symbol if your system has the functions bcopy, etc. |
| 63 | * s800 and later versions of s300 (s200) kernels have equivalents | 49 | s800 and later versions of s300 (s200) kernels have equivalents |
| 64 | * of the BSTRING functions of BSD. If your s200 kernel doesn't have | 50 | of the BSTRING functions of BSD. If your s200 kernel doesn't have |
| 65 | * em comment out this section. | 51 | em comment out this section. */ |
| 66 | */ | ||
| 67 | |||
| 68 | #define BSTRING | 52 | #define BSTRING |
| 69 | 53 | ||
| 70 | /* Define CLASH_DETECTION if you want lock files to be written | 54 | /* Define CLASH_DETECTION if you want lock files to be written |
| 71 | so that Emacs can tell instantly when you try to modify | 55 | so that Emacs can tell instantly when you try to modify |
| 72 | a file that someone else has modified in his Emacs. */ | 56 | a file that someone else has modified in his Emacs. */ |
| 73 | |||
| 74 | #define CLASH_DETECTION | 57 | #define CLASH_DETECTION |
| 75 | 58 | ||
| 76 | /* The symbol in the kernel where the load average is found | 59 | /* The symbol in the kernel where the load average is found |
| @@ -80,11 +63,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 80 | 63 | ||
| 81 | /* In hpux, the symbol SIGIO is defined, but the feature | 64 | /* In hpux, the symbol SIGIO is defined, but the feature |
| 82 | doesn't work in the way Emacs needs it to. */ | 65 | doesn't work in the way Emacs needs it to. */ |
| 83 | |||
| 84 | #define BROKEN_SIGIO | 66 | #define BROKEN_SIGIO |
| 85 | 67 | ||
| 86 | /* Some additional system facilities exist. */ | 68 | /* Some additional system facilities exist. */ |
| 87 | |||
| 88 | #define HAVE_PERROR /* Delete this line for version 6. */ | 69 | #define HAVE_PERROR /* Delete this line for version 6. */ |
| 89 | 70 | ||
| 90 | #define UNEXEC unexhp9k800.o | 71 | #define UNEXEC unexhp9k800.o |
| @@ -112,7 +93,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 112 | version number A.09.05. | 93 | version number A.09.05. |
| 113 | 94 | ||
| 114 | You can fix the math library by installing patch number PHSS_4630. | 95 | You can fix the math library by installing patch number PHSS_4630. |
| 115 | But we can fix it more reliably for Emacs like this. */ | 96 | But we can fix it more reliably for Emacs like this. */ |
| 116 | #undef HAVE_RINT | 97 | #undef HAVE_RINT |
| 117 | 98 | ||
| 118 | /* We have to go this route, rather than hpux9's approach of renaming the | 99 | /* We have to go this route, rather than hpux9's approach of renaming the |
| @@ -129,8 +110,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 129 | 110 | ||
| 130 | 111 | ||
| 131 | /* Rainer Malzbender <rainer@displaytech.com> says definining | 112 | /* Rainer Malzbender <rainer@displaytech.com> says definining |
| 132 | HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 | 113 | HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ |
| 133 | using GCC. */ | ||
| 134 | #ifndef HAVE_XRMSETDATABASE | 114 | #ifndef HAVE_XRMSETDATABASE |
| 135 | #define HAVE_XRMSETDATABASE | 115 | #define HAVE_XRMSETDATABASE |
| 136 | #endif | 116 | #endif |
| @@ -145,7 +125,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 145 | to change the boundary between the text section and data section | 125 | to change the boundary between the text section and data section |
| 146 | when Emacs is dumped. If you define this, the preloaded Lisp | 126 | when Emacs is dumped. If you define this, the preloaded Lisp |
| 147 | code will not be sharable; but that's better than failing completely. */ | 127 | code will not be sharable; but that's better than failing completely. */ |
| 148 | |||
| 149 | #define NO_REMAP | 128 | #define NO_REMAP |
| 150 | 129 | ||
| 151 | /* Define VIRT_ADDR_VARIES if the virtual addresses of | 130 | /* Define VIRT_ADDR_VARIES if the virtual addresses of |
| @@ -154,35 +133,29 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 154 | 133 | ||
| 155 | Otherwise Emacs assumes that text space precedes data space, | 134 | Otherwise Emacs assumes that text space precedes data space, |
| 156 | numerically. */ | 135 | numerically. */ |
| 157 | |||
| 158 | #define VIRT_ADDR_VARIES | 136 | #define VIRT_ADDR_VARIES |
| 159 | 137 | ||
| 160 | /* the data segment on this machine always starts at address 0x40000000. */ | 138 | /* The data segment on this machine always starts at address 0x40000000. */ |
| 161 | |||
| 162 | #define DATA_SEG_BITS 0x40000000 | 139 | #define DATA_SEG_BITS 0x40000000 |
| 163 | 140 | ||
| 164 | #define DATA_START 0x40000000 | 141 | #define DATA_START 0x40000000 |
| 165 | #define TEXT_START 0x00000000 | 142 | #define TEXT_START 0x00000000 |
| 166 | 143 | ||
| 167 | /* Data type of load average, as read out of kmem. */ | 144 | /* Data type of load average, as read out of kmem. */ |
| 168 | |||
| 169 | #define LOAD_AVE_TYPE double | 145 | #define LOAD_AVE_TYPE double |
| 170 | 146 | ||
| 171 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 147 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 172 | |||
| 173 | #define LOAD_AVE_CVT(x) ((int) (x * 100.0)) | 148 | #define LOAD_AVE_CVT(x) ((int) (x * 100.0)) |
| 174 | 149 | ||
| 175 | /* The symbol in the kernel where the load average is found | 150 | /* The kernel symbol where the load average is found is named _avenrun. |
| 176 | is named _avenrun. At this time there are two major flavors | 151 | At this time there are two major flavors of hp-ux (there is the s800 |
| 177 | of hp-ux (there is the s800 and s300 (s200) flavors). The | 152 | and s300 (s200) flavors). The differences are thusly moved to the |
| 178 | differences are thusly moved to the corresponding machine description file. | 153 | corresponding machine description file. */ |
| 179 | */ | ||
| 180 | 154 | ||
| 181 | /* no underscore please */ | 155 | /* No underscore please. */ |
| 182 | #define LDAV_SYMBOL "avenrun" | 156 | #define LDAV_SYMBOL "avenrun" |
| 183 | 157 | ||
| 184 | /* On USG systems these have different names. */ | 158 | /* On USG systems these have different names. */ |
| 185 | |||
| 186 | #define index strchr | 159 | #define index strchr |
| 187 | #define rindex strrchr | 160 | #define rindex strrchr |
| 188 | 161 | ||
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h index 7016e6bc443..e9e14f0cf35 100644 --- a/src/s/irix6-5.h +++ b/src/s/irix6-5.h | |||
| @@ -41,7 +41,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 41 | #define SIGNALS_VIA_CHARACTERS | 41 | #define SIGNALS_VIA_CHARACTERS |
| 42 | 42 | ||
| 43 | /* Letter to use in finding device name of first pty, | 43 | /* Letter to use in finding device name of first pty, |
| 44 | if system supports pty's. 'a' means it is /dev/ptya0 */ | 44 | if system supports pty's. 'a' means it is /dev/ptya0 */ |
| 45 | #undef FIRST_PTY_LETTER | 45 | #undef FIRST_PTY_LETTER |
| 46 | #define FIRST_PTY_LETTER 'q' | 46 | #define FIRST_PTY_LETTER 'q' |
| 47 | 47 | ||
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index f5065507e5a..2d6cc2f4bd5 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h | |||
| @@ -18,10 +18,8 @@ GNU General Public License for more details. | |||
| 18 | You should have received a copy of the GNU General Public License | 18 | You should have received a copy of the GNU General Public License |
| 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 20 | 20 | ||
| 21 | /* | 21 | /* Define symbols to identify the version of Unix this is. |
| 22 | * Define symbols to identify the version of Unix this is. | 22 | Define all the symbols that apply correctly. */ |
| 23 | * Define all the symbols that apply correctly. | ||
| 24 | */ | ||
| 25 | 23 | ||
| 26 | #ifndef WINDOWSNT | 24 | #ifndef WINDOWSNT |
| 27 | #define WINDOWSNT | 25 | #define WINDOWSNT |
| @@ -31,63 +29,53 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 31 | #endif | 29 | #endif |
| 32 | 30 | ||
| 33 | /* If you are compiling with a non-C calling convention but need to | 31 | /* If you are compiling with a non-C calling convention but need to |
| 34 | declare vararg routines differently, put it here */ | 32 | declare vararg routines differently, put it here. */ |
| 35 | #define _VARARGS_ __cdecl | 33 | #define _VARARGS_ __cdecl |
| 36 | 34 | ||
| 37 | /* If you are providing a function to something that will call the | 35 | /* If you are providing a function to something that will call the |
| 38 | function back (like a signal handler and signal, or main) its calling | 36 | function back (like a signal handler and signal, or main) its calling |
| 39 | convention must be whatever standard the libraries expect */ | 37 | convention must be whatever standard the libraries expect. */ |
| 40 | #define _CALLBACK_ __cdecl | 38 | #define _CALLBACK_ __cdecl |
| 41 | 39 | ||
| 42 | /* SYSTEM_TYPE should indicate the kind of system you are using. | 40 | /* SYSTEM_TYPE should indicate the kind of system you are using. |
| 43 | It sets the Lisp variable system-type. */ | 41 | It sets the Lisp variable system-type. */ |
| 44 | |||
| 45 | #define SYSTEM_TYPE "windows-nt" | 42 | #define SYSTEM_TYPE "windows-nt" |
| 46 | #define SYMS_SYSTEM syms_of_ntterm () | 43 | #define SYMS_SYSTEM syms_of_ntterm () |
| 47 | 44 | ||
| 48 | #define NO_MATHERR 1 | 45 | #define NO_MATHERR 1 |
| 49 | 46 | ||
| 50 | /* Letter to use in finding device name of first pty, | 47 | /* Letter to use in finding device name of first pty, |
| 51 | if system supports pty's. 'a' means it is /dev/ptya0 */ | 48 | if system supports pty's. 'a' means it is /dev/ptya0 */ |
| 52 | |||
| 53 | #define FIRST_PTY_LETTER 'a' | 49 | #define FIRST_PTY_LETTER 'a' |
| 54 | 50 | ||
| 55 | /* | 51 | /* Define HAVE_TIMEVAL if the system supports the BSD style clock values. |
| 56 | * Define HAVE_TIMEVAL if the system supports the BSD style clock values. | 52 | Look in <sys/time.h> for a timeval structure. */ |
| 57 | * Look in <sys/time.h> for a timeval structure. | ||
| 58 | */ | ||
| 59 | |||
| 60 | #define HAVE_TIMEVAL 1 | 53 | #define HAVE_TIMEVAL 1 |
| 61 | 54 | ||
| 62 | /* NT supports Winsock which is close enough (with some hacks) */ | 55 | /* NT supports Winsock which is close enough (with some hacks). */ |
| 63 | |||
| 64 | #define HAVE_SOCKETS 1 | 56 | #define HAVE_SOCKETS 1 |
| 65 | 57 | ||
| 66 | /* But our select implementation doesn't allow us to make non-blocking | 58 | /* But our select implementation doesn't allow us to make non-blocking |
| 67 | connects. So until that is fixed, this is necessary: */ | 59 | connects. So until that is fixed, this is necessary: */ |
| 68 | |||
| 69 | #define BROKEN_NON_BLOCKING_CONNECT 1 | 60 | #define BROKEN_NON_BLOCKING_CONNECT 1 |
| 70 | 61 | ||
| 71 | /* And the select implementation does 1-byte read-ahead waiting | 62 | /* And the select implementation does 1-byte read-ahead waiting |
| 72 | for received packets, so datagrams are broken too. */ | 63 | for received packets, so datagrams are broken too. */ |
| 73 | |||
| 74 | #define BROKEN_DATAGRAM_SOCKETS 1 | 64 | #define BROKEN_DATAGRAM_SOCKETS 1 |
| 75 | 65 | ||
| 76 | /* Define this symbol if your system has the functions bcopy, etc. */ | 66 | /* Define this symbol if your system has the functions bcopy, etc. */ |
| 77 | |||
| 78 | #define BSTRING | 67 | #define BSTRING |
| 79 | #define bzero(b, l) memset(b, 0, l) | 68 | #define bzero(b, l) memset(b, 0, l) |
| 80 | #define bcopy(s, d, l) memmove(d, s, l) | 69 | #define bcopy(s, d, l) memmove(d, s, l) |
| 81 | #define bcmp(a, b, l) memcmp(a, b, l) | 70 | #define bcmp(a, b, l) memcmp(a, b, l) |
| 82 | 71 | ||
| 83 | /* bcopy (aka memmove aka memcpy at least on x86) under MSVC is quite safe */ | 72 | /* bcopy (aka memmove aka memcpy at least on x86) under MSVC is quite safe. */ |
| 84 | #define GAP_USE_BCOPY 1 | 73 | #define GAP_USE_BCOPY 1 |
| 85 | #define BCOPY_UPWARD_SAFE 1 | 74 | #define BCOPY_UPWARD_SAFE 1 |
| 86 | #define BCOPY_DOWNWARD_SAFE 1 | 75 | #define BCOPY_DOWNWARD_SAFE 1 |
| 87 | 76 | ||
| 88 | /* If your system uses COFF (Common Object File Format) then define the | 77 | /* If your system uses COFF (Common Object File Format) then define the |
| 89 | preprocessor symbol "COFF". */ | 78 | preprocessor symbol "COFF". */ |
| 90 | |||
| 91 | #define COFF 1 | 79 | #define COFF 1 |
| 92 | 80 | ||
| 93 | #define MAIL_USE_POP 1 | 81 | #define MAIL_USE_POP 1 |
| @@ -101,17 +89,16 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 101 | 89 | ||
| 102 | /* ============================================================ */ | 90 | /* ============================================================ */ |
| 103 | 91 | ||
| 104 | /* Here, add any special hacks needed | 92 | /* Here, add any special hacks needed to make Emacs work on this |
| 105 | to make Emacs work on this system. For example, | 93 | system. For example, you might define certain system call names |
| 106 | you might define certain system call names that don't | 94 | that don't exist on your system, or that do different things on |
| 107 | exist on your system, or that do different things on | 95 | your system and must be used only through an encapsulation (which |
| 108 | your system and must be used only through an encapsulation | 96 | you should place, by convention, in sysdep.c). */ |
| 109 | (Which you should place, by convention, in sysdep.c). */ | ||
| 110 | 97 | ||
| 111 | /* Define this to be the separator between path elements */ | 98 | /* Define this to be the separator between path elements. */ |
| 112 | #define DIRECTORY_SEP XINT (Vdirectory_sep_char) | 99 | #define DIRECTORY_SEP XINT (Vdirectory_sep_char) |
| 113 | 100 | ||
| 114 | /* Define this to be the separator between devices and paths */ | 101 | /* Define this to be the separator between devices and paths. */ |
| 115 | #define DEVICE_SEP ':' | 102 | #define DEVICE_SEP ':' |
| 116 | 103 | ||
| 117 | /* We'll support either convention on NT. */ | 104 | /* We'll support either convention on NT. */ |
| @@ -128,7 +115,7 @@ struct sigaction { | |||
| 128 | #define SIG_SETMASK 2 | 115 | #define SIG_SETMASK 2 |
| 129 | #define SIG_UNBLOCK 3 | 116 | #define SIG_UNBLOCK 3 |
| 130 | 117 | ||
| 131 | /* The null device on Windows NT. */ | 118 | /* The null device on Windows NT. */ |
| 132 | #define NULL_DEVICE "NUL:" | 119 | #define NULL_DEVICE "NUL:" |
| 133 | 120 | ||
| 134 | #ifndef MAXPATHLEN | 121 | #ifndef MAXPATHLEN |
| @@ -218,11 +205,11 @@ struct sigaction { | |||
| 218 | 205 | ||
| 219 | #define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B") | 206 | #define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B") |
| 220 | 207 | ||
| 221 | /* get some redefinitions in place */ | 208 | /* Get some redefinitions in place. */ |
| 222 | 209 | ||
| 223 | #ifdef emacs | 210 | #ifdef emacs |
| 224 | 211 | ||
| 225 | /* calls that are emulated or shadowed */ | 212 | /* Calls that are emulated or shadowed. */ |
| 226 | #undef access | 213 | #undef access |
| 227 | #define access sys_access | 214 | #define access sys_access |
| 228 | #undef chdir | 215 | #undef chdir |
| @@ -259,17 +246,17 @@ struct sigaction { | |||
| 259 | #undef write | 246 | #undef write |
| 260 | #define write sys_write | 247 | #define write sys_write |
| 261 | 248 | ||
| 262 | /* subprocess calls that are emulated */ | 249 | /* Subprocess calls that are emulated. */ |
| 263 | #define spawnve sys_spawnve | 250 | #define spawnve sys_spawnve |
| 264 | #define wait sys_wait | 251 | #define wait sys_wait |
| 265 | #define kill sys_kill | 252 | #define kill sys_kill |
| 266 | #define signal sys_signal | 253 | #define signal sys_signal |
| 267 | 254 | ||
| 268 | /* termcap.c calls that are emulated */ | 255 | /* termcap.c calls that are emulated. */ |
| 269 | #define tputs sys_tputs | 256 | #define tputs sys_tputs |
| 270 | #define tgetstr sys_tgetstr | 257 | #define tgetstr sys_tgetstr |
| 271 | 258 | ||
| 272 | /* cm.c calls that are emulated */ | 259 | /* cm.c calls that are emulated. */ |
| 273 | #define chcheckmagic sys_chcheckmagic | 260 | #define chcheckmagic sys_chcheckmagic |
| 274 | #define cmcostinit sys_cmcostinit | 261 | #define cmcostinit sys_cmcostinit |
| 275 | #define cmgoto sys_cmgoto | 262 | #define cmgoto sys_cmgoto |
| @@ -278,7 +265,7 @@ struct sigaction { | |||
| 278 | 265 | ||
| 279 | #endif /* emacs */ | 266 | #endif /* emacs */ |
| 280 | 267 | ||
| 281 | /* map to MSVC names */ | 268 | /* Map to MSVC names. */ |
| 282 | #define execlp _execlp | 269 | #define execlp _execlp |
| 283 | #define execvp _execvp | 270 | #define execvp _execvp |
| 284 | #define fdopen _fdopen | 271 | #define fdopen _fdopen |
| @@ -312,8 +299,8 @@ typedef int pid_t; | |||
| 312 | #define utime _utime | 299 | #define utime _utime |
| 313 | #endif | 300 | #endif |
| 314 | 301 | ||
| 315 | /* this is hacky, but is necessary to avoid warnings about macro | 302 | /* This is hacky, but is necessary to avoid warnings about macro |
| 316 | redefinitions using the SDK compilers */ | 303 | redefinitions using the SDK compilers. */ |
| 317 | #ifndef __STDC__ | 304 | #ifndef __STDC__ |
| 318 | #define __STDC__ 1 | 305 | #define __STDC__ 1 |
| 319 | #define MUST_UNDEF__STDC__ | 306 | #define MUST_UNDEF__STDC__ |
| @@ -326,7 +313,7 @@ typedef int pid_t; | |||
| 326 | #undef MUST_UNDEF__STDC__ | 313 | #undef MUST_UNDEF__STDC__ |
| 327 | #endif | 314 | #endif |
| 328 | 315 | ||
| 329 | /* Defines that we need that aren't in the standard signal.h */ | 316 | /* Defines that we need that aren't in the standard signal.h. */ |
| 330 | #define SIGHUP 1 /* Hang up */ | 317 | #define SIGHUP 1 /* Hang up */ |
| 331 | #define SIGQUIT 3 /* Quit process */ | 318 | #define SIGQUIT 3 /* Quit process */ |
| 332 | #define SIGTRAP 5 /* Trace trap */ | 319 | #define SIGTRAP 5 /* Trace trap */ |
| @@ -369,8 +356,7 @@ extern char *get_emacs_configuration_options (void); | |||
| 369 | 356 | ||
| 370 | #include <sys/stat.h> | 357 | #include <sys/stat.h> |
| 371 | 358 | ||
| 372 | /* Define for those source files that do not include enough NT | 359 | /* Define for those source files that do not include enough NT system files. */ |
| 373 | system files. */ | ||
| 374 | #ifndef NULL | 360 | #ifndef NULL |
| 375 | #ifdef __cplusplus | 361 | #ifdef __cplusplus |
| 376 | #define NULL 0 | 362 | #define NULL 0 |
| @@ -405,7 +391,7 @@ extern char *get_emacs_configuration_options (void); | |||
| 405 | removed. Also, obviously, all files that define initialized data | 391 | removed. Also, obviously, all files that define initialized data |
| 406 | must include config.h to pick up this pragma. */ | 392 | must include config.h to pick up this pragma. */ |
| 407 | 393 | ||
| 408 | /* Names must be < 8 bytes */ | 394 | /* Names must be < 8 bytes. */ |
| 409 | #ifdef _MSC_VER | 395 | #ifdef _MSC_VER |
| 410 | #pragma data_seg("EMDATA") | 396 | #pragma data_seg("EMDATA") |
| 411 | #pragma bss_seg("EMBSS") | 397 | #pragma bss_seg("EMBSS") |
diff --git a/src/s/msdos.h b/src/s/msdos.h index a594bb850f4..90f630c8627 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h | |||
| @@ -21,11 +21,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 21 | /* Note: lots of stuff here was taken from s-msdos.h in demacs. */ | 21 | /* Note: lots of stuff here was taken from s-msdos.h in demacs. */ |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | /* | 24 | /* Define symbols to identify the version of Unix this is. |
| 25 | * Define symbols to identify the version of Unix this is. | 25 | Define all the symbols that apply correctly. */ |
| 26 | * Define all the symbols that apply correctly. | ||
| 27 | */ | ||
| 28 | |||
| 29 | #ifndef MSDOS | 26 | #ifndef MSDOS |
| 30 | #define MSDOS | 27 | #define MSDOS |
| 31 | #endif | 28 | #endif |
| @@ -38,40 +35,34 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 38 | #undef BSD_SYSTEM | 35 | #undef BSD_SYSTEM |
| 39 | 36 | ||
| 40 | /* SYSTEM_TYPE should indicate the kind of system you are using. | 37 | /* SYSTEM_TYPE should indicate the kind of system you are using. |
| 41 | It sets the Lisp variable system-type. */ | 38 | It sets the Lisp variable system-type. */ |
| 42 | |||
| 43 | #define SYSTEM_TYPE "ms-dos" | 39 | #define SYSTEM_TYPE "ms-dos" |
| 44 | 40 | ||
| 45 | #define SYMS_SYSTEM syms_of_dosfns();syms_of_msdos();syms_of_win16select() | 41 | #define SYMS_SYSTEM syms_of_dosfns();syms_of_msdos();syms_of_win16select() |
| 46 | 42 | ||
| 47 | #define SYSV_SYSTEM_DIR | 43 | #define SYSV_SYSTEM_DIR |
| 48 | 44 | ||
| 49 | /* Define this symbol if your system has the functions bcopy, etc. */ | 45 | /* Define this symbol if your system has the functions bcopy, etc. */ |
| 50 | |||
| 51 | #define BSTRING | 46 | #define BSTRING |
| 52 | 47 | ||
| 53 | /* Define this is the compiler understands `volatile'. */ | 48 | /* Define this is the compiler understands `volatile'. */ |
| 54 | #define HAVE_VOLATILE | 49 | #define HAVE_VOLATILE |
| 55 | 50 | ||
| 56 | 51 | ||
| 57 | /* subprocesses should be defined if you want to | 52 | /* subprocesses should be defined if you want to have code for |
| 58 | have code for asynchronous subprocesses | 53 | asynchronous subprocesses (as used in M-x compile and M-x shell). |
| 59 | (as used in M-x compile and M-x shell). | ||
| 60 | This is the only system that needs this. */ | 54 | This is the only system that needs this. */ |
| 61 | |||
| 62 | #undef subprocesses | 55 | #undef subprocesses |
| 63 | 56 | ||
| 64 | /* If your system uses COFF (Common Object File Format) then define the | 57 | /* If your system uses COFF (Common Object File Format) then define the |
| 65 | preprocessor symbol "COFF". */ | 58 | preprocessor symbol "COFF". */ |
| 66 | |||
| 67 | #define COFF | 59 | #define COFF |
| 68 | 60 | ||
| 69 | /* Here, on a separate page, add any special hacks needed | 61 | /* Here, on a separate page, add any special hacks needed to make |
| 70 | to make Emacs work on this system. For example, | 62 | Emacs work on this system. For example, you might define certain |
| 71 | you might define certain system call names that don't | 63 | system call names that don't exist on your system, or that do |
| 72 | exist on your system, or that do different things on | 64 | different things on your system and must be used only through an |
| 73 | your system and must be used only through an encapsulation | 65 | encapsulation (which you should place, by convention, in sysdep.c). */ |
| 74 | (Which you should place, by convention, in sysdep.c). */ | ||
| 75 | 66 | ||
| 76 | /* Avoid incompatibilities between gmalloc.c and system header files | 67 | /* Avoid incompatibilities between gmalloc.c and system header files |
| 77 | in how to declare valloc. */ | 68 | in how to declare valloc. */ |
| @@ -83,7 +74,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 83 | 74 | ||
| 84 | /* setjmp and longjmp can safely replace _setjmp and _longjmp, | 75 | /* setjmp and longjmp can safely replace _setjmp and _longjmp, |
| 85 | but they will run slower. */ | 76 | but they will run slower. */ |
| 86 | |||
| 87 | #define _setjmp setjmp | 77 | #define _setjmp setjmp |
| 88 | #define _longjmp longjmp | 78 | #define _longjmp longjmp |
| 89 | 79 | ||
| @@ -95,7 +85,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 95 | #define ORDINARY_LINK | 85 | #define ORDINARY_LINK |
| 96 | 86 | ||
| 97 | /* command.com does not understand `...` so we define this. */ | 87 | /* command.com does not understand `...` so we define this. */ |
| 98 | #define LIB_GCC -Lgcc | ||
| 99 | #define SEPCHAR ';' | 88 | #define SEPCHAR ';' |
| 100 | 89 | ||
| 101 | #define NULL_DEVICE "nul" | 90 | #define NULL_DEVICE "nul" |
| @@ -110,17 +99,17 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 110 | :AB=<BG %d>:AF=<FG %d>:op=<DefC>:" | 99 | :AB=<BG %d>:AF=<FG %d>:op=<DefC>:" |
| 111 | 100 | ||
| 112 | /* Define this to a function (Fdowncase, Fupcase) if your file system | 101 | /* Define this to a function (Fdowncase, Fupcase) if your file system |
| 113 | likes that */ | 102 | likes that. */ |
| 114 | #define FILE_SYSTEM_CASE Fmsdos_downcase_filename | 103 | #define FILE_SYSTEM_CASE Fmsdos_downcase_filename |
| 115 | 104 | ||
| 116 | /* Define this to be the separator between devices and paths */ | 105 | /* Define this to be the separator between devices and paths. */ |
| 117 | #define DEVICE_SEP ':' | 106 | #define DEVICE_SEP ':' |
| 118 | 107 | ||
| 119 | /* We'll support either convention on MSDOG. */ | 108 | /* We'll support either convention on MSDOG. */ |
| 120 | #define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\') | 109 | #define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\') |
| 121 | #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) | 110 | #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) |
| 122 | 111 | ||
| 123 | /* bcopy under djgpp is quite safe */ | 112 | /* bcopy under djgpp is quite safe. */ |
| 124 | #define GAP_USE_BCOPY | 113 | #define GAP_USE_BCOPY |
| 125 | #define BCOPY_UPWARD_SAFE 1 | 114 | #define BCOPY_UPWARD_SAFE 1 |
| 126 | #define BCOPY_DOWNWARD_SAFE 1 | 115 | #define BCOPY_DOWNWARD_SAFE 1 |
| @@ -140,9 +129,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 140 | commentary below, in the non-X branch. The 140KB number was | 129 | commentary below, in the non-X branch. The 140KB number was |
| 141 | measured on GNU/Linux and on MS-WIndows. */ | 130 | measured on GNU/Linux and on MS-WIndows. */ |
| 142 | #define SYSTEM_PURESIZE_EXTRA (-170000+140000) | 131 | #define SYSTEM_PURESIZE_EXTRA (-170000+140000) |
| 143 | #define MSDOS_LIBS_SYSTEM -lxext -lsys | ||
| 144 | #else | 132 | #else |
| 145 | #define MSDOS_LIBS_SYSTEM | ||
| 146 | /* We need a little extra space, see ../../lisp/loadup.el. | 133 | /* We need a little extra space, see ../../lisp/loadup.el. |
| 147 | As of 20091024, DOS-specific files use up 62KB of pure space. But | 134 | As of 20091024, DOS-specific files use up 62KB of pure space. But |
| 148 | overall, we end up wasting 130KB of pure space, because | 135 | overall, we end up wasting 130KB of pure space, because |
| @@ -156,9 +143,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 156 | #endif | 143 | #endif |
| 157 | 144 | ||
| 158 | /* Tell the garbage collector that setjmp is known to save all | 145 | /* Tell the garbage collector that setjmp is known to save all |
| 159 | registers relevant for conservative garbage collection in the | 146 | registers relevant for conservative garbage collection in the jmp_buf. */ |
| 160 | jmp_buf. */ | ||
| 161 | |||
| 162 | #define GC_SETJMP_WORKS 1 | 147 | #define GC_SETJMP_WORKS 1 |
| 163 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS | 148 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS |
| 164 | 149 | ||
diff --git a/src/s/netbsd.h b/src/s/netbsd.h index fa6d1141c8c..4874ec9af56 100644 --- a/src/s/netbsd.h +++ b/src/s/netbsd.h | |||
| @@ -19,23 +19,17 @@ You should have received a copy of the GNU General Public License | |||
| 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | /* Get most of the stuff from bsd-common */ | 22 | /* Get most of the stuff from bsd-common. */ |
| 23 | #include "bsd-common.h" | 23 | #include "bsd-common.h" |
| 24 | 24 | ||
| 25 | #define HAVE_GETLOADAVG 1 | 25 | #define HAVE_GETLOADAVG 1 |
| 26 | 26 | ||
| 27 | #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) | 27 | #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) |
| 28 | 28 | ||
| 29 | #undef LIB_GCC | ||
| 30 | #define LIB_GCC | ||
| 31 | |||
| 32 | #define AMPERSAND_FULL_NAME | ||
| 33 | |||
| 34 | /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears | 29 | /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears |
| 35 | the library search parth, i.e. it won't search /usr/lib | 30 | the library search parth, i.e. it won't search /usr/lib |
| 36 | for libc and friends. Using -nostartfiles instead avoids | 31 | for libc and friends. Using -nostartfiles instead avoids |
| 37 | this problem, and will also work on earlier NetBSD releases */ | 32 | this problem, and will also work on earlier NetBSD releases. */ |
| 38 | |||
| 39 | #define LINKER $(CC) -nostartfiles | 33 | #define LINKER $(CC) -nostartfiles |
| 40 | 34 | ||
| 41 | #define DEFAULT_SOUND_DEVICE "/dev/audio" | 35 | #define DEFAULT_SOUND_DEVICE "/dev/audio" |
| @@ -43,7 +37,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 43 | /* Greg A. Woods <woods@weird.com> says we must include signal.h | 37 | /* Greg A. Woods <woods@weird.com> says we must include signal.h |
| 44 | before syssignal.h is included, to work around interface conflicts | 38 | before syssignal.h is included, to work around interface conflicts |
| 45 | that are handled with CPP __RENAME() macro in signal.h. */ | 39 | that are handled with CPP __RENAME() macro in signal.h. */ |
| 46 | |||
| 47 | #ifndef NOT_C_CODE | 40 | #ifndef NOT_C_CODE |
| 48 | #include <signal.h> | 41 | #include <signal.h> |
| 49 | #endif | 42 | #endif |
| @@ -51,17 +44,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 51 | /* Don't close pty in process.c to make it as controlling terminal. | 44 | /* Don't close pty in process.c to make it as controlling terminal. |
| 52 | It is already a controlling terminal of subprocess, because we did | 45 | It is already a controlling terminal of subprocess, because we did |
| 53 | ioctl TIOCSCTTY. */ | 46 | ioctl TIOCSCTTY. */ |
| 54 | |||
| 55 | #define DONT_REOPEN_PTY | 47 | #define DONT_REOPEN_PTY |
| 56 | 48 | ||
| 57 | /* Tell that garbage collector that setjmp is known to save all | 49 | /* Tell that garbage collector that setjmp is known to save all |
| 58 | registers relevant for conservative garbage collection in the | 50 | registers relevant for conservative garbage collection in the jmp_buf. */ |
| 59 | jmp_buf. */ | ||
| 60 | |||
| 61 | #define GC_SETJMP_WORKS 1 | 51 | #define GC_SETJMP_WORKS 1 |
| 62 | 52 | ||
| 63 | /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method. */ | 53 | /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method. */ |
| 64 | |||
| 65 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS | 54 | #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS |
| 66 | 55 | ||
| 67 | /* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81 | 56 | /* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81 |
diff --git a/src/s/sol2-10.h b/src/s/sol2-10.h index 865e17525c4..fd74ae798c9 100644 --- a/src/s/sol2-10.h +++ b/src/s/sol2-10.h | |||
| @@ -4,20 +4,18 @@ | |||
| 4 | 4 | ||
| 5 | #define SYSTEM_MALLOC | 5 | #define SYSTEM_MALLOC |
| 6 | 6 | ||
| 7 | /* | 7 | /* Use the Solaris dldump() function, called from unexsol.c, to dump |
| 8 | * Use the Solaris dldump() function, called from unexsol.c, to dump | 8 | emacs, instead of the generic ELF dump code found in unexelf.c. |
| 9 | * emacs, instead of the generic ELF dump code found in unexelf.c. | 9 | The resulting binary has a complete symbol table, and is better |
| 10 | * The resulting binary has a complete symbol table, and is better | 10 | for debugging and other observabilty tools (debuggers, pstack, etc). |
| 11 | * for debugging and other observabilty tools (debuggers, pstack, etc). | 11 | |
| 12 | * | 12 | If you encounter a problem using dldump(), please consider sending |
| 13 | * If you encounter a problem using dldump(), please consider sending | 13 | a message to the OpenSolaris tools-linking mailing list: |
| 14 | * a message to the OpenSolaris tools-linking mailing list: | 14 | http://mail.opensolaris.org/mailman/listinfo/tools-linking |
| 15 | * http://mail.opensolaris.org/mailman/listinfo/tools-linking | 15 | |
| 16 | * | 16 | It is likely that dldump() works with older Solaris too, |
| 17 | * It is likely that dldump() works with older Solaris too, | 17 | but this has not been tested, and so, this change is for |
| 18 | * but this has not been tested, and so, this change is for | 18 | Solaris 10 and newer only at this time. */ |
| 19 | * Solaris 10 and newer only at this time. | ||
| 20 | */ | ||
| 21 | #undef UNEXEC | 19 | #undef UNEXEC |
| 22 | #define UNEXEC unexsol.o | 20 | #define UNEXEC unexsol.o |
| 23 | 21 | ||
diff --git a/src/s/template.h b/src/s/template.h index b3a88c0b28c..16df03092d2 100644 --- a/src/s/template.h +++ b/src/s/template.h | |||
| @@ -21,10 +21,8 @@ You should have received a copy of the GNU General Public License | |||
| 21 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 21 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | /* | 24 | /* Define symbols to identify the version of Unix this is. |
| 25 | * Define symbols to identify the version of Unix this is. | 25 | Define all the symbols that apply correctly. */ |
| 26 | * Define all the symbols that apply correctly. | ||
| 27 | */ | ||
| 28 | 26 | ||
| 29 | /* #define USG5 */ | 27 | /* #define USG5 */ |
| 30 | /* #define USG */ | 28 | /* #define USG */ |
| @@ -34,7 +32,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 34 | /* #define BSD_SYSTEM */ | 32 | /* #define BSD_SYSTEM */ |
| 35 | 33 | ||
| 36 | /* SYSTEM_TYPE should indicate the kind of system you are using. | 34 | /* SYSTEM_TYPE should indicate the kind of system you are using. |
| 37 | It sets the Lisp variable system-type. */ | 35 | It sets the Lisp variable system-type. */ |
| 38 | 36 | ||
| 39 | #define SYSTEM_TYPE "berkeley-unix" | 37 | #define SYSTEM_TYPE "berkeley-unix" |
| 40 | 38 | ||
| @@ -58,55 +56,46 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 58 | Another method of doing input is planned but not implemented. | 56 | Another method of doing input is planned but not implemented. |
| 59 | It would have Emacs fork off a separate process | 57 | It would have Emacs fork off a separate process |
| 60 | to read the input and send it to the true Emacs process | 58 | to read the input and send it to the true Emacs process |
| 61 | through a pipe. */ | 59 | through a pipe. */ |
| 62 | |||
| 63 | #define INTERRUPT_INPUT | 60 | #define INTERRUPT_INPUT |
| 64 | 61 | ||
| 65 | /* Letter to use in finding device name of first pty, | 62 | /* Letter to use in finding device name of first pty, |
| 66 | if system supports pty's. 'a' means it is /dev/ptya0 */ | 63 | if system supports pty's. 'a' means it is /dev/ptya0. */ |
| 67 | |||
| 68 | #define FIRST_PTY_LETTER 'a' | 64 | #define FIRST_PTY_LETTER 'a' |
| 69 | 65 | ||
| 70 | /* | 66 | /* Define HAVE_TERMIOS if the system provides POSIX-style |
| 71 | * Define HAVE_TERMIOS if the system provides POSIX-style | 67 | functions and macros for terminal control. |
| 72 | * functions and macros for terminal control. | 68 | |
| 73 | * | 69 | Define HAVE_TERMIO if the system provides sysV-style ioctls |
| 74 | * Define HAVE_TERMIO if the system provides sysV-style ioctls | 70 | for terminal control. |
| 75 | * for terminal control. | 71 | |
| 76 | * | 72 | Do not define both. HAVE_TERMIOS is preferred, if it is |
| 77 | * Do not define both. HAVE_TERMIOS is preferred, if it is | 73 | supported on your system. */ |
| 78 | * supported on your system. | ||
| 79 | */ | ||
| 80 | 74 | ||
| 81 | #define HAVE_TERMIOS | 75 | #define HAVE_TERMIOS |
| 82 | /* #define HAVE_TERMIO */ | 76 | /* #define HAVE_TERMIO */ |
| 83 | 77 | ||
| 84 | /* | 78 | /* Define HAVE_PTYS if the system supports pty devices. */ |
| 85 | * Define HAVE_PTYS if the system supports pty devices. | ||
| 86 | */ | ||
| 87 | |||
| 88 | #define HAVE_PTYS | 79 | #define HAVE_PTYS |
| 89 | 80 | ||
| 90 | /* Define this symbol if your system has the functions bcopy, etc. */ | 81 | /* Define this symbol if your system has the functions bcopy, etc. */ |
| 91 | |||
| 92 | #define BSTRING | 82 | #define BSTRING |
| 93 | 83 | ||
| 94 | /* subprocesses should be undefined if you do NOT want to | 84 | /* subprocesses should be undefined if you do NOT want to |
| 95 | have code for asynchronous subprocesses | 85 | have code for asynchronous subprocesses |
| 96 | (as used in M-x compile and M-x shell). | 86 | (as used in M-x compile and M-x shell). |
| 97 | Currently only MSDOS does not support this. */ | 87 | Currently only MSDOS does not support this. */ |
| 98 | 88 | ||
| 99 | /* #undef subprocesses */ | 89 | /* #undef subprocesses */ |
| 100 | 90 | ||
| 101 | /* If your system uses COFF (Common Object File Format) then define the | 91 | /* If your system uses COFF (Common Object File Format) then define the |
| 102 | preprocessor symbol "COFF". */ | 92 | preprocessor symbol "COFF". */ |
| 103 | 93 | ||
| 104 | /* #define COFF */ | 94 | /* #define COFF */ |
| 105 | 95 | ||
| 106 | /* Define CLASH_DETECTION if you want lock files to be written | 96 | /* Define CLASH_DETECTION if you want lock files to be written |
| 107 | so that Emacs can tell instantly when you try to modify | 97 | so that Emacs can tell instantly when you try to modify |
| 108 | a file that someone else has modified in his Emacs. */ | 98 | a file that someone else has modified in his Emacs. */ |
| 109 | |||
| 110 | #define CLASH_DETECTION | 99 | #define CLASH_DETECTION |
| 111 | 100 | ||
| 112 | /* Define this if your operating system declares signal handlers to | 101 | /* Define this if your operating system declares signal handlers to |
| @@ -127,12 +116,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 127 | 116 | ||
| 128 | /* ============================================================ */ | 117 | /* ============================================================ */ |
| 129 | 118 | ||
| 130 | /* Here, add any special hacks needed | 119 | /* Here, add any special hacks needed to make Emacs work on this |
| 131 | to make Emacs work on this system. For example, | 120 | system. For example, you might define certain system call names |
| 132 | you might define certain system call names that don't | 121 | that don't exist on your system, or that do different things on |
| 133 | exist on your system, or that do different things on | 122 | your system and must be used only through an encapsulation (which |
| 134 | your system and must be used only through an encapsulation | 123 | you should place, by convention, in sysdep.c). */ |
| 135 | (Which you should place, by convention, in sysdep.c). */ | ||
| 136 | 124 | ||
| 137 | /* If the system's imake configuration file defines `NeedWidePrototypes' | 125 | /* If the system's imake configuration file defines `NeedWidePrototypes' |
| 138 | as `NO', we must define NARROWPROTO manually. Such a define is | 126 | as `NO', we must define NARROWPROTO manually. Such a define is |
diff --git a/src/s/unixware.h b/src/s/unixware.h index 31d7b25269a..864f09786b6 100644 --- a/src/s/unixware.h +++ b/src/s/unixware.h | |||
| @@ -35,8 +35,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 35 | /* This sets the name of the slave side of the PTY. On SysVr4, | 35 | /* This sets the name of the slave side of the PTY. On SysVr4, |
| 36 | grantpt(3) forks a subprocess, so keep sigchld_handler() from | 36 | grantpt(3) forks a subprocess, so keep sigchld_handler() from |
| 37 | intercepting that death. If any child but grantpt's should die | 37 | intercepting that death. If any child but grantpt's should die |
| 38 | within, it should be caught after sigrelse(2). */ | 38 | within, it should be caught after sigrelse(2). */ |
| 39 | |||
| 40 | #define PTY_TTY_NAME_SPRINTF \ | 39 | #define PTY_TTY_NAME_SPRINTF \ |
| 41 | { \ | 40 | { \ |
| 42 | char *ptsname(), *ptyname; \ | 41 | char *ptsname(), *ptyname; \ |
| @@ -54,12 +53,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 54 | } | 53 | } |
| 55 | 54 | ||
| 56 | /* Data type of load average, as read out of kmem. */ | 55 | /* Data type of load average, as read out of kmem. */ |
| 57 | |||
| 58 | #define LOAD_AVE_TYPE long | 56 | #define LOAD_AVE_TYPE long |
| 59 | 57 | ||
| 60 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 58 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 61 | /* This is totally uncalibrated. */ | 59 | /* This is totally uncalibrated. */ |
| 62 | |||
| 63 | #define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE)) | 60 | #define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE)) |
| 64 | #define FSCALE 256.0 | 61 | #define FSCALE 256.0 |
| 65 | 62 | ||
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h index 3926ae08869..f870086368c 100644 --- a/src/s/usg5-4.h +++ b/src/s/usg5-4.h | |||
| @@ -3,6 +3,9 @@ | |||
| 3 | Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005, | 3 | Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005, |
| 4 | 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | Written by James Van Artsdalen of Dell Computer Corp. james@bigtex.cactus.org. | ||
| 7 | Subsequently improved for Dell 2.2 by Eric S. Raymond <esr@snark.thyrsus.com>. | ||
| 8 | |||
| 6 | This file is part of GNU Emacs. | 9 | This file is part of GNU Emacs. |
| 7 | 10 | ||
| 8 | GNU Emacs is free software: you can redistribute it and/or modify | 11 | GNU Emacs is free software: you can redistribute it and/or modify |
| @@ -18,57 +21,36 @@ GNU General Public License for more details. | |||
| 18 | You should have received a copy of the GNU General Public License | 21 | You should have received a copy of the GNU General Public License |
| 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 22 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 20 | 23 | ||
| 21 | /* This file written by James Van Artsdalen of Dell Computer Corporation. | 24 | /* Use the SysVr3 file for at least base configuration. */ |
| 22 | * james@bigtex.cactus.org. Subsequently improved for Dell 2.2 by Eric | ||
| 23 | * S. Raymond <esr@snark.thyrsus.com>. | ||
| 24 | */ | ||
| 25 | |||
| 26 | /* Use the SysVr3 file for at least base configuration. */ | ||
| 27 | |||
| 28 | #define USG /* System III, System V, etc */ | 25 | #define USG /* System III, System V, etc */ |
| 29 | 26 | ||
| 30 | #define USG5 | 27 | #define USG5 |
| 31 | #define USG5_4 | 28 | #define USG5_4 |
| 32 | 29 | ||
| 33 | /* SYSTEM_TYPE should indicate the kind of system you are using. | 30 | /* SYSTEM_TYPE should indicate the kind of system you are using. |
| 34 | It sets the Lisp variable system-type. */ | 31 | It sets the Lisp variable system-type. */ |
| 35 | |||
| 36 | #define SYSTEM_TYPE "usg-unix-v" | 32 | #define SYSTEM_TYPE "usg-unix-v" |
| 37 | 33 | ||
| 38 | /* | 34 | /* Define HAVE_TERMIO if the system provides sysV-style ioctls |
| 39 | * Define HAVE_TERMIO if the system provides sysV-style ioctls | 35 | for terminal control. */ |
| 40 | * for terminal control. | ||
| 41 | */ | ||
| 42 | |||
| 43 | #define HAVE_TERMIO | 36 | #define HAVE_TERMIO |
| 44 | 37 | ||
| 45 | /* | 38 | /* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library |
| 46 | * Define HAVE_PTYS if the system supports pty devices. | 39 | functions. Almost, but not quite the same as the 4.2 functions. */ |
| 47 | */ | ||
| 48 | |||
| 49 | /* | ||
| 50 | * Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir | ||
| 51 | * library functions. Almost, but not quite the same as | ||
| 52 | * the 4.2 functions | ||
| 53 | */ | ||
| 54 | #define SYSV_SYSTEM_DIR | 40 | #define SYSV_SYSTEM_DIR |
| 55 | 41 | ||
| 56 | /* The file containing the kernel's symbol table is called /unix. */ | 42 | /* The file containing the kernel's symbol table is called /unix. */ |
| 57 | |||
| 58 | #define KERNEL_FILE "/unix" | 43 | #define KERNEL_FILE "/unix" |
| 59 | 44 | ||
| 60 | /* The symbol in the kernel where the load average is found | 45 | /* The kernel symbol where the load average is found is named avenrun. */ |
| 61 | is named avenrun. */ | ||
| 62 | |||
| 63 | #define LDAV_SYMBOL "avenrun" | 46 | #define LDAV_SYMBOL "avenrun" |
| 64 | 47 | ||
| 65 | /* setjmp and longjmp can safely replace _setjmp and _longjmp, | 48 | /* setjmp and longjmp can safely replace _setjmp and _longjmp, |
| 66 | but they will run slower. */ | 49 | but they will run slower. */ |
| 67 | |||
| 68 | #define _setjmp setjmp | 50 | #define _setjmp setjmp |
| 69 | #define _longjmp longjmp | 51 | #define _longjmp longjmp |
| 70 | 52 | ||
| 71 | /* On USG systems these have different names */ | 53 | /* On USG systems these have different names. */ |
| 72 | #ifndef HAVE_INDEX | 54 | #ifndef HAVE_INDEX |
| 73 | #define index strchr | 55 | #define index strchr |
| 74 | #endif /* ! defined (HAVE_INDEX) */ | 56 | #endif /* ! defined (HAVE_INDEX) */ |
| @@ -76,35 +58,27 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 76 | #define rindex strrchr | 58 | #define rindex strrchr |
| 77 | #endif /* ! defined (HAVE_RINDEX) */ | 59 | #endif /* ! defined (HAVE_RINDEX) */ |
| 78 | 60 | ||
| 79 | 61 | /* The docs for system V/386 suggest v.3 has sigpause, so let's try it. */ | |
| 80 | /* The docs for system V/386 suggest v.3 has sigpause, | ||
| 81 | so let's give it a try. */ | ||
| 82 | #define HAVE_SYSV_SIGPAUSE | 62 | #define HAVE_SYSV_SIGPAUSE |
| 83 | 63 | ||
| 84 | 64 | /* If we're using the System V X port, BSD bstring functions will be handy. */ | |
| 85 | /* If we're using the System V X port, BSD bstring functions will be handy */ | ||
| 86 | |||
| 87 | #ifdef HAVE_X_WINDOWS | 65 | #ifdef HAVE_X_WINDOWS |
| 88 | #define BSTRING | 66 | #define BSTRING |
| 89 | #endif /* HAVE_X_WINDOWS */ | 67 | #endif /* HAVE_X_WINDOWS */ |
| 90 | 68 | ||
| 91 | /* On USG systems signal handlers return void */ | 69 | /* On USG systems signal handlers return void. */ |
| 92 | |||
| 93 | #define SIGTYPE void | 70 | #define SIGTYPE void |
| 94 | 71 | ||
| 95 | #define ORDINARY_LINK | 72 | #define ORDINARY_LINK |
| 96 | 73 | ||
| 97 | /* Undump with ELF */ | 74 | /* Undump with ELF. */ |
| 98 | |||
| 99 | #undef COFF | 75 | #undef COFF |
| 100 | 76 | ||
| 101 | #define UNEXEC unexelf.o | 77 | #define UNEXEC unexelf.o |
| 102 | 78 | ||
| 103 | /* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct | 79 | /* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars. |
| 104 | * tchars. But get <termio.h> first to make sure ttold.h doesn't | 80 | But get <termio.h> first to make sure ttold.h doesn't interfere. |
| 105 | * interfere. And don't try to use SIGIO yet. | 81 | And don't try to use SIGIO yet. */ |
| 106 | */ | ||
| 107 | |||
| 108 | #ifndef NOT_C_CODE | 82 | #ifndef NOT_C_CODE |
| 109 | #include <sys/wait.h> | 83 | #include <sys/wait.h> |
| 110 | #endif | 84 | #endif |
| @@ -121,15 +95,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 121 | #endif | 95 | #endif |
| 122 | 96 | ||
| 123 | /* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments; | 97 | /* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments; |
| 124 | * instead, there's a system variable _sys_nsig. Unfortunately, we need the | 98 | instead, there's a system variable _sys_nsig. Unfortunately, we need the |
| 125 | * constant to dimension an array. So wire in the appropriate value here. | 99 | constant to dimension an array. So wire in the appropriate value here. */ |
| 126 | */ | ||
| 127 | #define NSIG_MINIMUM 32 | 100 | #define NSIG_MINIMUM 32 |
| 128 | 101 | ||
| 129 | /* We can support this */ | 102 | /* We can support this. */ |
| 130 | |||
| 131 | #define CLASH_DETECTION | 103 | #define CLASH_DETECTION |
| 132 | 104 | ||
| 105 | /* Define HAVE_PTYS if the system supports pty devices. */ | ||
| 133 | #define HAVE_PTYS | 106 | #define HAVE_PTYS |
| 134 | #define HAVE_TERMIOS | 107 | #define HAVE_TERMIOS |
| 135 | 108 | ||
| @@ -137,7 +110,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 137 | waiting, because a previous waitsys(2) cleaned up the carcass of child | 110 | waiting, because a previous waitsys(2) cleaned up the carcass of child |
| 138 | without clearing the SIGCHLD pending info. So, use a non-blocking | 111 | without clearing the SIGCHLD pending info. So, use a non-blocking |
| 139 | wait3 instead, which maps to waitpid(2) in SysVr4. */ | 112 | wait3 instead, which maps to waitpid(2) in SysVr4. */ |
| 140 | |||
| 141 | #define wait3(status, options, rusage) \ | 113 | #define wait3(status, options, rusage) \ |
| 142 | waitpid ((pid_t) -1, (status), (options)) | 114 | waitpid ((pid_t) -1, (status), (options)) |
| 143 | #define WRETCODE(w) (w >> 8) | 115 | #define WRETCODE(w) (w >> 8) |
| @@ -145,20 +117,16 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 145 | /* TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY | 117 | /* TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY |
| 146 | subprocesses the usual way. But TIOCSIGNAL does work for PTYs, and | 118 | subprocesses the usual way. But TIOCSIGNAL does work for PTYs, and |
| 147 | this is all we need. */ | 119 | this is all we need. */ |
| 148 | |||
| 149 | #define TIOCSIGSEND TIOCSIGNAL | 120 | #define TIOCSIGSEND TIOCSIGNAL |
| 150 | 121 | ||
| 151 | /* This change means that we don't loop through allocate_pty too many | 122 | /* This change means that we don't loop through allocate_pty too many |
| 152 | times in the (rare) event of a failure. */ | 123 | times in the (rare) event of a failure. */ |
| 153 | |||
| 154 | #define FIRST_PTY_LETTER 'z' | 124 | #define FIRST_PTY_LETTER 'z' |
| 155 | 125 | ||
| 156 | /* This sets the name of the master side of the PTY. */ | 126 | /* This sets the name of the master side of the PTY. */ |
| 157 | |||
| 158 | #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx"); | 127 | #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx"); |
| 159 | 128 | ||
| 160 | /* Push various streams modules onto a PTY channel. */ | 129 | /* Push various streams modules onto a PTY channel. */ |
| 161 | |||
| 162 | #define SETUP_SLAVE_PTY \ | 130 | #define SETUP_SLAVE_PTY \ |
| 163 | if (ioctl (xforkin, I_PUSH, "ptem") == -1) \ | 131 | if (ioctl (xforkin, I_PUSH, "ptem") == -1) \ |
| 164 | fatal ("ioctl I_PUSH ptem", errno); \ | 132 | fatal ("ioctl I_PUSH ptem", errno); \ |
| @@ -167,8 +135,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 167 | if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \ | 135 | if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \ |
| 168 | fatal ("ioctl I_PUSH ttcompat", errno); | 136 | fatal ("ioctl I_PUSH ttcompat", errno); |
| 169 | 137 | ||
| 170 | /* This definition was suggested for next release. | 138 | /* This definition was suggested for next release. So give it a try. */ |
| 171 | So give it a try. */ | ||
| 172 | #define HAVE_SOCKETS | 139 | #define HAVE_SOCKETS |
| 173 | 140 | ||
| 174 | /* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6 | 141 | /* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6 |
diff --git a/src/xdisp.c b/src/xdisp.c index 34580d22a1e..16936b977fd 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -2698,8 +2698,12 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id) | |||
| 2698 | /* Are multibyte characters enabled in current_buffer? */ | 2698 | /* Are multibyte characters enabled in current_buffer? */ |
| 2699 | it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); | 2699 | it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); |
| 2700 | 2700 | ||
| 2701 | /* Do we need to reorder bidirectional text? */ | 2701 | /* Do we need to reorder bidirectional text? Not if this is a |
| 2702 | it->bidi_p = !NILP (current_buffer->bidi_display_reordering); | 2702 | unibyte buffer: by definition, none of the single-byte characters |
| 2703 | are strong R2L, so no reordering is needed. And bidi.c doesn't | ||
| 2704 | support unibyte buffers anyway. */ | ||
| 2705 | it->bidi_p | ||
| 2706 | = !NILP (current_buffer->bidi_display_reordering) && it->multibyte_p; | ||
| 2703 | 2707 | ||
| 2704 | /* Non-zero if we should highlight the region. */ | 2708 | /* Non-zero if we should highlight the region. */ |
| 2705 | highlight_region_p | 2709 | highlight_region_p |