1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-10 13:40:36 -08:00
Commit graph

8523 commits

Author SHA1 Message Date
Glenn Morris
40dc6bf44e Set rallocobj with configure, not cpp.
* configure.in (REL_ALLOC): Unset on gnu, gnu-linux if DOUG_LEA_MALLOC.
(RALLOC_OBJ): New output variable.
* config.bat (RALLOC_OBJ): Edit to empty if sys_malloc.

* src/Makefile.in (RALLOC_OBJ): New, set by configure.
(rallocobj): Replace with the previous variable.
(otherobj): Use $RALLOC_OBJ.

* src/s/gnu.h (REL_ALLOC) [DOUG_LEA_MALLOC]:
* src/s/gnu-linux.h (REL_ALLOC) [DOUG_LEA_MALLOC]: Move undef to configure.

* msdos/sed1v2.inp (RALLOC_OBJ): Edit to ralloc.o.
2010-05-17 19:44:07 -07:00
Glenn Morris
be4ff9dad8 Define some malloc objects with configure, not cpp.
* configure.in (GMALLOC_OBJ, VMLIMIT_OBJ): New output variables.
* config.bat (GMALLOC_OBJ, VMLIMIT_OBJ): Edit to empty if sys_malloc.

* src/Makefile.in (GMALLOC_OBJ, VMLIMIT_OBJ): New, set by configure.
(gmallocobj, vmlimitobj): Replace with previous two variables.
(otherobj): Use $GMALLOC_OBJ, $VMLIMIT_OBJ.

* msdos/sed1v2.inp (GMALLOC_OBJ): Edit to gmalloc.o.
(VMLIMIT_OBJ): Edit to vm-limit.o.
2010-05-17 19:30:13 -07:00
Glenn Morris
16455a8509 Combine the two stamp-oldxmenu cases.
* configure.in (OLDXMENU_DEPS): New output variable.
* configure: Regenerate.

* src/Makefile.in (OLDXMENU_DEPS): New, set by configure.
(stamp-oldxmenu): Use $OLDXMENU_DEPS.

* msdos/sed1v2.inp (OLDXMENU_DEPS): Edit to empty.
* msdos/sed1x.inp (OLDXMENU_DEPS): Edit to ${OLDXMENU} ../src/${OLDXMENU}.
2010-05-16 22:15:03 -07:00
Glenn Morris
7ca1f3f981 * src/Makefile.in (${ns_appbindir}Emacs, ns-app): Always define these rules. 2010-05-16 17:01:22 -07:00
Glenn Morris
7541dad5ce * src/Makefile.in (clean): Get rid of HAVE_NS conditional. 2010-05-16 16:46:44 -07:00
Glenn Morris
da53fab922 Tweak ns_app*dir values set by configure.
* configure.in (ns_appdir, ns_appbindir): Add trailing "/" to value.
* Makefile.in (install-arch-dep): Update for above change.

* src/Makefile.in (ns_appdir, ns_appbindir): Now configure adds the
trailing "/".
2010-05-16 16:31:05 -07:00
Glenn Morris
b02a664581 Simplify temacs build rule.
* configure.in (TEMACS_LDFLAGS2): New output variable.
* configure: Regenerate.

* msdos/sed1v2.inp (TEMACS_LDFLAGS2): Edit to $(LDFLAGS).

