Commit graph

28913 commits

Author SHA1 Message Date
Glenn Morris
faf535f8e6 src/Makefile.in minor simplification,
* src/Makefile.in (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT): New variables.
(WINDOW_SUPPORT) [HAVE_WINDOW_SYSTEM]: Use them.
2010-04-28 00:25:47 -07:00
Glenn Morris
c40f944923 Define CYGWIN_OBJ with configure, not cpp.
* configure.in (CYGWIN_OBJ): New output variable.
* src/Makefile.in (CYGWIN_OBJ): Set with configure, not cpp.
2010-04-28 00:20:39 -07:00
Glenn Morris
658f86ca32 Set GPM part of MOUSE_SUPPORT with configure, not cpp.
* configure.in (GPM_MOUSE_SUPPORT): New output variable.
* src/Makefile.in (GPM_MOUSE_SUPPORT): New, set by configure.
(MOUSE_SUPPORT) [!HAVE_MOUSE]: Use $GPM_MOUSE_SUPPORT.
2010-04-28 00:15:10 -07:00
Glenn Morris
bc0b5f6185 Set FONT_DRIVERS with configure rather than cpp.
* configure.in (FONT_OBJ): New output variable.
* src/Makefile.in (FONT_OBJ): New, set by configure.
(FONT_DRIVERS): Use $FONT_OBJ.
2010-04-28 00:08:53 -07:00
Glenn Morris
294c50a065 Move LIBXMU from cpp to configure.
* configure.in (LIBXMU): New output variable.

* src/Makefile.in (LIBXMU): Set with configure, not cpp.
* src/s/aix4-2.h (LIBXMU):
* src/s/hpux10-20.h (LIBXMU):
Remove definition, now set in configure.
2010-04-28 00:01:43 -07:00
Glenn Morris
e6ec4e9921 Move NS_OBJ, NS_SUPPORT from cpp to configure.
* configure.in (NS_OBJ, NS_SUPPORT): New output variables.
* src/Makefile.in (NS_OBJ, NS_SUPPORT): Set with configure, not cpp.
2010-04-27 23:54:25 -07:00
Glenn Morris
f1e3642ad5 Missing src/ChangeLog for previous commit. 2010-04-27 23:45:35 -07:00
Glenn Morris
44e3d510df Move test for 64-bit kernel with 32-bit userland to configure.
See discussion in bug#5655.

* configure.in (machine, canonical): On amdx86-64, check for a 32-bit
userland and maybe change values to i386 (move test from s/amdx86-64.h).

* src/m/amdx86-64.h [i386]: Move this test to configure.in.
2010-04-27 23:43:38 -07:00
Glenn Morris
8fdac2c337 Move LIBXTR6 from cpp to autoconf.
* configure.in (LIBXTR6): New output variable.  Move unixware special
case here from src/s/unixware.h.

* src/Makefile.in (LIBXTR6): Set with configure, not cpp.
* src/s/unixware.h (NEED_LIBW): Remove definition.

* admin/CPP-DEFINES: Remove NEED_LIBW.
2010-04-27 01:09:01 -07:00
Glenn Morris
986fb647cc Replace LUCID_LIBW, MOTIF_LIBW with TOOLKIT_LIBW.
* configure.in (LUCID_LIBW, MOTIF_LIBW): No longer substitute in Makefiles.
(TOOLKIT_LIBW): New output variable, replacing LUCID_LIBW/MOTIF_LIBW.

* src/Makefile.in (LUCID_LIBW, MOTIF_LIBW): Remove, replacing by...
(TOOLKIT_LIBW): New, set by configure.
(@X_TOOLKIT_TYPE@): No longer define it.
2010-04-27 00:33:35 -07:00
Glenn Morris
c6ea2936cc Move MOTIF_LIBW to autoconf.
* configure.in (HAVE_MOTIF_2_1): Remove unused variable.
(LIBXP): No longer substitute in Makefiles.
(MOTIF_LIBW): New output variable.  Move system-specific settings here
from src/s files.

* src/Makefile.in (LIBXP): Remove, since included in MOTIF_LIBW.
(MOTIF_LIBW): Set with configure, not cpp.
* s/aix4-2.h (LIB_MOTIF):
* s/gnu-linux.h (LIB_MOTIF):
* s/unixware.h (LIB_MOTIF): Move to configure.in.

