1. 27 Apr, 2010 2 commits
    • Glenn Morris's avatar
      Use $CRT_DIR in more places. · 76cda504
      Glenn Morris authored
      * configure.in (--with-crt-dir): Doc fix (now valid for all platforms).
      (CRT_DIR): On (powerpc64|sparc64)-*-linux-gnu*, default to /usr/lib64.
      On hpux10-20, default to /lib.
      
      * src/m/amdx86-64.h (START_FILES, LIB_STANDARD): Change the logic around,
      since the defaults (set by the system file) are fine in most cases.
      [GNU_LINUX, __OpenBSD__, __NetBSD__, __APPLE__]: Remove sections.
      * src/m/ibms390x.h (START_FILES, LIB_STANDARD):
      * src/m/macppc.h (START_FILES, LIB_STANDARD) [GNU_LINUX]:
      * src/m/sparc.h (START_FILES, LIB_STANDARD) [__linux__]:
      Remove definitions, since they are set correctly in s/gnu-linux.h.
      * src/s/freebsd.h (START_FILES, LIB_STANDARD):
      * src/s/gnu-linux.h (START_FILES, LIB_STANDARD):
      * src/s/hpux10-20.h (START_FILES):
      * src/s/netbsd.h (START_FILES, LIB_STANDARD, START_FILES_1, END_FILES_1):
      Use $CRT_DIR in place of fixed /usr/lib, /lib directories.
      
      * src/Makefile.in: Comment.
      76cda504
    • Glenn Morris's avatar
      Replace some more cpp with autoconf. · b678dd8b
      Glenn Morris authored
      * configure.in (LUCID_LIBW, LIBXP, WIDGET_OBJ): New output variables.
      
      * src/Makefile.in (LIBXP, LUCID_LIBW, WIDGET_OBJ): Set via configure.
      (MOTIF_LIBW): Use $LIBXP.
      (otherobj): Use $WIDGET_OBJ.
      b678dd8b
  2. 26 Apr, 2010 3 commits
  3. 25 Apr, 2010 3 commits
    • Dan Nicolaescu's avatar
      Remove all NO_ARG_ARRAY uses. · 39e2ad1b
      Dan Nicolaescu authored
      * fns.c (concat2, concat3, nconc2):
      * eval.c (apply1, call1, call2, call3, call4, call5, call6)
      (call7): Remove NO_ARG_ARRAY usage, assume it's always true.
      * m/xtensa.h (NO_ARG_ARRAY):
      * m/template.h (NO_ARG_ARRAY):
      * m/sparc.h (NO_ARG_ARRAY):
      * m/sh3.h (NO_ARG_ARRAY):
      * m/mips.h (NO_ARG_ARRAY):
      * m/macppc.h (NO_ARG_ARRAY):
      * m/iris4d.h (NO_ARG_ARRAY):
      * m/intel386.h (NO_ARG_ARRAY):
      * m/ibms390x.h (NO_ARG_ARRAY):
      * m/ibms390.h (NO_ARG_ARRAY):
      * m/ibmrs6000.h (NO_ARG_ARRAY):
      * m/ia64.h (NO_ARG_ARRAY):
      * m/hp800.h (NO_ARG_ARRAY):
      * m/arm.h (NO_ARG_ARRAY):
      * m/amdx86-64.h (NO_ARG_ARRAY):
      * m/alpha.h (NO_ARG_ARRAY): Remove definition.
      39e2ad1b
    • Eli Zaretskii's avatar
      Move code that bidi-iterates out of display property to a separate function. · f538fcec
      Eli Zaretskii authored
       xdisp.c (iterate_out_of_display_property): New function, body from pop_it.
       (pop_it): Use it.
      f538fcec
    • Eli Zaretskii's avatar
      Fix crash with bidi display on the last empty line (bug#6030). · adf4f59c
      Eli Zaretskii authored
       xdisp.c (display_line): Don't assume 2nd call to
       get_next_display_element cannot return zero.
      adf4f59c
  4. 24 Apr, 2010 6 commits
    • Glenn Morris's avatar
      Minor simplications for src/m/amdx86-64.h. · dfbbda83
      Glenn Morris authored
      * m/amdx86-64.h (START_FILES, LIB_STANDARD) [__OpenBSD__]:
      For clarity, revert to using fixed /usr/lib rather than $CRT_DIR.
      (START_FILES, LIB_STANDARD) [__FreeBSD__]: Merge into the generic case,
      since CRT_DIR defaults to /usr/lib.  Suggested by Dan Nicolaescu.
      dfbbda83
    • Juanma Barranquero's avatar
      Remove conflict markers. · 58ccf243
      Juanma Barranquero authored
      58ccf243
    • Eli Zaretskii's avatar
      Fix cursor motion at end of line that ends with a composite character. · a49884a6
      Eli Zaretskii authored
       xdisp.c (display_line): Use `reseat' instead of `reseat_1', and
       use `get_next_display_element' and `set_iterator_to_next' to
       advance to the next character, when looking for the character that
       begins the next row.
      a49884a6
    • Eli Zaretskii's avatar
      Fix GDB startup with src/.gdbinit. · 2d4018aa
      Eli Zaretskii authored
       .gdbinit: Add a "set Fmake_symbol" line to force GDB load the
       definition of "struct Lisp_Symbol".
      2d4018aa
    • Eli Zaretskii's avatar
      Fix GDB startup with .gdbinit. · 76db6fcc
      Eli Zaretskii authored
       .gdbinit: Add a "set Fmake_symbol" line to force GDB to load the
       definition of "struct Lisp_Symbol".
      76db6fcc
    • Glenn Morris's avatar
      Close bug#5655. · 70eab5c1
      Glenn Morris authored
      * configure.in (CRT_DIR): New output variable.
      (--with-crt-dir): New option.  (Bug#5655)
      (HAVE_LIB64_DIR): Remove.
      
      * src/Makefile.in (CRT_DIR): New variable, set by configure.
      * src/m/amdx86-64.h, m/ibms390x.h (START_FILES, LIB_STANDARD):
      Use $CRT_DIR rather than HAVE_LIB64_DIR.  (Bug#5655)
      70eab5c1
  5. 23 Apr, 2010 13 commits
  6. 22 Apr, 2010 1 commit
    • Jan Djärv's avatar
      Fix Bug#6001. · a0d0b563
      Jan Djärv authored
      * xsettings.c (read_and_apply_settings): Check if current_font is
        NULL before strcmp (Bug#6001).
      a0d0b563
  7. 21 Apr, 2010 3 commits
    • Dan Nicolaescu's avatar
      Clean up HP-UX files. · 56bae7c7
      Dan Nicolaescu authored
      * m/hp800.h (NO_REMAP, VIRT_ADDR_VARIES, DATA_SEG_BITS)
      (DATA_START, TEXT_START, LOAD_AVE_TYPE, LOAD_AVE_CVT)
      (LDAV_SYMBOL, index, rindex): Move definitions only used in HP-UX ...
      * s/hpux10-20.h: ... to the only user, here.
      56bae7c7
    • Jan Djärv's avatar
      * xsettings.c: Move misplaced HAVE_GCONF · 31a01b90
      Jan Djärv authored
      31a01b90
    • Eli Zaretskii's avatar
      Fix bug #5992. · 372b7a95
      Eli Zaretskii authored
       bidi.c (bidi_find_paragraph_start, bidi_at_paragraph_end): Don't
       use buffer-local values of paragraph-start and paragraph-separate.
       <paragraph_start_re, paragraph_separate_re>: Rename from
       fallback_paragraph_start_re and fallback_paragraph_separate_re.
      372b7a95
  8. 20 Apr, 2010 1 commit
    • Jan Djärv's avatar
      Gtk tool bars can be text, icons with text or just icons. · f904c0f9
      Jan Djärv authored
      * xsettings.c: Qmonospace_font_name, Qtool_bar_style and
      current_tool_bar_style are new.
      (store_config_changed_event): Rename from store_font_changed_event.
      (XSETTINGS_TOOL_BAR_STYLE): New define.
      (SEEN_FONT, SEEN_TB_STYLE): New enum values.
      (struct xsettings): Add font and tb_style, set xft stuff inside #ifdef
      HAVE_XFT.
      (something_changedCB): store_font_changed_event is now
      store_config_changed_event
      (parse_settings): Rename from parse_xft_settings.  Read
      non-xft xsettings outside #ifdef HAVE_XFT.
      (read_settings): Renamed from read_xft_settings.
      (apply_xft_settings): Take current settings as parameter.  Do not
      call read_(xft)_settings.
      (read_and_apply_settings): New function.
      (xft_settings_event): Do non-xft stuff out of HAVE_XFT.  Call
      read_and_apply_settings if there are settings to be read.
      (init_xsettings): Renamed from init_xfd_settings.
      Call read_and_apply_settings unconditionally.
      (xsettings_initialize): Call init_xsettings.
      (Ftool_bar_get_system_style): New function.
      (syms_of_xsettings): Define Qmonospace_font_name and
      Qtool_bar_style.  Initialize current_tool_bar_style to nil.
      defsubr Stool_bar_get_system_style. Fprovide on
      dynamic-setting.
      
      * xsettings.h (Ftool_bar_get_system_style): Declare.
      
      * xdisp.c: Vtool_bar_style, tool_bar_max_label_size,
      Qtext, Qboth, Qboth_horiz are new.
      (syms_of_xdisp): Intern Qtext, Qboth, Qboth_horiz, DEFVAR
      Vtool_bar_style, tool_bar_max_label_size.
      
      * lisp.h: Extern declare Qtext, Qboth, Qboth_horiz.
      
      * keyboard.c: QClabel is new.
      (parse_tool_bar_item): Take out QClabel from tool bar items.
      Try to construct a label if ther is no QClabel.
      (syms_of_keyboard): Intern :label as QClabel.
      
      * dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new.
      (Vtool_bar_style, tool_bar_max_label_size, DEFAULT_TOOL_BAR_LABEL_SIZE):
      New.
      
      * Makefile.in (SOME_MACHINE_LISP): font-setting.el renamed to
      dynamic-setting.el.
      
      * gtkutil.c (xg_tool_bar_menu_proxy): Handle label in tool bar item.
      (xg_make_tool_item, xg_show_toolbar_item): New function.
      (update_frame_tool_bar): Take label from TOOL_BAR_ITEM_LABEL.
      Call xg_make_tool_item to make a tool bar item.
      Call xg_show_toolbar_item.  Use wtoolbar instead of x->toolbar_widget.
      
      * xterm.c (x_draw_image_relief): Take Vtool_bar_button_margin
      into account for toolbars.
      
      * vc-dir.el (vc-dir-tool-bar-map): Add :label on some tool bar items.
      
      * tool-bar.el (tool-bar-setup): Add :label on some tool bar items.
      
      * loadup.el: Load dynamic-setting.el if feature dynamic-setting
      is present.
      
      * info.el (info-tool-bar-map): Add labels.
      
      * cus-start.el (all): Add tool-bar-style and tool-bar-max-label-size.
      
      * cus-edit.el (custom-commands): Add labels for tool bar.
      (custom-buffer-create-internal, Custom-mode): Adjust for
      labels in custom-commands.
      
      * dynamic-setting.el: Renamed from font-setting.el.
      f904c0f9
  9. 21 Apr, 2010 8 commits
    • Jan Djärv's avatar
      Declarations before code (Bug#5993). · c632dfda
      Jan Djärv authored
      * data.c (make_blv): Declarations before code (Bug#5993).
      
      * xlwmenu.c (expose_cb):
      * lwlib-Xaw.c (fill_xft_data): Declarations before code (Bug#5993).
      c632dfda
    • Glenn Morris's avatar
      0dce7acd
    • Glenn Morris's avatar
      Remove some more cpp in favor of autoconf. · 10efe302
      Glenn Morris authored
      * configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
      (GTK_OBJ, DBUS_OBJ, LIBXSM, XMENU_OBJ, XOBJ): New output variables.
      
      * src/Makefile.in (DBUS_OBJ, GTK_OBJ, XMENU_OBJ, XOBJ):
      Define using autoconf, not cpp.
      (LIBXSM): New variable, set by autoconf.
      (LIBXT): Use $LIBXSM.
      10efe302
    • Dan Nicolaescu's avatar
      Remove NOMULTIPLEJOBS, unused. · 3ec759e7
      Dan Nicolaescu authored
      * s/template.h (NOMULTIPLEJOBS):
      * s/msdos.h (NOMULTIPLEJOBS): Remove, unused.
      3ec759e7
    • Dan Nicolaescu's avatar
      Simplify LD_SWITCH_SYSTEM_TEMACS usage. · 4285ac5a
      Dan Nicolaescu authored
      * s/freebsd.h (LD_SWITCH_SYSTEM_TEMACS):
      * s/gnu-linux.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure
      detects -znocombreloc and passes it to the linker
      * s/hpux10-20.h (LD_SWITCH_SYSTEM_TEMACS): Remove, empty.
      4285ac5a
    • Glenn Morris's avatar
      Remove LIBSELINUX_LIBS need for cpp in Makefiles. · 2807228d
      Glenn Morris authored
      * configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
      * src/Makefile.in (LIBSELINUX_LIBS): Remove containing #ifdef.
      2807228d
    • Karel Klíc's avatar
      Add SELinux support. · 574c05e2
      Karel Klíc authored
      * configure.in: New option: --with(out)-selinux, on by default.
      Set HAVE_LIBSELINUX if we find libselinux, and substitute
      LIBSELINUX_LIBS in Makefiles.
      
      * src/Makefile.in (LIBSELINUX_LIBS): New.
      (LIBES): Add $LIBSELINUX_LIBS.
      * src/eval.c, lisp.h (call7): New function.
      * src/fileio.c [HAVE_LIBSELINUX]: Include selinux headers.
      (Ffile_selinux_context, Fset_file_selinux_context):
      New functions.
      (Fcopy_file): New parameter preserve-selinux-context.
      (Frename_file): Preserve selinux context when renaming by copy-file.
      
      * lisp/files.el (backup-buffer): Handle SELinux context, and return it
      if a backup was made by renaming.
      (backup-buffer-copy): Set SELinux context to the target file.
      (basic-save-buffer): Set SELinux context of the newly written file.
      (basic-save-buffer-1): Now it also returns any SELinux context.
      (basic-save-buffer-2): Set SELinux context of the newly created file,
      and return it.
      * lisp/net/tramp.el (tramp-file-name-for-operation):
      Add file-selinux-context.
      574c05e2
    • Juanma Barranquero's avatar
      Fix typos and spacing. · 50426a04
      Juanma Barranquero authored
      50426a04