1. 21 Apr, 2010 5 commits
  2. 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
  3. 21 Apr, 2010 17 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
    • Leo Liu's avatar
      Added C-o keybinding to toggle use of virtual buffers · c5cbeb12
      Leo Liu authored
      * ido.el (ido-init-completion-maps): For ido-switch-buffer, C-o
      toggles the use of virtual buffers.
      (ido-buffer-internal): Guard `ido-use-virtual-buffers' global
      value.  
      (ido-toggle-virtual-buffers): New function.
      c5cbeb12
    • Dan Nicolaescu's avatar
      Remove NOMULTIPLEJOBS. · b6c73ee2
      Dan Nicolaescu authored
      b6c73ee2
    • 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
    • Juanma Barranquero's avatar
      tetris.el: Use `define-derived-mode'; fix window selection; doc fixes. · fcc93746
      Juanma Barranquero authored
      * play/tetris.el (tetris, tetris-update-speed-function)
        (tetris-tty-colors, tetris-x-colors, tetris-move-bottom)
        (tetris-move-left, tetris-move-right, tetris-rotate-prev)
        (tetris-rotate-next, tetris-end-game, tetris-start-game)
        (tetris-pause-game): Fix typos in docstrings.
        (tetris-mode-map, tetris-null-map): Move initialization into declaration.
        (tetris-mode): Define with `define-derived-mode';
        set show-trailing-whitespace to nil.
        (tetris): Prefer window already displaying the "*Tetris*" buffer.
      fcc93746
    • Glenn Morris's avatar
      Regenerate configure. · 3dad0889
      Glenn Morris authored
      3dad0889
    • 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
    • Glenn Morris's avatar
      Regenerate configure, src/config.in. · 022c122a
      Glenn Morris authored
      022c122a
    • Glenn Morris's avatar
      Doc updates for SELinux support. · b7d65a5f
      Glenn Morris authored
      * ack.texi, emacs.texi (Acknowledgments): Add SELinux support.
      
      * etc/NEWS: Mention SELinux support.
      b7d65a5f
    • 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
    • Stefan Monnier's avatar
    • Stefan Monnier's avatar
      Make the log-edit comments use RFC822 format throughout. · e97a42c1
      Stefan Monnier authored
      * vc.el (vc-checkin, vc-modify-change-comment):
      Adjust to new vc-start/finish-logentry.
      (vc-find-conflicted-file): New command.
      (vc-transfer-file): Adjust to new vc-checkin.
      (vc-next-action): Improve scoping.
      
      * vc-hg.el (vc-hg-log-edit-mode): Remove.
      (vc-hg-checkin): Remove extra arg.  Use log-edit-extract-headers.
      
      * vc-git.el (vc-git-log-edit-mode): Remove.
      (vc-git-checkin): Remove extra arg.  Use log-edit-extract-headers.
      (vc-git-commits-coding-system): Rename from git-commits-coding-system.
      
      * vc-dispatcher.el (vc-log-edit): Shorten names for log-edit-show-files.
      (vc-start-logentry): Remove argument `extra'.
      (vc-finish-logentry): Remove extra args.
      
      * vc-bzr.el (vc-bzr-log-edit-mode): Remove.
      (vc-bzr-checkin): Remove extra arg.  Use log-edit-extract-headers.
      (vc-bzr-conflicted-files): New function.
      
      * log-edit.el (log-edit-extra-flags)
      (log-edit-before-checkin-process): Remove.
      (log-edit-summary, log-edit-header, log-edit-unknown-header): New faces.
      (log-edit-headers-alist): New var.
      (log-edit-header-contents-regexp): New const.
      (log-edit-match-to-eoh): New function.
      (log-edit-font-lock-keywords): Use them.
      (log-edit): Insert a "Summary:" header as default.
      (log-edit-mode): Mark font-lock rules as case-insensitive.
      (log-edit-done): Cleanup headers.
      (log-view-process-buffer): Remove.
      (log-edit-extract-headers): New function to replace it.
      e97a42c1
    • Juanma Barranquero's avatar
      Fix typos and spacing. · 50426a04
      Juanma Barranquero authored
      50426a04
    • Juanma Barranquero's avatar
      Don't depend on cm.c or termcap.c on Windows, use stubs. · 91eac4bb
      Juanma Barranquero authored
      * makefile.w32-in (OBJ1): Remove cm.$(O) and termcap.$(O).
        ($(BLD)/cm.$(O), $(BLD)/termcap.$(O)): Remove.
      * w32console.c (current_tty, cost): New vars; lifted from cm.c.
        (evalcost, cmputc, cmcheckmagic, cmcostinit, cmgoto, Wcm_clear)
        (sys_tputs, sys_tgetstr): New stubs.
      * s/ms-w32.h (chcheckmagic, cmcostinit, cmgoto, cmputc, Wcm_clear)
        (tputs, tgetstr): New; define to sys_*.
      91eac4bb
  4. 20 Apr, 2010 14 commits
    • Juanma Barranquero's avatar
      938efb77
    • Stefan Monnier's avatar
      Warn rather than error when making a local var inside a let. · 8b1e1112
      Stefan Monnier authored
      * data.c (Fmake_variable_buffer_local, Fmake_local_variable):
      Just signal a warning rather than an error when inside a let.
      (Fmake_variable_frame_local): Add the same test.
      8b1e1112
    • Stefan Monnier's avatar
    • Stefan Monnier's avatar
      * buffer.h (struct buffer): Remove unused var `direction_reversed'. · b4bf28b7
      Stefan Monnier authored
      * buffer.c (init_buffer_once, syms_of_buffer): Remove its initialization.
      
      * bidi.c (bidi_initialize): Simplify fallback_paragraph_*_re init.
      b4bf28b7
    • Stefan Monnier's avatar
    • Stefan Monnier's avatar
      (lisp-completion-at-point): Complete around point. · 6e610c72
      Stefan Monnier authored
      I.e. include text after point in the completion region.
      Also, return nil when we're not after/in a symbol.
      6e610c72
    • Chong Yidong's avatar
    • Stefan Monnier's avatar
    • Eli Zaretskii's avatar
      Implement GUI display of R2L lines, fix TTY display of R2L lines. · 283ccc18
      Eli Zaretskii authored
       xdisp.c [HAVE_WINDOW_SYSTEM]: Add prototype for
       append_stretch_glyph.
       (set_cursor_from_row) <cursor_x>: Remove unused variable.  Fix
       off-by-one error in computing x at end of text in the row.
       (append_stretch_glyph): In reversed row, prepend the glyph rather
       than append it.  Set resolved_level and bidi_type of the glyph.
       (extend_face_to_end_of_line): If the row is reversed, prepend a
       stretch glyph whose width is such that the rightmost glyph will be
       drawn at the right margin of the window.  Fix off-by-one error on
       TTY frames in testing whether a line needs face extension.  Fix
       face extension at ZV.  If this is the last glyph row, use
       DEFAULT_FACE_ID, to avoid painting the rest of the window with the
       region face.
       (set_cursor_from_row, display_line): Use
       MATRIX_ROW_CONTINUATION_LINE_P instead of testing value of
       row->continuation_lines_width.
       (next_element_from_buffer): Don't call bidi_paragraph_init if we
       are at ZV.  Fixes a crash when reseated to ZV by
       try_window_reusing_current_matrix.
       (display_and_set_cursor, erase_phys_cursor): Handle negative HPOS,
       which happens with R2L glyph rows.  Fixes a crash when inserting a
       character at end of an R2L line.
       (set_cursor_from_row): Don't be fooled by truncated rows: don't
       treat them as having zero-width characters.  Improve comments.
       Don't reverse pos_before and pos_after for reversed glyph rows.
       Set cursor.x to negative value when the cursor might be on the
       left fringe.
       (IT_OVERFLOW_NEWLINE_INTO_FRINGE): For R2L lines, consider the
       left fringe, not the right one.
       (notice_overwritten_cursor, draw_phys_cursor_glyph)
       (erase_phys_cursor): For reversed cursor_row, support cursor on
       the left fringe.
       fringe.c (update_window_fringes): For R2L rows, swap the bitmaps
       of continuation indicators on the fringes.
       (draw_fringe_bitmap): For reversed glyph rows, allow cursor on the
       left fringe.
       w32term.c (w32_draw_window_cursor): For reversed glyph rows,
       draw cursor on the left fringe.
       xterm.c (x_draw_window_cursor): For reversed glyph rows, draw
       cursor on the left fringe.
       dispnew.c (update_text_area): Handle reversed desired rows when
       the cursor is on the left fringe.
       (set_window_cursor_after_update): Limit cursor's hpos by -1 from
       below, not by 0, for when the cursor is on the left fringe.
      
       xdisp.c (unproduce_glyphs): New function.
       (display_line): Use it when produced glyphs are discarded from R2L
       glyph rows.
       (append_composite_glyph): In R2L rows, prepend the glyph rather
       than appending it.
        term.c (append_composite_glyph): In R2L rows, prepend the glyph
       rather than append it.  Set up the resolved_level and bidi_type
       attributes of the appended glyph.
       (produce_special_glyphs): Mirror the backslash continuation
       character in R2L lines.
      283ccc18
    • Eli Zaretskii's avatar
      Fix R2L paragraph display on TTY. · 93d68d0c
      Eli Zaretskii authored
       xdisp.c (unproduce_glyphs): New function.
       (display_line): Use it when produced glyphs are discarded from R2L
       glyph rows.
       (append_composite_glyph): In R2L rows, prepend the glyph rather
       than appending it.
       term.c (append_composite_glyph): In R2L rows, prepend the glyph
       rather than append it.  Set up the resolved_level and bidi_type
       attributes of the appended glyph.
      93d68d0c
    • Jan Djärv's avatar
    • Kenichi Handa's avatar
      merge trunk · 1f2f0b28
      Kenichi Handa authored
      1f2f0b28
    • Kenichi Handa's avatar
      charset.c (char_charset): Consider Vcharset_non_preferred_head only when the... · c0be27fd
      Kenichi Handa authored
      charset.c (char_charset): Consider Vcharset_non_preferred_head only when the arg CHARSET_LIST is nil.
      c0be27fd
    • Stefan Monnier's avatar
      Make variable forwarding explicit rather the using special values. · ce5b453a
      Stefan Monnier authored
      Basically, this makes the structure of buffer-local values and object
      forwarding explicit in the type of Lisp_Symbols rather than use
      special Lisp_Objects for that.  This tends to lead to slightly more
      verbose code, but is more C-like, simpler, and makes it easier to make
      sure we handled all cases, among other things by letting the compiler
      help us check it.
      * lisp.h (enum Lisp_Misc_Type, union Lisp_Misc):
      Removing forwarding objects.
      (enum Lisp_Fwd_Type, enum symbol_redirect, union Lisp_Fwd): New types.
      (struct Lisp_Symbol): Make the various forms of variable-forwarding
      explicit rather than hiding them inside Lisp_Object "values".
      (XFWDTYPE): New macro.
      (XINTFWD, XBOOLFWD, XOBJFWD, XKBOARD_OBJFWD): Redefine.
      (XBUFFER_LOCAL_VALUE): Remove.
      (SYMBOL_VAL, SYMBOL_ALIAS, SYMBOL_BLV, SYMBOL_FWD, SET_SYMBOL_VAL)
      (SET_SYMBOL_ALIAS, SET_SYMBOL_BLV, SET_SYMBOL_FWD): New macros.
      (SYMBOL_VALUE, SET_SYMBOL_VALUE): Remove.
      (struct Lisp_Intfwd, struct Lisp_Boolfwd, struct Lisp_Objfwd)
      (struct Lisp_Buffer_Objfwd, struct Lisp_Kboard_Objfwd):
      Remove the Lisp_Misc_* header.
      (struct Lisp_Buffer_Local_Value): Redefine.
      (BLV_FOUND, SET_BLV_FOUND, BLV_VALUE, SET_BLV_VALUE): New macros.
      (struct Lisp_Misc_Any): Add filler to get the right size.
      (struct Lisp_Free): Use struct Lisp_Misc_Any rather than struct
      Lisp_Intfwd.
      (DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
      (DEFVAR_KBOARD): Allocate a forwarding object.
      * data.c (do_blv_forwarding, store_blv_forwarding): New macros.
      (let_shadows_global_binding_p): New function.
      (union Lisp_Val_Fwd): New type.
      (make_blv): New function.
      (swap_in_symval_forwarding, indirect_variable, do_symval_forwarding)
      (store_symval_forwarding, swap_in_global_binding, Fboundp)
      (swap_in_symval_forwarding, find_symbol_value, Fset)
      (let_shadows_buffer_binding_p, set_internal, default_value)
      (Fset_default, Fmake_variable_buffer_local, Fmake_local_variable)
      (Fkill_local_variable, Fmake_variable_frame_local)
      (Flocal_variable_p, Flocal_variable_if_set_p)
      (Fvariable_binding_locus):
      * xdisp.c (select_frame_for_redisplay):
      * lread.c (Fintern, Funintern, init_obarray, defvar_int)
      (defvar_bool, defvar_lisp_nopro, defvar_lisp, defvar_kboard):
      * frame.c (store_frame_param):
      * eval.c (Fdefvaralias, Fuser_variable_p, specbind, unbind_to):
      * bytecode.c (Fbyte_code) <varref, varset>: Adapt to the new symbol
      value structure.
      * buffer.c (PER_BUFFER_SYMBOL): Move from buffer.h.
      (clone_per_buffer_values): Only adjust markers into the current buffer.
      (reset_buffer_local_variables): PER_BUFFER_IDX is never -2.
      (Fbuffer_local_value, set_buffer_internal_1)
      (swap_out_buffer_local_variables):
      Adapt to the new symbol value structure.
      (DEFVAR_PER_BUFFER): Allocate a Lisp_Buffer_Objfwd object.
      (defvar_per_buffer): Take a new arg for the fwd object.
      (buffer_lisp_local_variables): Return a proper alist (different fix
      for bug#4138).
      * alloc.c (Fmake_symbol): Use SET_SYMBOL_VAL.
      (Fgarbage_collect): Don't handle buffer_defaults specially.
      (mark_object): Handle new symbol value structure rather than the old
      special Lisp_Misc_* objects.
      (gc_sweep) <symbols>: Free also the buffer-local-value objects.
      * term.c (set_tty_color_mode):
      * bidi.c (bidi_initialize): Don't access the ->value field directly.
      * buffer.h (PER_BUFFER_VAR_OFFSET): Don't bother with
      a buffer_local_flags.
      * print.c (print_object): Get rid of impossible forwarding objects.
      ce5b453a
  5. 19 Apr, 2010 3 commits