* src/Makefile.in (TEMACS_LDFLAGS2): New, set by configure.
(temacs${EXEEXT}): Combine the NS_IMPL_GNUSTEP case with the default.
2010-05-16 16:01:56 -07:00
Glenn Morris
8877ca0fdc Simplify temacs build rule.
* configure.in (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New output variable.
(START_FILES): Set to empty if NS_IMPL_GNUSTEP.
(GNUSTEP_SYSTEM_HEADERS, GNUSTEP_SYSTEM_LIBRARIES): Do not output,
nothing uses.

* configure: Regenerate.

* src/Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused.
(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure.
(LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic.
(temacs${EXEEXT}): Remove $LOCALCPP, never defined or referenced.
Make most of the NS_IMPL_GNUSTEP case the same as the default case.

* msdos/sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove.
(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty.
2010-05-16 10:58:27 -07:00
Glenn Morris
5fdb74689d Remove unused Makefile variables STARTFLAGS.
* src/Makefile.in (temacs${EXEEXT}) [!NS_IMPL_GNUSTEP]:
Remove ${STARTFLAGS}, nothing ever sets it.
2010-05-15 23:40:19 -07:00
Dan Nicolaescu
95adb4b161 * m/ia64.h (UNEXEC): Remove reference to CANNOT_EXEC, not used anymore. 2010-05-15 22:40:10 -07:00
Glenn Morris
9beab9ced3 * src/Makefile.in (LIBX_BASE): Always define. 2010-05-15 17:30:14 -07:00
Glenn Morris
8a95f0e78c * src/Makefile.in (LIBX_OTHER): Move out of cpp section. 2010-05-15 17:21:58 -07:00
Glenn Morris
676b630493 * src/Makefile.in (LIBXT): Always define. 2010-05-15 17:02:13 -07:00
Glenn Morris
4235ca472b Always define LIBXMENU in src/Makefile.in.
* configure.in (LIBXMENU): Set to empty if !HAVE_X_WINDOWS.

* src/Makefile.in (LIBXMENU): Always define.

* msdos/sed1v2.inp (LIBXMENU): Edit to empty.
* msdos/sed1x.inp (LIBXMENU): Expect empty initial value.
2010-05-15 15:33:24 -07:00
Glenn Morris
3545021dd5 Always define OLDXMENU in src/Makefile.in.
* src/Makefile.in (OLDXMENU): Always define.

* msdos/sed1v2.inp (OLDXMENU): Edit to empty.
* msdos/sed1x.inp (OLDXMENU): Expect empty initial value.
2010-05-15 15:01:22 -07:00
Glenn Morris
02d4ac0e26 Always define LIBX_OTHER in src/Makefile.in.
* src/Makefile.in (LIBX_OTHER): Always define.

* msdos/sed1v2.inp (LIBX_OTHER): Edit to empty.
* msdos/sed1x.inp (LIBX_OTHER): Expect empty initial value.
2010-05-15 14:47:58 -07:00
Glenn Morris
6e546d181b Always define FONT_OBJ; to empty in the non-X case.
* configure.in (FONT_OBJ): Set to empty if !HAVE_X_WINDOWS.

* src/Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
(obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.

* msdos/sed1v2.inp (FONT_OBJ): Edit to empty for non-X case.
* msdos/sed1x.inp (FONT_OBJ): Edit to xfont.o for X case.
2010-05-15 14:31:19 -07:00
Ken Raeburn
5276642588 * lisp.h (XFLOAT_DATA): Use "0?x:x" to generate an rvalue. (bug#5916)
(LISP_MAKE_RVALUE) [!USE_LISP_UNION_TYPE && !__GNUC__]: Likewise.
2010-05-15 17:19:05 -04:00
Ken Raeburn
8b4eb7969c * emacs.c (main): Initialize initial-environment and process-environment
before generating from env, not after.
2010-05-15 17:16:20 -04:00
Ken Raeburn
8c5ff6dd24 Handle --version reasonably in CANNOT_DUMP configuration.
* src/emacs.c (emacs_version, emacs_copyright): New string
variables.
(Vemacs_version, Vemacs_copyright): New Lisp_Object variables.
(syms_of_emacs): Defvar them, and initialize them from the C
string variables.
(main): If initialization hasn't been done, print initial version
info from the C strings, instead of starting an interactive session.
* lisp/version.el (emacs-copyright, emacs-version): Don't define
here.
* configure.in: Look for version string in its new place.
2010-05-15 17:11:37 -04:00
Eli Zaretskii
2e9abc3d53 Avoid crashes when stepping with right-arrow through "^L^L".
bidi.c (bidi_paragraph_init): Remove redundant assertion that we are at
 the beginning of a line after call to bidi_find_paragraph_start.
2010-05-15 17:43:55 +03:00
Eli Zaretskii
d20e1419fd Implement bidi-sensitive movement with arrow keys.
src/bidi.c (bidi_paragraph_init): Don't leave alone garbage values
 of bidi_it->paragraph_dir.  Call bidi_initialize if needed.
 src/xdisp.c (Fcurrent_bidi_paragraph_direction): New function.
 (syms_of_xdisp): Defsubr it.
 src/cmds.c (Fforward_char, Fbackward_char): Doc fix.
 src/subr.el (right-arrow-command, left-arrow-command): New functions.
 src/bindings.el (global-map): Bind them to right and left arrow keys.
 etc/NEWS: Mention current-bidi-paragraph-direction
2010-05-15 16:23:48 +03:00
Eli Zaretskii
dbd3f7231a Fix "config msdos" step.
src/Makefile.in: Fix MSDOS-related comments.
 msdos/sed3v2.inp (INSTALLABLES): Edit out extra ${EXEEXT} after "emacsclient".
 (emacsserver, timer, wakeup): Remove edit-out commands.
 msdos/sed1v2.inp (MSDOS_OBJ): Add w16select.o.
 (TERMCAP_OBJ): Add termcap.o.
2010-05-15 10:19:59 +03:00
Eli Zaretskii
1edbd30946 Fix a typo in msdos/ChangeLog. 2010-05-15 09:25:23 +03:00
Glenn Morris
1a82cca9ba Choose dependency of oldxmenu using configure.
* configure.in (OLDXMENU_TARGET): New output variable.

* src/Makefile.in (OLDXMENU_TARGET): New, set by configure.
(really-lwlib, really-oldXMenu): Always define.
($OLDXMENU): Depend on $OLDXMENU_TARGET.

* msdos/sed1v2.inp (OLDXMENU_TARGET): Edit to empty.
* msdos/sed1x.inp (OLDXMENU_TARGET): Edit to really-oldxmenu.
2010-05-14 18:55:24 -07:00
Glenn Morris
3df7b33824 If HAVE_X11, also HAVE_X_WINDOWS and HAVE_MENUS.
* src/Makefile.in: Simplify cpp conditional.

* admin/CPP-DEFINES: Comment.
2010-05-14 17:54:24 -07:00
Glenn Morris
2b5f541b4f Minor NS build fixes.
* Makefile.in (install-arch-dep): Update odd NS rule for Emacs version.

* src/Makefile.in (${ns_appdir}): Simplify using umask.
2010-05-14 17:48:53 -07:00
Glenn Morris
02be533b2a Remove references to CVS directories etc in Makefiles.
* Makefile.in (install-arch-indep): Remove references to RCS, CVS,
and other files that no longer exist.

* leim/Makefile.in (install): Remove references to CVS-related files.

* lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
Remove references to CVS, RCS and Old directories.

* src/Makefile.in (${ns_appdir}): Remove references to CVS-related files.
2010-05-14 17:42:22 -07:00
Stefan Monnier
4e2db1fe4b * eval.c (specbind): Disallow let-binding frame-local vars.
Remove left-over duplicate test.  Add comment.
2010-05-14 13:53:42 -04:00
Eli Zaretskii
2fe72643a0 Make the cache of bidi iterator states dynamically allocated.
bidi.c (bidi_cache_shrink): New function.
 (bidi_init_it): Call it.
 (bidi_cache_iterator_state): Enlarge the cache if needed.
2010-05-14 18:19:07 +03:00
Eli Zaretskii
4b292a226c Rename bidi_get_next_char_visually to bidi_move_to_visually_next.
bidi.c (bidi_move_to_visually_next): Renamed from
 bidi_get_next_char_visually.  All callers changed.
2010-05-14 17:30:45 +03:00
Eli Zaretskii
b4b6e17e00 Fix spelling and remove merge marks due to 2010-05-14T04:14:23Z!handa@etlken. 2010-05-14 12:02:50 +03:00
Kenichi Handa
c2eb4a8321 merge trunk 2010-05-14 16:29:06 +09:00
Glenn Morris
177b028808 No harm in always defining some ns_ Makefile variables.
* src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Always define.

* msdos/sed1v2.inp (ns_appdir, ns_appbindir, ns_appsrc): Edit to empty.
2010-05-13 21:23:23 -07:00
Kenichi Handa
ccd3ce49e0 merge trunk 2010-05-14 13:15:58 +09:00
Kenichi Handa
82ebc97b11 Fix bidi-composition interaction. 2010-05-14 13:14:23 +09:00
Kenichi Handa
508197067c merge trunk 2010-05-14 12:52:21 +09:00
Kenichi Handa
0e5d78007c font.c (font_range): Return the range for the font found at first. 2010-05-14 12:47:38 +09:00
Glenn Morris
fbc0089011 Move some undefs from src/Makefile.in to configure.
* configure.in (cpp_undefs): Add mktime, register, X11.

* src/Makefile.in (mktime, X11, register): Move undefs to configure.

* admin/CPP-DEFINES: Remove X11.
2010-05-13 20:36:40 -07:00
Glenn Morris
f14d1dfda1 Replace some msdos cpp.
* src/Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it.
(MSDOS_X_OBJ): New variable.
(MSDOS_SUPPORT_REAL): New constant.
(MSDOS_SUPPORT): Set as a variable, not with cpp.
(obj): Use MSDOS_X_OBJ.
(lisp): Use MSDOS_SUPPORT as a variable.

* msdos/sed1v2.inp (MSDOS_OBJ): Edit to dosfns.o msdos.o.
(MSDOS_SUPPORT): Edit to $(MSDOS_SUPPORT_REAL).
* msdos/sed1x.inp (MSDOS_X_OBJ): Edit to w16select.o termcap.o.
2010-05-13 20:13:39 -07:00
Glenn Morris
11842bd8ae Define MOUSE_, TOOLTIP_, WINDOW_SUPPORT with configure.
* configure.in (GPM_MOUSE_SUPPORT): Remove.
(MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): New output variables.
(HAVE_WINDOW_SYSTEM, HAVE_MOUSE): Move out of AC_BOTTOM.

* src/Makefile.in (REAL_MOUSE_SUPPORT): New constant.
(GPM_MOUSE_SUPPORT): Now it's a constant.
(MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): Set with configure, not cpp.

* msdos/sed2x.inp (HAVE_WINDOW_SYSTEM): Define.
* msdos/sed1x.inp (TOOLTIP_SUPPORT): Edit to ${lispsource}tooltip.elc.
(WINDOW_SUPPORT): Edit to $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT).
* msdos/sed1v2.inp (MOUSE_SUPPORT): Edit to $(REAL_MOUSE_SUPPORT).
(TOOLTIP_SUPPORT, WINDOW_SUPPORT): Edit to empty.
2010-05-13 20:05:00 -07:00
Glenn Morris
489d31a455 Minor build simplification for NS.
* configure.in (NS_IMPL_GNUSTEP_INC): New output variable.
(GNUSTEP_MAKEFILES): Do not output.

* src/Makefile.in (@NS_IMPL_GNUSTEP_INC@): Use in place of #ifdef.

* msdos/sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil.
2010-05-13 19:46:09 -07:00
Glenn Morris
845612ac6c * src/Makefile.in (ns_appresdir): Remove, unused. 2010-05-13 19:36:46 -07:00
Glenn Morris
e20f1f074b * src/Makefile.in (SHELL): Move outside cpp section.
Some comment formatting.
2010-05-13 19:32:29 -07:00
Glenn Morris
cb027b3295 * s/netbsd.h (AMPERSAND_FULL_NAME): Remove (defined in AH_BOTTOM). 2010-05-13 19:28:28 -07:00
Glenn Morris
3369c79f8a Unify some conditionals in src/Makefile.in.
* src/Makefile.in (FONT_DRIVERS): Place with other HAVE_X_WINDOWS stuff.
(TOOLTIP_SUPPORT): Place with other HAVE_WINDOW_SYSTEM stuff.
2010-05-13 00:57:28 -07:00
Glenn Morris
d5e982a6c1 Minor simplification for src/Makefile.in.
* src/Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined,
HAVE_WINDOW_SYSTEM must be too.
2010-05-13 00:41:37 -07:00
Glenn Morris
c0a2b70a9c Fix ChangeLog typo. 2010-05-12 21:23:06 -07:00
Glenn Morris
6192e16341 Remove WINNT_SUPPORT from src/Makefile.in,
* src/Makefile.in (WINNT_SUPPORT): Remove, nt build does not use this file
but rather makefile.w32-in.
(lisp): Remove WINNT_SUPPORT.
2010-05-12 21:15:12 -07:00
Glenn Morris
472c5d6b44 Let configure set OLDXMENU, LIBXMENU if !HAVE_MENUS.
* configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS.

* src/Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]:
Let configure set these variables (to empty) in this case as well.
2010-05-12 20:52:07 -07:00