* admin/CPP-DEFINES: Remove LIB_MOTIF.
2010-04-27 00:02:12 -07:00
Jan Djärv
08b47d3d19 Regenerate configure and cibfig.in 2010-04-27 08:20:03 +02:00
Dan Nicolaescu
ed6281b066 Reduce CPP usage.
* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE, C_SWITCH_X_SITE): Remove
definitions and undefs.  Inline definitions in the only user.
(ALL_CFLAGS): Substitute C_SWITCH_X_SYSTEM using autoconf.

* Makefile.in (C_SWITCH_X_SYSTEM): Define using autoconf.

* Makefile.in (C_SWITCH_X_SYSTEM): Define using autoconf.

* configure.in (C_SWITCH_X_SYSTEM): Define using autoconf, not cpp.
2010-04-26 22:24:53 -07:00
Dan Nicolaescu
aaa36002be Reduce CPP usage.
* Makefile.in (LIB_X11_LIB): Remove, inline in the only user.
(obj): Use autoconf for unexec instead of cpp.

* configure.in (LIB_X11_LIB): Remove, inline in the only user.
(unexec): Define unconditionally, all platforms define
UNEXEC.  AC_SUBST it.
(UNEXEC_SRC): Remove, unused.
2010-04-26 20:47:47 -07:00
Glenn Morris
8ea5f2d92f Remove some AC_DEFINEs that are now unused.
* configure.in (HAVE_MOTIF_2_1, HAVE_LIBXP): Remove unused AC_DEFINEs,
replaced by LIBXP.

* configure, src/config.in: Regenerate.
2010-04-26 20:32:39 -07:00
Glenn Morris
76cda504fb Use $CRT_DIR in more places.
* configure.in (--with-crt-dir): Doc fix (now valid for all platforms).
(CRT_DIR): On (powerpc64|sparc64)-*-linux-gnu*, default to /usr/lib64.
On hpux10-20, default to /lib.

* src/m/amdx86-64.h (START_FILES, LIB_STANDARD): Change the logic around,
since the defaults (set by the system file) are fine in most cases.
[GNU_LINUX, __OpenBSD__, __NetBSD__, __APPLE__]: Remove sections.
* src/m/ibms390x.h (START_FILES, LIB_STANDARD):
* src/m/macppc.h (START_FILES, LIB_STANDARD) [GNU_LINUX]:
* src/m/sparc.h (START_FILES, LIB_STANDARD) [__linux__]:
Remove definitions, since they are set correctly in s/gnu-linux.h.
* src/s/freebsd.h (START_FILES, LIB_STANDARD):
* src/s/gnu-linux.h (START_FILES, LIB_STANDARD):
* src/s/hpux10-20.h (START_FILES):
* src/s/netbsd.h (START_FILES, LIB_STANDARD, START_FILES_1, END_FILES_1):
Use $CRT_DIR in place of fixed /usr/lib, /lib directories.

* src/Makefile.in: Comment.
2010-04-26 20:14:14 -07:00
Glenn Morris
b678dd8b8e Replace some more cpp with autoconf.
* configure.in (LUCID_LIBW, LIBXP, WIDGET_OBJ): New output variables.

* src/Makefile.in (LIBXP, LUCID_LIBW, WIDGET_OBJ): Set via configure.
(MOTIF_LIBW): Use $LIBXP.
(otherobj): Use $WIDGET_OBJ.
2010-04-26 19:36:20 -07:00
Dan Nicolaescu
10ccb130e0 * Makefile.in (LIBS_MACHINE): Remove, unused. 2010-04-26 11:23:01 -07:00
Dan Nicolaescu
7e10844c72 * Makefile.in (LIBS_MACHINE): Remove, unused.
* Makefile.in (LIBS_MACHINE): Remove all uses, unused.
* configure.in (LIBS_MACHINE): Remove, unused.
2010-04-26 11:14:24 -07:00
Dan Nicolaescu
9452ded131 Use autoconf instead of cpp for LIB_MATH.
* s/darwin.h (LIB_MATH): Do not define here, move to configure.
* s/cygwin.h (LIB_MATH): Likewise.
* Makefile.in (LIB_MATH): Do not define with cpp.
(LIBES): Use autoconf for LIB_MATH.

