diff options
Diffstat (limited to 'src')
43 files changed, 523 insertions, 778 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 084276a9f11..51a63c046c7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -17,6 +17,91 @@ (next_element_from_composition): Pay attention to IT->cmp_it.reversed_p. +2010-05-14 Kenichi Handa <handa@m17n.org> + + * font.c (font_range): Return the range for the font found at + first. + +2010-05-14 Glenn Morris <rgm@gnu.org> + + * Makefile.in (mktime, X11, register): Move undefs to configure. + + * 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. + + * 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. + + * Makefile.in (@NS_IMPL_GNUSTEP_INC@): Use in place of #ifdef. + (ns_appresdir): Remove, unused. + + * Makefile.in (SHELL): Move outside cpp section. + + * s/netbsd.h (AMPERSAND_FULL_NAME): Remove (defined in AH_BOTTOM). + +2010-05-13 Glenn Morris <rgm@gnu.org> + + * Makefile.in (FONT_DRIVERS): Place with other HAVE_X_WINDOWS stuff. + (TOOLTIP_SUPPORT): Place with other HAVE_WINDOW_SYSTEM stuff. + + * Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined, + HAVE_WINDOW_SYSTEM must be too. + + * Makefile.in (WINNT_SUPPORT): Remove, nt build does not use this file. + (lisp): Remove WINNT_SUPPORT. + + * Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]: + Let configure set these variables (to empty) in this case as well. + + * Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp. + (LIBX_BASE): Use $LD_SWITCH_X_SITE. + + * Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD) + (LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS) + (FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS) + (M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM) + (LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold + the values output by configure. + (ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables. + +2010-05-12 Glenn Morris <rgm@gnu.org> + + * Makefile.in (YMF_PASS_LDFLAGS, LD, LINKER): Simplify the logic. + (LINKER_WAS_SPECIFIED): Remove. + + * Makefile.in (LIB_GCC): Set using configure, not cpp. + (GNULIB_VAR) [!ORDINARY_LINK]: Always set to $LIB_GCC. + * m/arm.h (LIB_GCC) [GNU_LINUX]: + * s/cygwin.h (LIB_GCC): + * s/freebsd.h (LIB_GCC): + * s/gnu-linux.h (LIB_GCC): + * s/msdos.h (LIB_GCC): + * s/netbsd.h (LIB_GCC): + Move to configure. + +2010-05-11 Karel Klic <kklic@redhat.com> + + * ftfont.c: Fix incorrect parentheses of #if condition for + definining M17N_FLT_USE_NEW_FEATURE. + +2010-05-11 Glenn Morris <rgm@gnu.org> + + * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. + * s/msdos.h (MSDOS_LIBS_SYSTEM): Remove. + +2010-05-10 Eli Zaretskii <eliz@gnu.org> + + * xdisp.c (init_iterator): Don't turn on bidi reordering in + unibyte buffers. See + http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html. +>>>>>>> MERGE-SOURCE + 2010-05-10 Glenn Morris <rgm@gnu.org> * Makefile.in (LIBS_SYSTEM): Set using configure, not cpp. @@ -750,7 +835,7 @@ (Frename_file): Preserve selinux context when renaming by copy-file. 2010-04-21 Juanma Barranquero <lekktu@gmail.com> - Eli Zaretskii <eliz@gnu.org> + Eli Zaretskii <eliz@gnu.org> Don't depend on cm.c or termcap.c on Windows, use stubs. * makefile.w32-in (OBJ1): Remove cm.$(O) and termcap.$(O). @@ -8941,7 +9026,7 @@ <after-change-functions>: Reflow docstrings. 2008-08-04 Adrian Robert <Adrian.B.Robert@gmail.com> - Ken Raeburn <raeburn@gnu.org> + Ken Raeburn <raeburn@gnu.org> Dock menu customization, based on a patch by Ken Raeburn, plus some other fixes. @@ -10006,7 +10091,7 @@ batch-compiling for bootstrap). 2008-07-15 Chris Hall <chris@web.workinglinux.com> (tiny change) - YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> (make_initial_frame): Call init_frame_faces(f) in CANNOT_DUMP case -- fix crash due to different init order. @@ -10624,7 +10709,7 @@ (USG_SHARED_LIBRARIES): Remove duplicate definition. 2008-06-26 Juanma Barranquero <lekktu@gmail.com> - Eli Zaretskii <eliz@gnu.org> + Eli Zaretskii <eliz@gnu.org> * makefile.w32-in (LOCAL_FLAGS): Don't include WINDOWSNT, DOS_NT and _UCHAR_T. @@ -10872,7 +10957,7 @@ the property of LFACE_FONT of LFACE (if any). 2008-06-21 Seiji Zenitani <zenitani@mac.com> - Ryo Yoshitake <ryo@shiftmode.net> + Ryo Yoshitake <ryo@shiftmode.net> * xterm.c (x_set_frame_alpha): Add x_catch_errors for bug#437. @@ -11968,7 +12053,7 @@ * xterm.c (x_set_frame_alpha): Move declarations before statements. 2008-05-21 Seiji Zenitani <zenitani@mac.com> - Ryo Yoshitake <ryo@shiftmode.net> + Ryo Yoshitake <ryo@shiftmode.net> * frame.c (Qalpha): Add a new frame parameter `alpha'. (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 @@ prompt. (various): Pass window being displayed as arg to vmotion. (various): Compute starting-hpos arg to compute_motion - using minibuf_prompt_width if in minibuf starting at top. + using minibuf_prompt_width if in minibuf starting at top. * window.c (Fdisplay_buffer & callers): Take second arg, non-nil means do not use selected window @@ -1645,8 +1645,8 @@ Use signal, not sigset, since we simulate signal on all system versions when nec. - * buffer.c (syms_of_buffer, init_buffer_once, - reset_buffer_local_variables): + * buffer.c (syms_of_buffer, init_buffer_once) + (reset_buffer_local_variables): Define default-abbrev-mode, and init new buffers' abbrev-mode from it. Move definition of abbrev-mode here from abbrev.c. @@ -2861,7 +2861,7 @@ * keymap.c, callint.c, minibuf.c, fns.c, commands.h: Rename MinbufLocalMap to Vminibuffer_local_map, etc. Rename minibuf-local-{,-ns,-completion,must-match}map, - and DefLispVar them (document even!). + and DefLispVar them (document even!). => New lisp variables minibuffer-local-map, minibuffer-local-ns-map, minibuffer-local-completion-map, minibuffer-local-must-match-map. 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 @@ 1988-01-06 Richard Stallman (rms@frosted-flakes) * s-hpux.h: Don't define nomultiplejobs, LDAV_SYMBOL, LIBS_DEBUG - or BROKEN_FIONREAD. + or BROKEN_FIONREAD. * m-hp9000s300.h: Define those four. * s-hpux.h: Define BSTRING, and define bcopy, etc., as macros. @@ -2817,7 +2817,7 @@ 1986-11-26 Richard M. Stallman (rms@prep) * sysdep.c (get_system_name): - Eliminate internal static var in USG case. + Eliminate internal static var in USG case. * lisp.h: New case testing and conversion macros UPPERCASEP, LOWERCASEP, NOCASEP, UPCASE, DOWNCASE. @@ -3852,7 +3852,7 @@ (so now (let ((case-fold-search t))) doesn't force buffer-localness) However, setting a binding will still make it buffer-local. (ie (let ((case-fold-search t)) (setq case-fold-search t)) - will cause case-fold-search be buffer-local even outside the let) + will cause case-fold-search be buffer-local even outside the let) * xfns.c: Preserve studlycaps: "Gnuemacs" => "GNU Emacs" @@ -4452,16 +4452,16 @@ * search.c (Freplace_match): Delete unused some_multiletter_word init. * alloc.c (gc_sweep): Delete unused next initializers. * fns.c (concat): After error on non-int elt for string, - do store the new value from the error handler. + do store the new value from the error handler. * lread.c (read1): Comment out unused end =. * lread.c (read_list): Delete unused tail =. * data.c (Fmake_variable_buffer_local): - If value type is Lisp_Some_Buffer_Local_Value, - change it to Lisp_Buffer_Local_Value permanently. + If value type is Lisp_Some_Buffer_Local_Value, + change it to Lisp_Buffer_Local_Value permanently. * undo.c (record_block): Delete unused cp =. - Don't bother reallocing if n = 0 after first batch. + Don't bother reallocing if n = 0 after first batch. * fileio.c (Fverify_visited_file_modtime): - If CHECK_BUFFER changes buf, use the changed value. + If CHECK_BUFFER changes buf, use the changed value. 1986-07-07 Richard M. Stallman (rms@prep) 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 @@ 1989-12-14 Joseph Arceneaux (jla@spiff) * xfns.c: New variable Vx_no_window_manager. - (Fx_track_pointer): If bufp < 0, abort. + (Fx_track_pointer): If bufp < 0, abort. * xterm.c (XTread_socket): When leaving window, set x_mouse_x and 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 @@ * keyboard.c (read_key_sequence): Don't declare first_event; it is no longer used. Change "#if 0" for first_event reading to - "#if defined (GOBBLE_FIRST_EVENT)". + "#if defined (GOBBLE_FIRST_EVENT)". 1993-10-03 Brian J. Fox (bfox@ai.mit.edu) 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 @@ * fileio.c (Fmake_symbolic_link, Ffile_accessible_directory_p, Finsert_file_contents, auto_save_error, Fwrite_region): Likewise. (Fcopy_file, build_annotations, Fdo_auto_save): Delete unused - variables. + variables. 1994-08-23 Richard Stallman <rms@mole.gnu.ai.mit.edu> 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 @@ 2001-01-05 Gerd Moellmann <gerd@gnu.org> * sysdep.c: Don't prototype srandom; it takes an unsigned argument - on some systems, and an unsigned long on others, like FreeBSD 4.1. + on some systems, and an unsigned long on others, like FreeBSD 4.1. 2001-01-04 Gerd Moellmann <gerd@gnu.org> @@ -5161,9 +5161,9 @@ `vertical-line', `mode-line' and `header-line' events. * xdisp.c (try_window_id): Avoid starting to display in the middle - of a character, a TAB for instance. This is easier than to set - up the iterator exactly, and it's not a frequent case, so the - additional effort wouldn't really pay off. + of a character, a TAB for instance. This is easier than to set + up the iterator exactly, and it's not a frequent case, so the + additional effort wouldn't really pay off. 2000-11-26 Andrew Choi <akochoi@i-cable.com> @@ -5196,9 +5196,9 @@ 2000-11-24 Gerd Moellmann <gerd@gnu.org> * xdisp.c (init_from_display_pos): If POS says we're already after - an overlay string ending at POS, make sure to pop the iterator - because it will be in front of that overlay string. When POS is - ZV, we've thereby also ``processed'' overlay strings at ZV. + an overlay string ending at POS, make sure to pop the iterator + because it will be in front of that overlay string. When POS is + ZV, we've thereby also ``processed'' overlay strings at ZV. * xfaces.c (lface_from_face_name): Function comment fix. 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 @@ # Makefile for GNU Emacs. # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -30,6 +30,7 @@ # Some of the conditionals might be dead now. Finding them and # deleting them would be fine. +SHELL = /bin/sh # Here are the things that we expect ../configure to edit. # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. @@ -72,25 +73,59 @@ CRT_DIR=@CRT_DIR@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ ## System-specific CFLAGS. C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ + +## Currently only set if NS_IMPL_GNUSTEP. +## C_SWITCH_X_SITE may override this. +C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ + +## Define C_SWITCH_X_SITE to contain any special flags your compiler +## may need to deal with X Windows. For instance, if you've defined +## HAVE_X_WINDOWS and your X include files aren't in a place that your +## compiler can find on its own, you might want to add "-I/..." or +## something similar. This is normally set by configure. +## This is used before C_SWITCH_X_SYSTEM and may override it. +C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ + +## Define LD_SWITCH_X_SITE to contain any special flags your loader +## may need to deal with X Windows. For instance, if your X libraries +## aren't in a place that your loader can find on its own, you might +## want to add "-L/..." or something similar. Only used if +## HAVE_X_WINDOWS. +## FIXME? configure sets a value for this, but it has never been +## substituted in this or any other Makefile. Cf C_SWITCH_X_SITE. +LD_SWITCH_X_SITE= + ## This holds any special options for linking temacs only (ie, not ## used by configure). Not used elsewhere because it sometimes ## contains options that have to do with using Emacs's crt0, ## which are only good with temacs. LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ + ## Next two must come before LD_SWITCH_SYSTEM. ## If needed, a -R option that says where to find X windows at run time. LD_SWITCH_X_SITE_AUX=@LD_SWITCH_X_SITE_AUX@ ## As above, but using -rpath instead. LD_SWITCH_X_SITE_AUX_RPATH=@LD_SWITCH_X_SITE_AUX_RPATH@ + ## System-specific LDFLAGS. LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@ LD_SWITCH_SYSTEM_EXTRA=@LD_SWITCH_SYSTEM_EXTRA@ + ## Flags to pass to ld only for temacs. TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_EXTRA) $(LD_SWITCH_SYSTEM_TEMACS) ## Some systems define this to request special libraries. LIBS_SYSTEM=@LIBS_SYSTEM@ +## Where to find libgcc.a, if using gcc and necessary. +LIB_GCC=@LIB_GCC@ + +## May use $CRT_DIR. +LIB_STANDARD=@LIB_STANDARD@ + +## -lm, or empty. +LIB_MATH=@LIB_MATH@ + LIBTIFF=@LIBTIFF@ LIBJPEG=@LIBJPEG@ LIBPNG=@LIBPNG@ @@ -99,6 +134,15 @@ LIBXPM=@LIBXPM@ XFT_LIBS=@XFT_LIBS@ LIBX_EXTRA=$(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) -lX11 $(XFT_LIBS) +FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ +FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ +FREETYPE_LIBS = @FREETYPE_LIBS@ +LIBOTF_CFLAGS = @LIBOTF_CFLAGS@ +LIBOTF_LIBS = @LIBOTF_LIBS@ +M17N_FLT_CFLAGS = @M17N_FLT_CFLAGS@ +M17N_FLT_LIBS = @M17N_FLT_LIBS@ + DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ DBUS_OBJ = @DBUS_OBJ@ @@ -140,15 +184,36 @@ WIDGET_OBJ=@WIDGET_OBJ@ ## sheap.o if CYGWIN, otherwise empty. CYGWIN_OBJ=@CYGWIN_OBJ@ +## dosfns.o msdos.o if MSDOS. +MSDOS_OBJ = +## w16select.o termcap.o if MSDOS && HAVE_X_WINDOWS. +MSDOS_X_OBJ = +MSDOS_SUPPORT_REAL = ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ + ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \ + ${lispsource}term/internal.elc ${lispsource}term/pc-win.elc +## $MSDOS_SUPPORT_REAL if MSDOS. +MSDOS_SUPPORT = + NS_OBJ=@NS_OBJ@ NS_SUPPORT=@NS_SUPPORT@ +## Next two only set if NS_IMPL_GNUSTEP. +GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ +GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@ -## Only used if HAVE_X_WINDOWS and HAVE_WINDOW_SYSTEM. +## Only used if HAVE_X_WINDOWS. FONT_OBJ=@FONT_OBJ@ -## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty. -## Not used if HAVE_MOUSE. -GPM_MOUSE_SUPPORT=@GPM_MOUSE_SUPPORT@ +## Used if HAVE_MOUSE. +REAL_MOUSE_SUPPORT=${lispsource}mouse.elc ${lispsource}select.elc \ + ${lispsource}scroll-bar.elc +## Used if HAVE_GPM && !HAVE_MOUSE +GPM_MOUSE_SUPPORT=${lispsource}mouse.elc +LIBGPM = @LIBGPM@ +## Either of the two preceding options, or empty. +MOUSE_SUPPORT=@MOUSE_SUPPORT@ + +## ${lispsource}tooltip.elc if HAVE_WINDOW_SYSTEM, else empty. +TOOLTIP_SUPPORT=@TOOLTIP_SUPPORT@ BASE_WINDOW_SUPPORT=${lispsource}fringe.elc ${lispsource}image.elc \ ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ @@ -157,6 +222,13 @@ BASE_WINDOW_SUPPORT=${lispsource}fringe.elc ${lispsource}image.elc \ X_WINDOW_SUPPORT=${lispsource}x-dnd.elc ${lispsource}term/common-win.elc \ ${lispsource}term/x-win.elc ${lispsource}dynamic-setting.elc +## If HAVE_X_WINDOWS, both the above +## else if HAVE_WINDOW_SYSTEM (ie, HAVE_NS) just the former; else empty. +WINDOW_SUPPORT=@WINDOW_SUPPORT@ + +## -lresolv, or empty. +LIBRESOLV = @LIBRESOLV@ + LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ INTERVALS_H = dispextern.h intervals.h composite.h @@ -167,12 +239,11 @@ RUN_TEMACS = `/bin/pwd`/temacs START_FILES = @START_FILES@ +UNEXEC_OBJ = @unexec@ + # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ -/* just to be sure the sh is used */ -SHELL=/bin/sh - #define NOT_C_CODE #include "config.h" @@ -180,42 +251,13 @@ SHELL=/bin/sh DEPFLAGS = -MMD -MF deps/$*.d #endif -/* Do not let the file name mktime.c get messed up. */ -#ifdef mktime -#undef mktime -#endif - -/* Use HAVE_X11 as an alias for X11 in this file - to avoid problems with X11 as a subdirectory name - in -I and other such options which pass through this file. */ - -#ifdef X11 -#define HAVE_X11 -#undef X11 -#endif - -/* On some machines #define register is done in config; - do not let it interfere with this file. */ -#undef register - -/* This macro is for switches specifically related to X Windows. */ -#ifndef LD_SWITCH_X_SITE -#define LD_SWITCH_X_SITE -#endif - -#ifdef NS_IMPL_GNUSTEP -/* Pull in stuff from GNUstep-make. */ -FOUNDATION_LIB=gnu -GUI_LIB=gnu -include @GNUSTEP_MAKEFILES@/Additional/base.make -include @GNUSTEP_MAKEFILES@/Additional/gui.make -shared=no -#endif +/* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here. */ +@NS_IMPL_GNUSTEP_INC@ /* DO NOT use -R. There is a special hack described in lastfile.c which is used instead. Some initialized data areas are modified at initial startup, then labeled as part of the text area when - Emacs is dumped for the first time, and never changed again. */ + Emacs is dumped for the first time, and never changed again. */ /* -Demacs is needed to make some files produce the correct version for use in Emacs. @@ -224,10 +266,10 @@ shared=no the information in ``config.h''. */ /* C_SWITCH_X_SITE must come before C_SWITCH_X_SYSTEM - since it may have -I options that should override those two. */ + since it may have -I options that should override those. */ /* MYCPPFLAGS only referenced in etc/DEBUG. */ -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} -ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ +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} +ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) .SUFFIXES: .m .c.o: @@ -242,29 +284,30 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< #ifdef HAVE_X_WINDOWS -/* This test needs to say in cpp for the time being, since s/msdos.h - defines HAVE_MENUS, and does not use the configure script. */ -#ifdef HAVE_MENUS OLDXMENU=@OLDXMENU@ LIBXMENU=@LIBXMENU@ -#else /* not HAVE_MENUS */ -OLDXMENU= -LIBXMENU= -#endif /* not HAVE_MENUS */ - LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) -LIBX_BASE=$(LIBXMENU) LD_SWITCH_X_SITE +LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) LIBX_OTHER=@LIBX_OTHER@ -#endif /* not HAVE_X_WINDOWS */ +FONT_DRIVERS=$(FONT_OBJ) +#endif /* HAVE_X_WINDOWS */ -#ifndef ORDINARY_LINK -/* Fix linking if compiled with GCC. */ -#ifdef __GNUC__ -#ifdef LINKER -#define LINKER_WAS_SPECIFIED -#endif +/* A macro which other sections of Makefile can redefine to munge the + flags before they are passed to LD. This is helpful if you have + redefined LD to something odd, like "gcc". + (The YMF prefix is a holdover from the old name "ymakefile".) */ +#define YMF_PASS_LDFLAGS(flags) flags + + +#ifdef ORDINARY_LINK +LD = $(CC) +#else /* not ORDINARY_LINK */ +GNULIB_VAR = $(LIB_GCC) + +/* Fix linking if compiled with GCC. */ +#if defined (__GNUC__) && ! defined (LINKER) /* Versions of GCC >= 2.0 put their library, libgcc.a, in obscure places that are difficult to figure out at make time. Fortunately, these same versions allow you to pass arbitrary flags on to the @@ -273,78 +316,31 @@ LIBX_OTHER=@LIBX_OTHER@ Well, it is not quite perfect. The "-nostdlib" keeps GCC from searching for libraries in its internal directories, so we have to ask GCC explicitly where to find libgcc.a. */ - -#ifndef LINKER #define LINKER $(CC) -nostdlib -#endif - -#ifndef LIB_GCC -/* Ask GCC where to find libgcc.a. */ -#define LIB_GCC `$(CC) -print-libgcc-file-name` -#endif /* not LIB_GCC */ - -GNULIB_VAR = LIB_GCC - -#ifndef LINKER_WAS_SPECIFIED -/* GCC passes any argument prefixed with -Xlinker directly to the - linker. See prefix-args.c for an explanation of why we do not do - this with the shell''s ``for'' construct. - Note that some people do not have '.' in their paths, so we must - use ./prefix-args. */ +/* GCC passes any argument prefixed with -Xlinker directly to the linker. + See prefix-args.c for an explanation of why we do not do this with the + shell''s ``for'' construct. Note that sane people do not have '.' in + their paths, so we must use ./prefix-args. */ +#undef YMF_PASS_LDFLAGS #define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags` -#else -#define YMF_PASS_LDFLAGS(flags) flags -#endif - -#else /* not __GNUC__ */ -GNULIB_VAR = - -#endif /* not __GNUC__ */ -#endif /* not ORDINARY_LINK */ +#endif /* defined (__GNUC__) && ! defined (LINKER) */ -#ifdef ORDINARY_LINK -LD = $(CC) -#else #ifdef LINKER LD=LINKER #else /* not LINKER */ LD=ld #endif /* not LINKER */ -#endif /* not ORDINARY_LINK */ - -/* A macro which other sections of Makefile can redefine to munge the - flags before they are passed to LD. This is helpful if you have - redefined LD to something odd, like "gcc". - (The YMF prefix is a holdover from the old name "ymakefile".) - */ -#ifndef YMF_PASS_LDFLAGS -#define YMF_PASS_LDFLAGS(flags) flags -#endif -#ifdef MSDOS -LIBS_SYSTEM = MSDOS_LIBS_SYSTEM -#ifdef HAVE_X_WINDOWS -MSDOS_OBJ = dosfns.o msdos.o -#else -MSDOS_OBJ = dosfns.o msdos.o w16select.o termcap.o -#endif -#endif +#endif /* not ORDINARY_LINK */ #ifdef HAVE_NS ns_appdir=@ns_appdir@/ ns_appbindir=@ns_appbindir@/ -ns_appresdir=@ns_appresdir@/ ns_appsrc=@ns_appsrc@ #endif /* HAVE_NS */ -#ifdef HAVE_WINDOW_SYSTEM -#ifdef HAVE_X_WINDOWS -FONT_DRIVERS=$(FONT_OBJ) -#endif /* HAVE_X_WINDOWS */ -#endif /* HAVE_WINDOW_SYSTEM */ - -/* lastfile must follow all files - whose initialized data areas should be dumped as pure by dump-emacs. */ +/* lastfile must follow all files whose initialized data areas should + be dumped as pure by dump-emacs. */ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ charset.o coding.o category.o ccl.o character.o chartab.o bidi.o \ 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 \ cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \ alloc.o data.o doc.o editfns.o callint.o \ eval.o floatfns.o fns.o font.o print.o lread.o \ - syntax.o @unexec@ bytecode.o \ + syntax.o $(UNEXEC_OBJ) bytecode.o \ process.o callproc.o \ region-cache.o sound.o atimer.o \ doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \ - $(MSDOS_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS) + $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS) /* Object files used on some machine or other. - These go in the DOC file on all machines - in case they are needed there. */ + These go in the DOC file on all machines in case they are needed. */ SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ fontset.o dbusbind.o \ @@ -394,47 +389,6 @@ POST_ALLOC_OBJ=@POST_ALLOC_OBJ@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \ $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS) -#ifdef HAVE_MOUSE -#define MOUSE_SUPPORT ${lispsource}mouse.elc \ - ${lispsource}select.elc ${lispsource}scroll-bar.elc -#else -#define MOUSE_SUPPORT $(GPM_MOUSE_SUPPORT) -#endif - -#ifdef MSDOS -#define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ - ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \ - ${lispsource}term/internal.elc ${lispsource}term/pc-win.elc - -#else -#define MSDOS_SUPPORT -#endif - -#ifdef HAVE_WINDOW_SYSTEM -#ifdef HAVE_X_WINDOWS -#define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT) -#else -#define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) -#endif -#else -#define WINDOW_SUPPORT -#endif - -#ifdef WINDOWSNT -#define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ - ${lispsource}dos-w32.elc ${lispsource}w32-vars.elc \ - ${lispsource}w32-fns.elc ${lispsource}term/common-win.elc \ - ${lispsource}term/w32-win.elc -#else -#define WINNT_SUPPORT -#endif - -#ifdef HAVE_WINDOW_SYSTEM -#define TOOLTIP_SUPPORT ${lispsource}tooltip.elc -#else -#define TOOLTIP_SUPPORT -#endif - /* This is the platform-specific list of Lisp files loaded into the dumped Emacs. It is arranged like this because it is easier to generate it semi-mechanically from loadup.el this way. @@ -468,7 +422,7 @@ lisp= \ ${lispsource}files.elc \ ${lispsource}format.elc \ ${lispsource}facemenu.elc \ - MOUSE_SUPPORT \ + ${MOUSE_SUPPORT} \ ${lispsource}emacs-lisp/float-sup.elc \ ${lispsource}frame.elc \ ${lispsource}help.elc \ @@ -531,10 +485,9 @@ lisp= \ ${lispsource}vc-hooks.elc \ ${lispsource}ediff-hook.elc \ ${lispsource}epa-hook.elc \ - TOOLTIP_SUPPORT \ - MSDOS_SUPPORT \ - WINNT_SUPPORT \ - WINDOW_SUPPORT \ + ${TOOLTIP_SUPPORT} \ + ${MSDOS_SUPPORT} \ + ${WINDOW_SUPPORT} \ ${NS_SUPPORT} \ ${lispsource}widget.elc \ ${lispsource}window.elc \ @@ -654,10 +607,10 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \ with GCC, we might need gnulib again after them. */ LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ - $(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ $(LIBS_SYSTEM) \ + $(RSVG_LIBS) $(DBUS_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \ - @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \ - $(GNULIB_VAR) @LIB_MATH@ @LIB_STANDARD@ $(GNULIB_VAR) + $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ + $(GNULIB_VAR) $(LIB_MATH) $(LIB_STANDARD) $(GNULIB_VAR) all: emacs${EXEEXT} $(OTHER_FILES) @@ -702,7 +655,7 @@ buildobj.h: Makefile temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} #ifdef NS_IMPL_GNUSTEP $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ - -L@GNUSTEP_SYSTEM_LIBRARIES@ -lgnustep-gui -lgnustep-base \ + -L$(GNUSTEP_SYSTEM_LIBRARIES) -lgnustep-gui -lgnustep-base \ -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs \ ${obj} ${otherobj} ${LIBES} #else @@ -716,9 +669,8 @@ prefix-args${EXEEXT}: prefix-args.o $(config_h) #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK) -/* We use stamp-xmenu with these two deps - to both ensure that lwlib gets remade based on its dependencies - in its own makefile, +/* We use stamp-xmenu with these two deps to both ensure that lwlib + gets remade based on its dependencies in its own makefile, and remake temacs if lwlib gets changed by this. */ stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) touch stamp-oldxmenu @@ -772,6 +724,8 @@ doc.o: buildobj.h Eg callproc.c only depends on w32.h for WINDOWSNT builds. One way to fix this would be to replace w32.h (etc) by $(W32_H), a variable set by configure. Does not seem worth the trouble. +Since the w32 build does not even use this file, you might ask +why these dependencies are here at all... nsgui.h: In fact, every .o file depends directly or indirectly on 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 xsettings.o: xterm.h xsettings.h lisp.h frame.h termhooks.h $(config_h) \ dispextern.h keyboard.h systime.h coding.h composite.h blockinput.h atimer.h \ termopts.h -/* The files of Lisp proper */ +/* The files of Lisp proper. */ alloc.o: alloc.c process.h frame.h window.h buffer.h puresize.h syssignal.h \ keyboard.h blockinput.h atimer.h systime.h character.h lisp.h $(config_h) \ $(INTERVALS_H) termhooks.h @@ -1004,7 +958,7 @@ lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \ charset.h lisp.h $(config_h) $(INTERVALS_H) termhooks.h coding.h msdos.h \ systime.h frame.h blockinput.h atimer.h -/* Text properties support */ +/* Text properties support. */ composite.o: composite.c buffer.h character.h coding.h font.h ccl.h \ frame.h termhooks.h $(INTERVALS_H) window.h lisp.h $(config_h) 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) \ #endif /* ! AUTO_DEPEND */ /* System-specific programs to be made. - OTHER_FILES - select which of these should be compiled. */ + OTHER_FILES select which of these should be compiled. */ #ifdef HAVE_NS ${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/>. */ /* Define to 1 if using `getloadavg.c'. */ #undef C_GETLOADAVG -/* Define C_SWITCH_X_SITE to contain any special flags your compiler may need - to deal with X Windows. For instance, if you've defined HAVE_X_WINDOWS - above and your X include files aren't in a place that your compiler can - find on its own, you might want to add "-I/..." or something similar. */ -#undef C_SWITCH_X_SITE - /* Define to 1 for DGUX with <sys/dg_sys_info.h>. */ #undef DGUX @@ -488,6 +482,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP +/* Define if you have mouse support. */ +#undef HAVE_MOUSE + /* Define to 1 if you have the `mremap' function. */ #undef HAVE_MREMAP @@ -743,6 +740,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Define to 1 if you have the <vfork.h> header file. */ #undef HAVE_VFORK_H +/* Define if you have a window system. */ +#undef HAVE_WINDOW_SYSTEM + /* Define to 1 if `fork' works. */ #undef HAVE_WORKING_FORK @@ -804,12 +804,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Define to use Kerberos 5 instead of Kerberos 4. */ #undef KERBEROS5 -/* Define LD_SWITCH_X_SITE to contain any special flags your loader may need - to deal with X Windows. For instance, if you've defined HAVE_X_WINDOWS - above and your X libraries aren't in a place that your loader can find on - its own, you might want to add "-L/..." or something similar. */ -#undef LD_SWITCH_X_SITE - /* Define to 1 if localtime caches TZ. */ #undef LOCALTIME_CACHE @@ -1016,12 +1010,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #undef volatile -/* If we're using X11/Carbon/GNUstep, define some consequences. */ -#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS) -#define HAVE_WINDOW_SYSTEM -#define HAVE_MOUSE -#endif - /* Define AMPERSAND_FULL_NAME if you use the convention that & in the full name stands for the login id. */ /* 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/>. */ #endif #endif /* __FreeBSD__ || __NetBSD__ || __linux__ */ -/* If using GNU, then support inline function declarations. */ +/* If using GNU, then support inline function declarations. */ /* Don't try to switch on inline handling as detected by AC_C_INLINE generally, because even if non-gcc compilers accept `inline', they may reject `extern inline'. */ @@ -1071,7 +1059,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Set up some defines, C and LD flags for NeXTstep interface on GNUstep. (There is probably a better place to do this, but right now the Cocoa side does this in s/darwin.h and we cannot - parallel this exactly since GNUstep is multi-OS. */ + parallel this exactly since GNUstep is multi-OS. */ #ifdef HAVE_NS # ifdef NS_IMPL_GNUSTEP /* GNUstep needs a bit more pure memory. Of the existing knobs, @@ -1168,7 +1156,7 @@ extern char *getenv (); #include "string.h" #endif #ifdef HAVE_STRINGS_H -#include "strings.h" /* May be needed for bcopy & al. */ +#include "strings.h" /* May be needed for bcopy & al. */ #endif #ifdef HAVE_STDLIB_H #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) struct face *face; Lisp_Object string; { - EMACS_INT pos_byte, ignore, start, start_byte; + EMACS_INT pos_byte, ignore; int c; Lisp_Object font_object = Qnil; @@ -3983,7 +3983,6 @@ font_range (pos, limit, w, face, string) pos_byte = string_char_to_byte (string, pos); } - start = pos, start_byte = pos_byte; while (pos < *limit) { Lisp_Object category; @@ -3992,6 +3991,10 @@ font_range (pos, limit, w, face, string) FETCH_CHAR_ADVANCE_NO_CHECK (c, pos, pos_byte); else FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, string, pos, pos_byte); + category = CHAR_TABLE_REF (Vunicode_category_table, c); + if (EQ (category, QCf) + || CHAR_VARIATION_SELECTOR_P (c)) + continue; if (NILP (font_object)) { font_object = font_for_char (face, c, pos - 1, string); @@ -3999,40 +4002,8 @@ font_range (pos, limit, w, face, string) return Qnil; continue; } - - category = CHAR_TABLE_REF (Vunicode_category_table, c); - if (! EQ (category, QCf) - && ! CHAR_VARIATION_SELECTOR_P (c) - && font_encode_char (font_object, c) == FONT_INVALID_CODE) - { - Lisp_Object f = font_for_char (face, c, pos - 1, string); - EMACS_INT i, i_byte; - - - if (NILP (f)) - { - *limit = pos - 1; - return font_object; - } - i = start, i_byte = start_byte; - while (i < pos - 1) - { - - if (NILP (string)) - FETCH_CHAR_ADVANCE_NO_CHECK (c, i, i_byte); - else - FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, string, i, i_byte); - category = CHAR_TABLE_REF (Vunicode_category_table, c); - if (! EQ (category, QCf) - && ! CHAR_VARIATION_SELECTOR_P (c) - && font_encode_char (f, c) == FONT_INVALID_CODE) - { - *limit = pos - 1; - return font_object; - } - } - font_object = f; - } + if (font_encode_char (font_object, c) == FONT_INVALID_CODE) + *limit = pos - 1; } return font_object; } 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) #ifdef HAVE_M17N_FLT -#if ((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10) \ - && (M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6)) +#if (((LIBOTF_MAJOR_VERSION > 1) || (LIBOTF_RELEASE_NUMBER >= 10)) \ + && ((M17NLIB_MAJOR_VERSION > 1) || (M17NLIB_MINOR_VERSION >= 6))) /* We can use the new feature of libotf and m17n-flt to handle the character encoding scheme introduced in Unicode 5.1 and 5.2 for 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 @@ /* Machine description file for the alpha chip. - Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006, + 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Author: Rainer Schoepf (according to authors.el) @@ -30,7 +31,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Now define a symbol for the cpu type, if your compiler does not define it automatically. */ - /* __alpha defined automatically */ @@ -75,12 +75,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #else /* not __ELF__ */ /* Describe layout of the address space in an executing process. */ - #define TEXT_START 0x120000000 #define DATA_START 0x140000000 /* The program to be used for unexec. */ - #define UNEXEC unexalpha.o #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 @@ /* machine description file for AMD x86-64. - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. + +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -17,16 +18,11 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -/* The following line tells the configuration script what sort of - operating system this machine is likely to run. - USUAL-OPSYS="linux" */ - #define BITS_PER_LONG 64 #define BITS_PER_EMACS_INT 64 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word is the most significant byte. */ - #undef WORDS_BIG_ENDIAN /* 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/>. */ are always unsigned. This flag only matters if you use USE_LISP_UNION_TYPE. */ - #define EXPLICIT_SIGN_EXTEND /* Data type of load average, as read out of kmem. */ - #define LOAD_AVE_TYPE long /* Convert that into an integer that is 100 for a load average of 1.0 */ - #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) /* Define 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 @@ /* Machine description file for ARM-based non-RISCiX machines. - Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -17,20 +18,11 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ - - /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word is the most significant byte. */ - #undef WORDS_BIG_ENDIAN #define NO_REMAP -/* armin76@gentoo.org reported that the lgcc_s flag is necessary to - build on ARM EABI under GNU/Linux (Bug#5518). */ -#ifdef GNU_LINUX -#define LIB_GCC -lgcc_s -#endif - /* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42 (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 @@ /* machine description file for hp9000 series 800 machines. - Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -17,14 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ - -/* The following line tells the configuration script what sort of - operating system this machine is likely to run. - USUAL-OPSYS="hpux" */ - /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word is the most significant byte. */ - #define WORDS_BIG_ENDIAN /* 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/>. */ are always unsigned. This flag only matters if you use USE_LISP_UNION_TYPE. */ - #define EXPLICIT_SIGN_EXTEND /* 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 @@ /* machine description file for the IA-64 architecture. - Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. - Contributed by David Mosberger <davidm@hpl.hp.com> + +Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. + +Contributed by David Mosberger <davidm@hpl.hp.com> This file is part of GNU Emacs. @@ -23,15 +25,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word is the most significant byte. */ - #undef WORDS_BIG_ENDIAN /* Now define a symbol for the cpu type, if your compiler does not define it automatically. */ - /* __ia64__ defined automatically */ - /* Define the type to use. */ #define EMACS_INT long #define EMACS_UINT unsigned long @@ -41,15 +40,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ are always unsigned. This flag only matters if you use USE_LISP_UNION_TYPE. */ - #define EXPLICIT_SIGN_EXTEND /* Data type of load average, as read out of kmem. */ - #define LOAD_AVE_TYPE long /* Convert that into an integer that is 100 for a load average of 1.0 */ - #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) #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 @@ /* R2 AIX machine/system dependent defines - Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -21,7 +22,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* The data segment in this machine always starts at address 0x20000000. An address of data cannot be stored correctly in a Lisp object; we always lose the high bits. We must tell XPNTR to add them back. */ - #define TEXT_START 0x10000000 #define DATA_START 0x20000000 #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 @@ /* machine description file template. - Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. 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 @@ /* machine description file for IBM S390 in 64-bit mode - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. + +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -20,7 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* This file was made by copying the significant parts of amdx86-64.h into ibms390.h. */ - /* Used for machine IBM s390 64 bits with opsys gnu-linux. */ #define BITS_PER_LONG 64 #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 @@ /* Machine description file for intel 386. - Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. 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 @@ /* machine description file for Iris-4D machines. Use with s/irix*.h. - Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -20,7 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word is the most significant byte. */ - #define WORDS_BIG_ENDIAN /* 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/>. */ are always unsigned. This flag only matters if you use USE_LISP_UNION_TYPE. */ - #define EXPLICIT_SIGN_EXTEND #define TEXT_START 0x400000 -/* - * DATA_SEG_BITS forces extra bits to be or'd in with any pointers which - * were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for - * the value field of a LISP_OBJECT). - */ - +/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which + were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for + the value field of a LISP_OBJECT). */ #define DATA_START 0x10000000 #define DATA_SEG_BITS 0x10000000 @@ -48,7 +44,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* The standard definitions of these macros would work ok, but these are faster because the constants are short. */ - #define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS) #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 @@ /* Machine description file for generic Motorola 68k. - Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -19,12 +20,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word is the most significant byte. */ - #define WORDS_BIG_ENDIAN /* Now define a symbol for the cpu type, if your compiler does not define it automatically. */ - #ifndef m68k #define m68k #endif @@ -34,7 +33,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ are always unsigned. This flag only matters if you use USE_LISP_UNION_TYPE. */ - #define EXPLICIT_SIGN_EXTEND #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 @@ /* machine description file For the powerpc Macintosh. - Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -19,15 +20,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word is the most significant byte. */ - #define WORDS_BIG_ENDIAN /* Data type of load average, as read out of kmem. */ - #define LOAD_AVE_TYPE long /* Convert that into an integer that is 100 for a load average of 1.0 */ - #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) #if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__) @@ -36,7 +34,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says this is needed For MkLinux/LinuxPPC. */ - #ifdef GNU_LINUX #define LINKER $(CC) -nostdlib #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 @@ /* m- file for Mips machines. - Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, + 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -17,18 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ - -/* The following line tells the configuration script what sort of - operating system this machine is likely to run. - USUAL-OPSYS="note" - -NOTE-START -This is used on GNU/Linux and netbsd. -NOTE-END */ - /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word is the most significant byte. */ - #if ! (defined (__MIPSEL__) || defined (MIPSEL) || defined (_MIPSEL)) #define WORDS_BIG_ENDIAN #endif @@ -38,13 +29,10 @@ NOTE-END */ are always unsigned. This flag only matters if you use USE_LISP_UNION_TYPE. */ - #define EXPLICIT_SIGN_EXTEND /* Describe layout of the address space in an executing process. */ - #define TEXT_START 0x00400000 /* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee (do not change this comment) */ - 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 @@ /* machine description file for Sun 4 SPARC. - Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. 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 @@ /* machine description file template. - Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -17,14 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ - -/* The following line tells the configuration script what sort of - operating system this machine is likely to run. - USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */ - /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word is the most significant byte. */ - #define WORDS_BIG_ENDIAN /* 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/>. */ are always unsigned. This flag only matters if you use USE_LISP_UNION_TYPE. */ - #define EXPLICIT_SIGN_EXTEND /* Data type of load average, as read out of kmem. */ - #define LOAD_AVE_TYPE long /* Convert that into an integer that is 100 for a load average of 1.0 */ - #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) /* Define CANNOT_DUMP on machines where unexec does not work. Then the function dump-emacs will not be defined and temacs will do (load "loadup") automatically unless told otherwise. */ - #define CANNOT_DUMP /* 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/>. */ Otherwise Emacs assumes that text space precedes data space, numerically. */ - #define VIRT_ADDR_VARIES /* Define NO_REMAP if memory segmentation makes it not work well to change the boundary between the text section and data section when Emacs is dumped. If you define this, the preloaded Lisp code will not be sharable; but that's better than failing completely. */ - #define NO_REMAP /* Some really obscure 4.2-based systems (like Sequent DYNIX) - * do not support asynchronous I/O (using SIGIO) on sockets, - * even though it works fine on tty's. If you have one of - * these systems, define the following, and then use it in - * config.h (or elsewhere) to decide when (not) to use SIGIO. - * - * You'd think this would go in an operating-system description file, - * but since it only occurs on some, but not all, BSD systems, the - * reasonable place to select for it is in the machine description - * file. - */ - + do not support asynchronous I/O (using SIGIO) on sockets, + even though it works fine on tty's. If you have one of + these systems, define the following, and then use it in + config.h (or elsewhere) to decide when (not) to use SIGIO. + + You'd think this would go in an operating-system description file, + but since it only occurs on some, but not all, BSD systems, the + reasonable place to select for it is in the machine description file. */ #define NO_SOCK_SIGIO - /* After adding support for a new system, modify the large case statement in the `configure' script to recognize reasonable 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 @@ /* machine description file for vax. - Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, + 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. 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. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ - +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ #define USG /* System III, System V, etc */ #define USG5 -/* This symbol should be defined on AIX Version 3 ??????? */ +/* This symbol should be defined on AIX Version 3 ??????? */ #ifndef _AIX #define _AIX #endif /* SYSTEM_TYPE should indicate the kind of system you are using. It sets the Lisp variable system-type. */ - #define SYSTEM_TYPE "aix" /* In AIX, you allocate a pty by opening /dev/ptc to get the master side. To get the name of the slave side, you just ttyname() the master side. */ - #define PTY_ITERATION for (c = 0; !c ; c++) #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptc"); #define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ttyname (fd)); -/* - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - */ - +/* Define HAVE_TERMIO if the system provides sysV-style ioctls + for terminal control. */ #define HAVE_TERMIOS -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - +/* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ - #define HAVE_SOCKETS -/* - * Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir - * library functions. Almost, but not quite the same as - * the 4.2 functions - */ - +/* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library + functions. Almost, but not quite the same as the 4.2 functions. */ #define SYSV_SYSTEM_DIR -/* Define this symbol if your system has the functions bcopy, etc. */ - +/* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING /* The file containing the kernel's symbol table is called /unix. */ - #define KERNEL_FILE "/unix" -/* The symbol in the kernel where the load average is found - is named avenrun. */ - +/* The kernel symbol where the load average is found is named avenrun. */ #define LDAV_SYMBOL "avenrun" /* 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/>. */ that shared library. Emacs currently calls xrealloc on the results of get_current_dir name, - to avoid a crash just use the Emacs implementation for that function. -*/ + to avoid a crash just use the Emacs implementation for that function. */ #define BROKEN_GET_CURRENT_DIR_NAME 1 #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 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -/* Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. */ +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ /* We give these symbols the numeric values found in <sys/param.h> to avoid warnings about redefined macros. */ @@ -84,8 +84,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* The file containing the kernel's symbol table is called /vmunix. */ #define KERNEL_FILE "/vmunix" -/* The symbol in the kernel where the load average is found - is named _avenrun. */ +/* The kernel symbol where the load average is found is named _avenrun. */ #define LDAV_SYMBOL "_avenrun" /* 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 @@ /* System description header file for Cygwin. - Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004, 2005, 2006, + 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -19,7 +20,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* SYSTEM_TYPE should indicate the kind of system you are using. It sets the Lisp variable system-type. */ - #define SYSTEM_TYPE "cygwin" /* 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/>. */ It would have Emacs fork off a separate process to read the input and send it to the true Emacs process through a pipe. */ - #undef INTERRUPT_INPUT -/* - * Define HAVE_TERMIOS if the system provides POSIX-style - * functions and macros for terminal control. - * - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - * - * Do not define both. HAVE_TERMIOS is preferred, if it is - * supported on your system. - */ +/* Define HAVE_TERMIOS if the system provides POSIX-style + functions and macros for terminal control. -#define HAVE_TERMIOS + Define HAVE_TERMIO if the system provides sysV-style ioctls + for terminal control. -/* - * Define HAVE_PTYS if the system supports pty devices. - */ + Do not define both. HAVE_TERMIOS is preferred, if it is + supported on your system. */ +#define HAVE_TERMIOS +/* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS #define PTY_ITERATION for (i = 0; i < 1; i++) /* ick */ #define PTY_NAME_SPRINTF /* none */ @@ -81,13 +74,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ while (0) /* Define this symbol if your system has the functions bcopy, etc. */ - #define BSTRING /* Define CLASH_DETECTION if you want lock files to be written so that Emacs can tell instantly when you try to modify a file that someone else has modified in his Emacs. */ - #define CLASH_DETECTION /* 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/>. */ generated in the Makefile generated by `xmkmf'. If we don't define NARROWPROTO, we will see the wrong function prototypes for X functions taking float or double parameters. */ - #define NARROWPROTO 1 -/* used in various places to enable cygwin-specific code changes */ +/* Used in various places to enable cygwin-specific code changes. */ #define CYGWIN 1 #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/>. */ returns ENOSYS. A workaround is to set G_SLICE=always-malloc. */ #define G_SLICE_ALWAYS_MALLOC -/* Don't link against static libgcc */ -#define LIB_GCC - -/* the end */ - /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b (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 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -/* Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. */ - +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ #define BSD4_2 /* BSD4_3 and BSD4_4 are already defined in sys/param.h */ #define BSD_SYSTEM @@ -29,12 +28,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* More specific than the above two. We cannot use __APPLE__ as this may not be defined on non-OSX Darwin, and we cannot define DARWIN here because Panther and lower CoreFoundation.h uses DARWIN to - distinguish OS X from pure Darwin. */ + distinguish OS X from pure Darwin. */ #define DARWIN_OS /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "darwin" /* 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/>. */ if system supports pty's. 'a' means it is /dev/ptya0 */ #define FIRST_PTY_LETTER 'p' -/* - * Define HAVE_TERMIOS if the system provides POSIX-style - * functions and macros for terminal control. - * - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - * - * Do not define both. HAVE_TERMIOS is preferred, if it is - * supported on your system. - */ +/* Define HAVE_TERMIOS if the system provides POSIX-style + functions and macros for terminal control. + + Define HAVE_TERMIO if the system provides sysV-style ioctls + for terminal control. + + Do not define both. HAVE_TERMIOS is preferred, if it is supported + on your system. */ #define HAVE_TERMIOS #define NO_TERMIO -/* - * Define HAVE_PTYS if the system supports pty devices. - * Note: PTYs are broken on darwin <6. Use at your own risk. - */ +/* Define HAVE_PTYS if the system supports pty devices. + Note: PTYs are broken on darwin <6. Use at your own risk. */ #define HAVE_PTYS -/* Run only once. We need a `for'-loop because the code uses - `continue'. */ +/* Run only once. We need a `for'-loop because the code uses `continue'. */ #define PTY_ITERATION for (i = 0; i < 1; i++) #define PTY_NAME_SPRINTF /* none */ #define PTY_TTY_NAME_SPRINTF /* none */ @@ -101,11 +95,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ } \ while (0) -/** - * PTYs only work correctly on Darwin 7 or higher. So make the - * default for process-connection-type dependent on the kernel - * version. - */ +/* PTYs only work correctly on Darwin 7 or higher. So make the default + for process-connection-type dependent on the kernel version. */ #define MIN_PTY_KERNEL_VERSION '7' /* 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/>. */ /* Used in dispnew.c. Copied from freebsd.h. */ #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) -/* System uses OXTABS instead of the expected TAB3. (Copied from - bsd386.h.) */ +/* System uses OXTABS instead of the expected TAB3. (Copied from bsd386.h.) */ #define TAB3 OXTABS -/* Darwin ld insists on the use of malloc routines in the System - framework. */ +/* Darwin ld insists on the use of malloc routines in the System framework. */ #define SYSTEM_MALLOC /* 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/>. */ #define malloc unexec_malloc #define realloc unexec_realloc #define free unexec_free -/* Don't use posix_memalign because it is not compatible with - unexmacosx.c. */ +/* Don't use posix_memalign because it is not compatible with unexmacosx.c. */ #undef HAVE_POSIX_MEMALIGN #endif @@ -183,8 +171,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ioctl TIOCSCTTY. */ #define DONT_REOPEN_PTY -/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the - stack. */ +/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack. */ #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS /* 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/>. */ #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) -#undef LIB_GCC -#define LIB_GCC - #define HAVE_GETLOADAVG 1 #define DECLARE_GETPWUID_WITH_UID_T -/* this silences a few compilation warnings */ +/* This silences a few compilation warnings. */ #undef BSD_SYSTEM #if __FreeBSD__ == 1 #define BSD_SYSTEM 199103 @@ -64,23 +61,17 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ successfully after processing (for example with CRs added if the terminal is set up that way which it is here). The same bytes will be seen again in a later read(2), without the CRs. */ - #define BROKEN_PTY_READ_AFTER_EAGAIN 1 /* Tell that garbage collector that setjmp is known to save all - registers relevant for conservative garbage collection in the - jmp_buf. */ - + registers relevant for conservative garbage collection in the jmp_buf. */ #define GC_SETJMP_WORKS 1 -/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the - stack. */ - +/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack. */ #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS /* Define USE_MMAP_FOR_BUFFERS to let Emacs use mmap(2) to allocate buffer text. This overrides REL_ALLOC. */ - #define USE_MMAP_FOR_BUFFERS 1 /* 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 @@ Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +This file was put together by Michael K. Johnson and Rik Faith. + This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify @@ -18,20 +20,13 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -/* This file was put together by Michael K. Johnson and Rik Faith. */ - - -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ - +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ #define USG #define GNU_LINUX /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ - + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "gnu/linux" /* All the best software is free. */ #ifndef NOT_C_CODE @@ -50,9 +45,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #if defined HAVE_GRANTPT #define UNIX98_PTYS -/* Run only once. We need a `for'-loop because the code uses - `continue'. */ - +/* Run only once. We need a `for'-loop because the code uses `continue'. */ #define PTY_ITERATION for (i = 0; i < 1; i++) #ifdef HAVE_GETPT @@ -64,7 +57,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Note that grantpt and unlockpt may fork. We must block SIGCHLD to prevent sigchld_handler from intercepting the child's death. */ - #define PTY_TTY_NAME_SPRINTF \ { \ char *ptyname; \ @@ -86,23 +78,20 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Letter to use in finding device name of first pty, if system supports pty's. 'p' means it is /dev/ptyp0 */ - #define FIRST_PTY_LETTER 'p' #endif /* not HAVE_GRANTPT */ /* Define HAVE_TERMIOS if the system provides POSIX-style functions and macros for terminal control. */ - #define HAVE_TERMIOS -/* Define HAVE_PTYS if the system supports pty devices. */ - +/* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS #define HAVE_SOCKETS -/* Define this symbol if your system has the functions bcopy, etc. */ +/* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING /* This is used in list_system_processes. */ @@ -121,28 +110,24 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ your system and must be used only through an encapsulation (Which you should place, by convention, in sysdep.c). */ -/* This is needed for dispnew.c:update_frame */ - +/* This is needed for dispnew.c:update_frame. */ #ifdef emacs #include <stdio.h> /* Get the definition of _IO_STDIO_H. */ #if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM) -/* new C libio names */ +/* New C libio names. */ #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base) #elif defined (__UCLIBC__) -/* using the uClibc library */ +/* Using the uClibc library. */ #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ ((FILE)->__bufpos - (FILE)->__bufstart) #else /* !_IO_STDIO_H && ! __UCLIBC__ */ -/* old C++ iostream names */ +/* Old C++ iostream names. */ #define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ ((FILE)->_pptr - (FILE)->_pbase) #endif /* !_IO_STDIO_H && ! __UCLIBC__ */ #endif /* emacs */ -/* Ask GCC where to find libgcc.a. */ -#define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name` - #ifdef emacs #define INTERRUPT_INPUT #endif @@ -151,9 +136,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define POSIX /* affects getpagesize.h and systty.h */ -#undef LIB_GCC -#define LIB_GCC - #define UNEXEC unexelf.o /* 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/>. */ #endif /* Tell that garbage collector that setjmp is known to save all - registers relevant for conservative garbage collection in the - jmp_buf. */ + registers relevant for conservative garbage collection in the jmp_buf. */ /* Not all the architectures are tested, but there are Debian packages for SCM and/or Guile on them, so the technique must work. See also 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/>. */ register window-flushing. */ /* Don't use #cpu here since in newest development versions of GCC, we must call cpp with -traditional, and that disables #cpu. */ - #if defined __i386__ || defined __sparc__ || defined __mc68000__ \ || defined __alpha__ || defined __mips__ || defined __s390__ \ || 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/>. */ #define RUN_TIME_REMAP -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ - +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ #define USG /* System III, System V, etc */ - #define USG5 - #define HPUX /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ - + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "hpux" /* Letter to use in finding device name of first pty, - if system supports pty's. 'p' means it is /dev/ptym/ptyp0 */ - + if system supports pty's. 'p' means it is /dev/ptym/ptyp0 */ #define FIRST_PTY_LETTER 'p' -/* - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - */ - +/* Define HAVE_TERMIO if the system provides sysV-style ioctls + for terminal control. */ #define HAVE_TERMIO -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - +/* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ - #define HAVE_SOCKETS /* Define this symbol if your system has the functions bcopy, etc. - * s800 and later versions of s300 (s200) kernels have equivalents - * of the BSTRING functions of BSD. If your s200 kernel doesn't have - * em comment out this section. - */ - + s800 and later versions of s300 (s200) kernels have equivalents + of the BSTRING functions of BSD. If your s200 kernel doesn't have + em comment out this section. */ #define BSTRING /* Define CLASH_DETECTION if you want lock files to be written so that Emacs can tell instantly when you try to modify a file that someone else has modified in his Emacs. */ - #define CLASH_DETECTION /* 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/>. */ /* In hpux, the symbol SIGIO is defined, but the feature doesn't work in the way Emacs needs it to. */ - #define BROKEN_SIGIO /* Some additional system facilities exist. */ - #define HAVE_PERROR /* Delete this line for version 6. */ #define UNEXEC unexhp9k800.o @@ -112,7 +93,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ version number A.09.05. You can fix the math library by installing patch number PHSS_4630. - But we can fix it more reliably for Emacs like this. */ + But we can fix it more reliably for Emacs like this. */ #undef HAVE_RINT /* 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/>. */ /* Rainer Malzbender <rainer@displaytech.com> says definining - HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 - using GCC. */ + HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ #ifndef HAVE_XRMSETDATABASE #define HAVE_XRMSETDATABASE #endif @@ -145,7 +125,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ to change the boundary between the text section and data section when Emacs is dumped. If you define this, the preloaded Lisp code will not be sharable; but that's better than failing completely. */ - #define NO_REMAP /* 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/>. */ Otherwise Emacs assumes that text space precedes data space, numerically. */ - #define VIRT_ADDR_VARIES -/* the data segment on this machine always starts at address 0x40000000. */ - +/* The data segment on this machine always starts at address 0x40000000. */ #define DATA_SEG_BITS 0x40000000 #define DATA_START 0x40000000 #define TEXT_START 0x00000000 /* Data type of load average, as read out of kmem. */ - #define LOAD_AVE_TYPE double /* Convert that into an integer that is 100 for a load average of 1.0 */ - #define LOAD_AVE_CVT(x) ((int) (x * 100.0)) -/* The symbol in the kernel where the load average is found - is named _avenrun. At this time there are two major flavors - of hp-ux (there is the s800 and s300 (s200) flavors). The - differences are thusly moved to the corresponding machine description file. -*/ +/* The kernel symbol where the load average is found is named _avenrun. + At this time there are two major flavors of hp-ux (there is the s800 + and s300 (s200) flavors). The differences are thusly moved to the + corresponding machine description file. */ -/* no underscore please */ +/* No underscore please. */ #define LDAV_SYMBOL "avenrun" -/* On USG systems these have different names. */ - +/* On USG systems these have different names. */ #define index strchr #define rindex strrchr 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/>. */ #define SIGNALS_VIA_CHARACTERS /* Letter to use in finding device name of first pty, - if system supports pty's. 'a' means it is /dev/ptya0 */ + if system supports pty's. 'a' means it is /dev/ptya0 */ #undef FIRST_PTY_LETTER #define FIRST_PTY_LETTER 'q' 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. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ #ifndef WINDOWSNT #define WINDOWSNT @@ -31,63 +29,53 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #endif /* If you are compiling with a non-C calling convention but need to - declare vararg routines differently, put it here */ + declare vararg routines differently, put it here. */ #define _VARARGS_ __cdecl /* If you are providing a function to something that will call the function back (like a signal handler and signal, or main) its calling - convention must be whatever standard the libraries expect */ + convention must be whatever standard the libraries expect. */ #define _CALLBACK_ __cdecl /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ - + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "windows-nt" #define SYMS_SYSTEM syms_of_ntterm () #define NO_MATHERR 1 /* Letter to use in finding device name of first pty, - if system supports pty's. 'a' means it is /dev/ptya0 */ - + if system supports pty's. 'a' means it is /dev/ptya0 */ #define FIRST_PTY_LETTER 'a' -/* - * Define HAVE_TIMEVAL if the system supports the BSD style clock values. - * Look in <sys/time.h> for a timeval structure. - */ - +/* Define HAVE_TIMEVAL if the system supports the BSD style clock values. + Look in <sys/time.h> for a timeval structure. */ #define HAVE_TIMEVAL 1 -/* NT supports Winsock which is close enough (with some hacks) */ - +/* NT supports Winsock which is close enough (with some hacks). */ #define HAVE_SOCKETS 1 /* But our select implementation doesn't allow us to make non-blocking connects. So until that is fixed, this is necessary: */ - #define BROKEN_NON_BLOCKING_CONNECT 1 /* And the select implementation does 1-byte read-ahead waiting for received packets, so datagrams are broken too. */ - #define BROKEN_DATAGRAM_SOCKETS 1 -/* Define this symbol if your system has the functions bcopy, etc. */ - +/* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING #define bzero(b, l) memset(b, 0, l) #define bcopy(s, d, l) memmove(d, s, l) #define bcmp(a, b, l) memcmp(a, b, l) -/* bcopy (aka memmove aka memcpy at least on x86) under MSVC is quite safe */ +/* bcopy (aka memmove aka memcpy at least on x86) under MSVC is quite safe. */ #define GAP_USE_BCOPY 1 #define BCOPY_UPWARD_SAFE 1 #define BCOPY_DOWNWARD_SAFE 1 /* If your system uses COFF (Common Object File Format) then define the - preprocessor symbol "COFF". */ - + preprocessor symbol "COFF". */ #define COFF 1 #define MAIL_USE_POP 1 @@ -101,17 +89,16 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* ============================================================ */ -/* Here, add any special hacks needed - to make Emacs work on this system. For example, - you might define certain system call names that don't - exist on your system, or that do different things on - your system and must be used only through an encapsulation - (Which you should place, by convention, in sysdep.c). */ +/* Here, add any special hacks needed to make Emacs work on this + system. For example, you might define certain system call names + that don't exist on your system, or that do different things on + your system and must be used only through an encapsulation (which + you should place, by convention, in sysdep.c). */ -/* Define this to be the separator between path elements */ +/* Define this to be the separator between path elements. */ #define DIRECTORY_SEP XINT (Vdirectory_sep_char) -/* Define this to be the separator between devices and paths */ +/* Define this to be the separator between devices and paths. */ #define DEVICE_SEP ':' /* We'll support either convention on NT. */ @@ -128,7 +115,7 @@ struct sigaction { #define SIG_SETMASK 2 #define SIG_UNBLOCK 3 -/* The null device on Windows NT. */ +/* The null device on Windows NT. */ #define NULL_DEVICE "NUL:" #ifndef MAXPATHLEN @@ -218,11 +205,11 @@ struct sigaction { #define MODE_LINE_BINARY_TEXT(_b_) (NILP ((_b_)->buffer_file_type) ? "T" : "B") -/* get some redefinitions in place */ +/* Get some redefinitions in place. */ #ifdef emacs -/* calls that are emulated or shadowed */ +/* Calls that are emulated or shadowed. */ #undef access #define access sys_access #undef chdir @@ -259,17 +246,17 @@ struct sigaction { #undef write #define write sys_write -/* subprocess calls that are emulated */ +/* Subprocess calls that are emulated. */ #define spawnve sys_spawnve #define wait sys_wait #define kill sys_kill #define signal sys_signal -/* termcap.c calls that are emulated */ +/* termcap.c calls that are emulated. */ #define tputs sys_tputs #define tgetstr sys_tgetstr -/* cm.c calls that are emulated */ +/* cm.c calls that are emulated. */ #define chcheckmagic sys_chcheckmagic #define cmcostinit sys_cmcostinit #define cmgoto sys_cmgoto @@ -278,7 +265,7 @@ struct sigaction { #endif /* emacs */ -/* map to MSVC names */ +/* Map to MSVC names. */ #define execlp _execlp #define execvp _execvp #define fdopen _fdopen @@ -312,8 +299,8 @@ typedef int pid_t; #define utime _utime #endif -/* this is hacky, but is necessary to avoid warnings about macro - redefinitions using the SDK compilers */ +/* This is hacky, but is necessary to avoid warnings about macro + redefinitions using the SDK compilers. */ #ifndef __STDC__ #define __STDC__ 1 #define MUST_UNDEF__STDC__ @@ -326,7 +313,7 @@ typedef int pid_t; #undef MUST_UNDEF__STDC__ #endif -/* Defines that we need that aren't in the standard signal.h */ +/* Defines that we need that aren't in the standard signal.h. */ #define SIGHUP 1 /* Hang up */ #define SIGQUIT 3 /* Quit process */ #define SIGTRAP 5 /* Trace trap */ @@ -369,8 +356,7 @@ extern char *get_emacs_configuration_options (void); #include <sys/stat.h> -/* Define for those source files that do not include enough NT - system files. */ +/* Define for those source files that do not include enough NT system files. */ #ifndef NULL #ifdef __cplusplus #define NULL 0 @@ -405,7 +391,7 @@ extern char *get_emacs_configuration_options (void); removed. Also, obviously, all files that define initialized data must include config.h to pick up this pragma. */ -/* Names must be < 8 bytes */ +/* Names must be < 8 bytes. */ #ifdef _MSC_VER #pragma data_seg("EMDATA") #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/>. */ /* Note: lots of stuff here was taken from s-msdos.h in demacs. */ -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ - +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ #ifndef MSDOS #define MSDOS #endif @@ -38,40 +35,34 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ #undef BSD_SYSTEM /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ - + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "ms-dos" #define SYMS_SYSTEM syms_of_dosfns();syms_of_msdos();syms_of_win16select() #define SYSV_SYSTEM_DIR -/* Define this symbol if your system has the functions bcopy, etc. */ - +/* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING /* Define this is the compiler understands `volatile'. */ #define HAVE_VOLATILE -/* subprocesses should be defined if you want to - have code for asynchronous subprocesses - (as used in M-x compile and M-x shell). +/* subprocesses should be defined if you want to have code for + asynchronous subprocesses (as used in M-x compile and M-x shell). This is the only system that needs this. */ - #undef subprocesses /* If your system uses COFF (Common Object File Format) then define the - preprocessor symbol "COFF". */ - + preprocessor symbol "COFF". */ #define COFF -/* Here, on a separate page, add any special hacks needed - to make Emacs work on this system. For example, - you might define certain system call names that don't - exist on your system, or that do different things on - your system and must be used only through an encapsulation - (Which you should place, by convention, in sysdep.c). */ +/* Here, on a separate page, add any special hacks needed to make + Emacs work on this system. For example, you might define certain + system call names that don't exist on your system, or that do + different things on your system and must be used only through an + encapsulation (which you should place, by convention, in sysdep.c). */ /* Avoid incompatibilities between gmalloc.c and system header files in how to declare valloc. */ @@ -83,7 +74,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ /* setjmp and longjmp can safely replace _setjmp and _longjmp, but they will run slower. */ - #define _setjmp setjmp #define _longjmp longjmp @@ -95,7 +85,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ #define ORDINARY_LINK /* command.com does not understand `...` so we define this. */ -#define LIB_GCC -Lgcc #define SEPCHAR ';' #define NULL_DEVICE "nul" @@ -110,17 +99,17 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ :AB=<BG %d>:AF=<FG %d>:op=<DefC>:" /* Define this to a function (Fdowncase, Fupcase) if your file system - likes that */ + likes that. */ #define FILE_SYSTEM_CASE Fmsdos_downcase_filename -/* Define this to be the separator between devices and paths */ +/* Define this to be the separator between devices and paths. */ #define DEVICE_SEP ':' /* We'll support either convention on MSDOG. */ #define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\') #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) -/* bcopy under djgpp is quite safe */ +/* bcopy under djgpp is quite safe. */ #define GAP_USE_BCOPY #define BCOPY_UPWARD_SAFE 1 #define BCOPY_DOWNWARD_SAFE 1 @@ -140,9 +129,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ commentary below, in the non-X branch. The 140KB number was measured on GNU/Linux and on MS-WIndows. */ #define SYSTEM_PURESIZE_EXTRA (-170000+140000) -#define MSDOS_LIBS_SYSTEM -lxext -lsys #else -#define MSDOS_LIBS_SYSTEM /* We need a little extra space, see ../../lisp/loadup.el. As of 20091024, DOS-specific files use up 62KB of pure space. But overall, we end up wasting 130KB of pure space, because @@ -156,9 +143,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ #endif /* Tell the garbage collector that setjmp is known to save all - registers relevant for conservative garbage collection in the - jmp_buf. */ - + registers relevant for conservative garbage collection in the jmp_buf. */ #define GC_SETJMP_WORKS 1 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS 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 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -/* Get most of the stuff from bsd-common */ +/* Get most of the stuff from bsd-common. */ #include "bsd-common.h" #define HAVE_GETLOADAVG 1 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) -#undef LIB_GCC -#define LIB_GCC - -#define AMPERSAND_FULL_NAME - /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears the library search parth, i.e. it won't search /usr/lib - for libc and friends. Using -nostartfiles instead avoids - this problem, and will also work on earlier NetBSD releases */ - + for libc and friends. Using -nostartfiles instead avoids + this problem, and will also work on earlier NetBSD releases. */ #define LINKER $(CC) -nostartfiles #define DEFAULT_SOUND_DEVICE "/dev/audio" @@ -43,7 +37,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Greg A. Woods <woods@weird.com> says we must include signal.h before syssignal.h is included, to work around interface conflicts that are handled with CPP __RENAME() macro in signal.h. */ - #ifndef NOT_C_CODE #include <signal.h> #endif @@ -51,17 +44,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Don't close pty in process.c to make it as controlling terminal. It is already a controlling terminal of subprocess, because we did ioctl TIOCSCTTY. */ - #define DONT_REOPEN_PTY /* Tell that garbage collector that setjmp is known to save all - registers relevant for conservative garbage collection in the - jmp_buf. */ - + registers relevant for conservative garbage collection in the jmp_buf. */ #define GC_SETJMP_WORKS 1 /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method. */ - #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS /* 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 @@ #define SYSTEM_MALLOC -/* - * Use the Solaris dldump() function, called from unexsol.c, to dump - * emacs, instead of the generic ELF dump code found in unexelf.c. - * The resulting binary has a complete symbol table, and is better - * for debugging and other observabilty tools (debuggers, pstack, etc). - * - * If you encounter a problem using dldump(), please consider sending - * a message to the OpenSolaris tools-linking mailing list: - * http://mail.opensolaris.org/mailman/listinfo/tools-linking - * - * It is likely that dldump() works with older Solaris too, - * but this has not been tested, and so, this change is for - * Solaris 10 and newer only at this time. - */ +/* Use the Solaris dldump() function, called from unexsol.c, to dump + emacs, instead of the generic ELF dump code found in unexelf.c. + The resulting binary has a complete symbol table, and is better + for debugging and other observabilty tools (debuggers, pstack, etc). + + If you encounter a problem using dldump(), please consider sending + a message to the OpenSolaris tools-linking mailing list: + http://mail.opensolaris.org/mailman/listinfo/tools-linking + + It is likely that dldump() works with older Solaris too, + but this has not been tested, and so, this change is for + Solaris 10 and newer only at this time. */ #undef UNEXEC #define UNEXEC unexsol.o 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 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ +/* Define symbols to identify the version of Unix this is. + Define all the symbols that apply correctly. */ /* #define USG5 */ /* #define USG */ @@ -34,7 +32,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* #define BSD_SYSTEM */ /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "berkeley-unix" @@ -58,55 +56,46 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ Another method of doing input is planned but not implemented. It would have Emacs fork off a separate process to read the input and send it to the true Emacs process - through a pipe. */ - + through a pipe. */ #define INTERRUPT_INPUT /* Letter to use in finding device name of first pty, - if system supports pty's. 'a' means it is /dev/ptya0 */ - + if system supports pty's. 'a' means it is /dev/ptya0. */ #define FIRST_PTY_LETTER 'a' -/* - * Define HAVE_TERMIOS if the system provides POSIX-style - * functions and macros for terminal control. - * - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - * - * Do not define both. HAVE_TERMIOS is preferred, if it is - * supported on your system. - */ +/* Define HAVE_TERMIOS if the system provides POSIX-style + functions and macros for terminal control. + + Define HAVE_TERMIO if the system provides sysV-style ioctls + for terminal control. + + Do not define both. HAVE_TERMIOS is preferred, if it is + supported on your system. */ #define HAVE_TERMIOS /* #define HAVE_TERMIO */ -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - +/* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS -/* Define this symbol if your system has the functions bcopy, etc. */ - +/* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING /* subprocesses should be undefined if you do NOT want to have code for asynchronous subprocesses (as used in M-x compile and M-x shell). - Currently only MSDOS does not support this. */ + Currently only MSDOS does not support this. */ /* #undef subprocesses */ /* If your system uses COFF (Common Object File Format) then define the - preprocessor symbol "COFF". */ + preprocessor symbol "COFF". */ /* #define COFF */ /* Define CLASH_DETECTION if you want lock files to be written so that Emacs can tell instantly when you try to modify a file that someone else has modified in his Emacs. */ - #define CLASH_DETECTION /* 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/>. */ /* ============================================================ */ -/* Here, add any special hacks needed - to make Emacs work on this system. For example, - you might define certain system call names that don't - exist on your system, or that do different things on - your system and must be used only through an encapsulation - (Which you should place, by convention, in sysdep.c). */ +/* Here, add any special hacks needed to make Emacs work on this + system. For example, you might define certain system call names + that don't exist on your system, or that do different things on + your system and must be used only through an encapsulation (which + you should place, by convention, in sysdep.c). */ /* If the system's imake configuration file defines `NeedWidePrototypes' 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/>. */ /* This sets the name of the slave side of the PTY. On SysVr4, grantpt(3) forks a subprocess, so keep sigchld_handler() from intercepting that death. If any child but grantpt's should die - within, it should be caught after sigrelse(2). */ - + within, it should be caught after sigrelse(2). */ #define PTY_TTY_NAME_SPRINTF \ { \ char *ptsname(), *ptyname; \ @@ -54,12 +53,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ } /* Data type of load average, as read out of kmem. */ - #define LOAD_AVE_TYPE long /* Convert that into an integer that is 100 for a load average of 1.0 */ /* This is totally uncalibrated. */ - #define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE)) #define FSCALE 256.0 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 @@ Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +Written by James Van Artsdalen of Dell Computer Corp. james@bigtex.cactus.org. +Subsequently improved for Dell 2.2 by Eric S. Raymond <esr@snark.thyrsus.com>. + This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify @@ -18,57 +21,36 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -/* This file written by James Van Artsdalen of Dell Computer Corporation. - * james@bigtex.cactus.org. Subsequently improved for Dell 2.2 by Eric - * S. Raymond <esr@snark.thyrsus.com>. - */ - -/* Use the SysVr3 file for at least base configuration. */ - +/* Use the SysVr3 file for at least base configuration. */ #define USG /* System III, System V, etc */ #define USG5 #define USG5_4 /* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ - + It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "usg-unix-v" -/* - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - */ - +/* Define HAVE_TERMIO if the system provides sysV-style ioctls + for terminal control. */ #define HAVE_TERMIO -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -/* - * Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir - * library functions. Almost, but not quite the same as - * the 4.2 functions - */ +/* Define SYSV_SYSTEM_DIR to use the V.3 getdents/readir library + functions. Almost, but not quite the same as the 4.2 functions. */ #define SYSV_SYSTEM_DIR /* The file containing the kernel's symbol table is called /unix. */ - #define KERNEL_FILE "/unix" -/* The symbol in the kernel where the load average is found - is named avenrun. */ - +/* The kernel symbol where the load average is found is named avenrun. */ #define LDAV_SYMBOL "avenrun" /* setjmp and longjmp can safely replace _setjmp and _longjmp, but they will run slower. */ - #define _setjmp setjmp #define _longjmp longjmp -/* On USG systems these have different names */ +/* On USG systems these have different names. */ #ifndef HAVE_INDEX #define index strchr #endif /* ! defined (HAVE_INDEX) */ @@ -76,35 +58,27 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define rindex strrchr #endif /* ! defined (HAVE_RINDEX) */ - -/* The docs for system V/386 suggest v.3 has sigpause, - so let's give it a try. */ +/* The docs for system V/386 suggest v.3 has sigpause, so let's try it. */ #define HAVE_SYSV_SIGPAUSE - -/* If we're using the System V X port, BSD bstring functions will be handy */ - +/* If we're using the System V X port, BSD bstring functions will be handy. */ #ifdef HAVE_X_WINDOWS #define BSTRING #endif /* HAVE_X_WINDOWS */ -/* On USG systems signal handlers return void */ - +/* On USG systems signal handlers return void. */ #define SIGTYPE void #define ORDINARY_LINK -/* Undump with ELF */ - +/* Undump with ELF. */ #undef COFF #define UNEXEC unexelf.o -/* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct - * tchars. But get <termio.h> first to make sure ttold.h doesn't - * interfere. And don't try to use SIGIO yet. - */ - +/* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars. + But get <termio.h> first to make sure ttold.h doesn't interfere. + And don't try to use SIGIO yet. */ #ifndef NOT_C_CODE #include <sys/wait.h> #endif @@ -121,15 +95,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #endif /* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments; - * instead, there's a system variable _sys_nsig. Unfortunately, we need the - * constant to dimension an array. So wire in the appropriate value here. - */ + instead, there's a system variable _sys_nsig. Unfortunately, we need the + constant to dimension an array. So wire in the appropriate value here. */ #define NSIG_MINIMUM 32 -/* We can support this */ - +/* We can support this. */ #define CLASH_DETECTION +/* Define HAVE_PTYS if the system supports pty devices. */ #define HAVE_PTYS #define HAVE_TERMIOS @@ -137,7 +110,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ waiting, because a previous waitsys(2) cleaned up the carcass of child without clearing the SIGCHLD pending info. So, use a non-blocking wait3 instead, which maps to waitpid(2) in SysVr4. */ - #define wait3(status, options, rusage) \ waitpid ((pid_t) -1, (status), (options)) #define WRETCODE(w) (w >> 8) @@ -145,20 +117,16 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY subprocesses the usual way. But TIOCSIGNAL does work for PTYs, and this is all we need. */ - #define TIOCSIGSEND TIOCSIGNAL /* This change means that we don't loop through allocate_pty too many - times in the (rare) event of a failure. */ - + times in the (rare) event of a failure. */ #define FIRST_PTY_LETTER 'z' -/* This sets the name of the master side of the PTY. */ - +/* This sets the name of the master side of the PTY. */ #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx"); -/* Push various streams modules onto a PTY channel. */ - +/* Push various streams modules onto a PTY channel. */ #define SETUP_SLAVE_PTY \ if (ioctl (xforkin, I_PUSH, "ptem") == -1) \ fatal ("ioctl I_PUSH ptem", errno); \ @@ -167,8 +135,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \ fatal ("ioctl I_PUSH ttcompat", errno); -/* This definition was suggested for next release. - So give it a try. */ +/* This definition was suggested for next release. So give it a try. */ #define HAVE_SOCKETS /* 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) /* Are multibyte characters enabled in current_buffer? */ it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters); - /* Do we need to reorder bidirectional text? */ - it->bidi_p = !NILP (current_buffer->bidi_display_reordering); + /* Do we need to reorder bidirectional text? Not if this is a + unibyte buffer: by definition, none of the single-byte characters + are strong R2L, so no reordering is needed. And bidi.c doesn't + support unibyte buffers anyway. */ + it->bidi_p + = !NILP (current_buffer->bidi_display_reordering) && it->multibyte_p; /* Non-zero if we should highlight the region. */ highlight_region_p |