* configure.in (LIB_MATH): New output variable.  Set it for some systems.
2010-04-26 10:10:09 -07:00
Kenichi Handa
fcebfc6a34 composite.c (Ffind_composition_internal): Fix the return value for an automatic composition. 2010-04-26 21:02:08 +09:00
Dan Nicolaescu
39e2ad1b9f Remove all NO_ARG_ARRAY uses.
* fns.c (concat2, concat3, nconc2):
* eval.c (apply1, call1, call2, call3, call4, call5, call6)
(call7): Remove NO_ARG_ARRAY usage, assume it's always true.
* m/xtensa.h (NO_ARG_ARRAY):
* m/template.h (NO_ARG_ARRAY):
* m/sparc.h (NO_ARG_ARRAY):
* m/sh3.h (NO_ARG_ARRAY):
* m/mips.h (NO_ARG_ARRAY):
* m/macppc.h (NO_ARG_ARRAY):
* m/iris4d.h (NO_ARG_ARRAY):
* m/intel386.h (NO_ARG_ARRAY):
* m/ibms390x.h (NO_ARG_ARRAY):
* m/ibms390.h (NO_ARG_ARRAY):
* m/ibmrs6000.h (NO_ARG_ARRAY):
* m/ia64.h (NO_ARG_ARRAY):
* m/hp800.h (NO_ARG_ARRAY):
* m/arm.h (NO_ARG_ARRAY):
* m/amdx86-64.h (NO_ARG_ARRAY):
* m/alpha.h (NO_ARG_ARRAY): Remove definition.
2010-04-25 15:16:58 -07:00
Eli Zaretskii
6bdf5d6523 Fix crash with bidi display on the last empty line (bug#6030).
xdisp.c (display_line): Don't assume 2nd call to
 get_next_display_element cannot return zero.  (Bug#6030)

Move code that bidi-iterates out of display property to a separate function. 

 xdisp.c (iterate_out_of_display_property): New function, body from pop_it.
 (pop_it): Use it.
2010-04-25 20:06:41 +03:00
Eli Zaretskii
f538fcec9a Move code that bidi-iterates out of display property to a separate function.
xdisp.c (iterate_out_of_display_property): New function, body from pop_it.
 (pop_it): Use it.
2010-04-25 19:55:59 +03:00
Eli Zaretskii
adf4f59cc8 Fix crash with bidi display on the last empty line (bug#6030).
xdisp.c (display_line): Don't assume 2nd call to
 get_next_display_element cannot return zero.
2010-04-25 17:42:34 +03:00
Glenn Morris
dfbbda83af Minor simplications for src/m/amdx86-64.h.
* m/amdx86-64.h (START_FILES, LIB_STANDARD) [__OpenBSD__]:
For clarity, revert to using fixed /usr/lib rather than $CRT_DIR.
(START_FILES, LIB_STANDARD) [__FreeBSD__]: Merge into the generic case,
since CRT_DIR defaults to /usr/lib.  Suggested by Dan Nicolaescu.
2010-04-24 12:50:03 -07:00
Eli Zaretskii
763d737735 Fix typos in comments of composite.c 2010-04-24 19:46:20 +03:00
Eli Zaretskii
3216c819cf composite.c (composition_compute_stop_pos): Fix a typo in the commentary. 2010-04-24 16:24:25 +03:00
Juanma Barranquero
58ccf24384 Remove conflict markers. 2010-04-24 14:33:31 +02:00
Eli Zaretskii
51d28d3ec4 Fix cursor motion at end of line that ends in a composed character.
xdisp.c (display_line): Use `reseat' instead of `reseat_1', and
 use `get_next_display_element' and `set_iterator_to_next' to
 advance to the next character, when looking for the character that
 begins the next row.
2010-04-24 14:11:40 +03:00
Eli Zaretskii
a49884a673 Fix cursor motion at end of line that ends with a composite character.
xdisp.c (display_line): Use `reseat' instead of `reseat_1', and
 use `get_next_display_element' and `set_iterator_to_next' to
 advance to the next character, when looking for the character that
 begins the next row.
2010-04-24 14:07:27 +03:00
Eli Zaretskii
2d4018aa48 Fix GDB startup with src/.gdbinit.
.gdbinit: Add a "set Fmake_symbol" line to force GDB load the
 definition of "struct Lisp_Symbol".
2010-04-24 10:36:27 +03:00
Eli Zaretskii
76db6fccee Fix GDB startup with .gdbinit.
.gdbinit: Add a "set Fmake_symbol" line to force GDB to load the
 definition of "struct Lisp_Symbol".
2010-04-24 10:32:48 +03:00
Glenn Morris
48cd417515 Accidentally omitted from previous commit.
* src/m/amdx86-64.h (START_FILES, LIB_STANDARD):
  Use $CRT_DIR rather than HAVE_LIB64_DIR.  (Bug#5655)
2010-04-23 19:30:11 -07:00
Glenn Morris
0c309b800c Regenerate configure, src/config.in. 2010-04-23 19:25:45 -07:00
Glenn Morris
70eab5c182 Close bug#5655.
* configure.in (CRT_DIR): New output variable.
(--with-crt-dir): New option.  (Bug#5655)
(HAVE_LIB64_DIR): Remove.

* src/Makefile.in (CRT_DIR): New variable, set by configure.
* src/m/amdx86-64.h, m/ibms390x.h (START_FILES, LIB_STANDARD):
Use $CRT_DIR rather than HAVE_LIB64_DIR.  (Bug#5655)
2010-04-23 19:23:22 -07:00
Dan Nicolaescu
e769f484f5 * Makefile.in: Remove C_SWITCH_X_MACHINE, unused.
* Makefile.in (ALL_CFLAGS): Remove C_SWITCH_X_MACHINE, unused.
2010-04-23 15:28:10 -07:00
Dan Nicolaescu
4196ff33d3 * s/cygwin.h (LIBS_DEBUG): Remove, unused. 2010-04-23 15:22:06 -07:00
Dan Nicolaescu
879b0ee46e Remove redundant flags.
* s/freebsd.h (C_SWITCH_SYSTEM):
* s/hpux10-20.h (C_SWITCH_X_SYSTEM, LD_SWITCH_X_DEFAULT):
* s/netbsd.h (C_SWITCH_SYSTEM):
* s/openbsd.h (LD_SWITCH_X_DEFAULT): Remove, configure takes care
of these.
2010-04-23 15:18:49 -07:00
Dan Nicolaescu
03cbbcb8e8 Simplify m/intel386.h.
* m/intel386.h (CRT0_DUMMIES): Remove, inline value in the only
user: ecrt0.c.
(SOLARIS2): Remove LOAD_AVE_TYPE, LOAD_AVE_CVT, LIBS_MACHINE, unused.
(USG5_4): Move LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE definitions to
the only user: s/unixware.h.
* ecrt0.c: Remove #ifndef static.  Inline CRT0_DUMMIES definition
from m/intel386.h.
* s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Definitions
moved here from m/intel386.h.
2010-04-23 15:14:14 -07:00
Dan Nicolaescu
1ad4cc3d07 * m/mips.h: Remove #if 0 code. 2010-04-23 14:58:07 -07:00
Eli Zaretskii
728588ccfd Fix display of composed characters from L2R scripts in bidi buffers. (Bug#5977)
xdisp.c (set_iterator_to_next, next_element_from_composition):
 After advancing IT past the composition, resync the bidi iterator
 with IT's position.
2010-04-23 21:23:51 +03:00
Eli Zaretskii
b893a1502d Fix display of composed characters from L2R scripts in bidi buffers.
xdisp.c (set_iterator_to_next, next_element_from_composition): After
 advancing IT past the composition, resync the bidi iterator with 
 IT's position.  (Bug#5977)
2010-04-23 21:10:31 +03:00
Eli Zaretskii
98092630ef dispextern.h: Fix a typo in a comment. 2010-04-23 20:48:22 +03:00
Dan Nicolaescu
a63f80b465 * Makefile.in (LD_SWITCH_MACHINE_TEMACS): Remove, unused.
(TEMACS_LDFLAGS): Don't use LD_SWITCH_SYSTEM_TEMACS.
2010-04-23 10:40:47 -07:00
Stefan Monnier
ff5dec5cd1 * gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style. 2010-04-23 11:50:48 -04:00
Eli Zaretskii
706a0137ff xdisp.c (pop_it): Fix last change. 2010-04-23 18:24:39 +03:00
Eli Zaretskii
f1bbc65578 Support `display' text properties and overlay strings in bidi buffers.
xdisp.c (pop_it): When the stack is popped after displaying
 from a string, bidi-iterate to exit from the text portion covered
 by the `display' property or overlay.  (Bug#5988, bug#5920)
2010-04-23 18:09:11 +03:00
Eli Zaretskii
8785b8887a Support `display' text properties and overlays.
xdisp.c (pop_it): When the stack is popped after displaying
 from a string, bidi-iterate to exit from the text portion covered
 by the `display' property or overlay.  (Bug#5988, bug#5920)
2010-04-23 18:05:23 +03:00
Dan Nicolaescu
8e324eb6e0 (LD_SWITCH_SYSTEM_TEMACS): Remove #undef.
(LD_SWITCH_MACHINE_TEMACS): Remove, configure sets nocombreloc.
2010-04-23 02:06:43 -07:00