1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-22 07:51:17 -08:00
Commit graph

29902 commits

Author SHA1 Message Date
YAMAMOTO Mitsuharu
b609f5916d * alloc.c (mark_maybe_object): Return early if given a Lisp integer (Bug#6301). 2010-11-21 19:43:53 -05:00
Ken Brown
731e263a73 * src/sheap.c (STATIC_HEAP_SIZE): Revert previous change. 2010-11-21 10:46:23 -05:00
Jan Djärv
b7d1e14447 Add separate key mappings for left/right control/command on Nextstep (Bug#7458).
* lisp/cus-start.el (all): Add ns-right-control-modifier and
ns-right-command-modifier.

* lisp/term/ns-win.el (ns-right-control-modifier)
(ns-right-command-modifier): Defvar them.

* src/nsterm.m (ns_right_command_modifier, ns_right_control_modifier):
Define (Bug#7458).
(NSRightCommandKeyMask, NSRightControlKeyMask): Define (Bug#7458).
(EV_MODIFIERS): Check for NSRightCommandKeyMask and
NSRightControlKeyMask also (Bug#7458).
(keyDown): Ditto (Bug#7458).
(syms_of_nsterm): Defvar ns-right-command-modifier and
ns-right-control-modifier (Bug#7458).
2010-11-21 14:09:34 +01:00
Dan Nicolaescu
bee3419fea Remove emacs-priority.
* src/sysdep.c (sys_subshell): Remove SET_EMACS_PRIORITY.
* src/emacs.c (emacs_priority, syms_of_emacs): Remove emacs_priority.
2010-11-20 21:39:01 -08:00
Dan Nicolaescu
b798205966 Remove INLINE uses in header files.
* src/intervals.h (temp_set_point, temp_set_point_both):
* src/buffer.h (offset_intervals, copy_intervals): Remove INLINE.
2010-11-20 21:20:50 -08:00
Dan Nicolaescu
33726611e7 * configure.in (INLINE): Do not depend on OPTIMIZE, unused. 2010-11-20 21:17:19 -08:00
Ken Brown
01664ed1f0 * src/sheap.c (STATIC_HEAP_SIZE): Increase to 13MB. 2010-11-20 10:23:49 -05:00
Eli Zaretskii
7c2d713b9b Use \uNNNN, \UNNNNNN, or \xNNNNNN for hex-code display on a TTY.
term.c (produce_glyphless_glyph): Use \uNNNN, \UNNNNNN, or
 \xNNNNNN for hex-code display of glyphless characters.
2010-11-20 17:04:50 +02:00
Jan Djärv
d2bd51898e Add keyword :vert-only for tool bar items with labels not shown horizontally.
* lisp/info.el (info-tool-bar-map): Add some :vert-only keywords.

* lisp/tool-bar.el (tool-bar-setup): Add some :vert-only keywords.

* src/dispextern.h (tool_bar_item_idx): Add TOOL_BAR_ITEM_VERT_ONLY.

* src/gtkutil.c (xg_make_tool_item): Take vert_only as argument.
Set important to ! vert_only.
(xg_show_toolbar_item): Don't show label horizontally if
tool item isn't important.
(update_frame_tool_bar): Get TOOL_BAR_ITEM_VERT_ONLY and pass it to
xg_make_tool_item, or update important on existing tool item.

* src/keyboard.c (QCvert_only): New variable.
(parse_tool_bar_item): Check for QCvert_only.
(syms_of_keyboard): Initialize QCvert_only.
2010-11-20 15:51:25 +01:00
Eli Zaretskii
6ce950f336 msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the same in-line. 2010-11-20 13:45:14 +02:00
Eli Zaretskii
d9a95e6767 msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the same in-line. 2010-11-20 13:24:28 +02:00
Andreas Schwab
b65575536f * src/xfaces.c (lookup_face): Make static.
* src/dispnew.c (copy_row_except_pointers): Likewise.
* src/syntax.c (dec_bytepos): Likewise.
(inc_bytepos): Remove.
* src/dispextern.h (lookup_face): Remove declaration.
2010-11-20 11:07:00 +01:00
Eli Zaretskii
f48fe1f074 Fix bug #6687 with cursor positioning after before-string from overlays.
xdisp.c (set_cursor_from_row): Display cursor after all the
 glyphs that come from an overlay.  Don't overstep the last glyph
 when skipping glyphs from an overlay.
2010-11-19 18:34:22 +02:00
Dan Nicolaescu
84dfc8a7fa * src/alloc.c (refill_memory_reserve): Move declaration ...
* src/lisp.h (refill_memory_reserve): ... here.
2010-11-18 13:45:03 -08:00
Dan Nicolaescu
94fa383385 * src/strftime.c (_strftime_copytm): Add declaration. 2010-11-18 13:39:15 -08:00
Dan Nicolaescu
dde990a0f9 * src/callproc.c (syms_of_callproc): Use intern_c_string. 2010-11-18 08:59:12 -08:00
Dan Nicolaescu
50c7742814 Move declarations from .c files to .h files.
* src/process.c (timers_run):
* src/minibuf.c (quit_char):
* src/lread.c (read_emacs_mule_char):
* src/keyboard.c (minibuf_level, message_enable_multibyte)
(pending_malloc_warning):
* src/insdel.c (Vselect_active_regions, Vsaved_region_selection)
(Qonly): Remove declarations.
* src/lisp.h (pending_malloc_warning, Vsaved_region_selection)
(Vselect_active_regions):
* src/keyboard.h (timers_run):  Add declarations.
2010-11-18 08:57:00 -08:00
Dan Nicolaescu
654ef137a3 Convert definitions to standard C.
* src/strftime.c (my_strftime_gmtime_r, my_strftime_localtime_r)
(tm_diff): Convert definitions to standard C.
(extra_args_spec_iso): Remove, unused.
2010-11-18 08:49:30 -08:00
Stefan Monnier
4a47c27573 Merge from emacs-23 2010-11-17 22:54:14 -05:00
Eli Zaretskii
146d267b8b Fix bug #7417 with cursor positioning on empty lines.
xdisp.c (set_cursor_from_row): Fix cursor positioning in empty
 lines on text-mode terminals.
2010-11-17 21:15:24 +02:00
Stefan Monnier
fad0d56519 * src/xterm.c (get_current_wm_state): Rename from get_current_vm_state.
(do_ewmh_fullscreen, x_handle_net_wm_state): Update callers.
2010-11-17 10:12:02 -05:00
Stefan Monnier
25f38310f9 Remove "tiny change"s for Eric Hanchrow 2010-11-17 10:07:48 -05:00
Kenichi Handa
6b4bb7039f coding.c (Fset_terminal_coding_system_internal): Fix previous change (set charset-ID list instead of charset-symbol list). 2010-11-17 14:51:09 +09:00
Chong Yidong
9173a8fbd7 Cleanup of window coordinate positioning code.
Now, text area click input events measure Y from the top of the text
area, excluding the header line if any.

* src/dispnew.c (buffer_posn_from_coords): Assume that X counts from
the start of the text area.

* src/keyboard.c (make_lispy_position): For text area clicks, record Y
pixel position relative to the text area, excluding header line.
Also change X and Y to Lisp_Objects, not pointers; don't return
coordinate values via pointers.  Pass ON_TEXT_AREA coordinate to
buffer_posn_from_coords counting from the start of the text area.
(Fposn_at_x_y, make_lispy_event): Callers changed.

* src/w32term.c (w32_read_socket):
* src/msdos.c (dos_rawgetc):
* src/xterm.c (handle_one_xevent): Likewise.

* src/window.c (coordinates_in_window): Change X and Y to ints rather
than pointers; don't return coordinates via pointers.
(struct check_window_data): Change X and Y from pointers to ints.
(window_from_coordinates): Remove args WX and WY; don't return
coordinates via pointers.
(Fcoordinates_in_window_p, window_from_coordinates):
(check_window_containing, Fwindow_at): Callers changed.
(window_relative_x_coord): New function.

* src/window.h (window_from_coordinates, window_relative_x_coord):
Update prototypes.

* src/xdisp.c (remember_mouse_glyph): Change window_from_coordinates
call.  Use window_relative_x_coord.
(note_mouse_highlight): Change window_from_coordinates call.
2010-11-16 21:37:45 -05:00
Chong Yidong
1985927ce8 Revert changes in 2010-11-16T19:59:24Z!cyd@stupidchicken.com 2010-11-16 16:47:43 -05:00
Chong Yidong
7aff9c22e3 * src/keyboard.c (make_lispy_position): Fix pixel calculation error in last commit. 2010-11-16 16:38:37 -05:00
Chong Yidong
77cd1a622a Cleanup of window coordinate positioning code.
Now, text area click input events measure Y from the top of the text
area, excluding the header line if any.

* src/dispnew.c (buffer_posn_from_coords): Assume that X counts from
the start of the text area.

* src/keyboard.c (make_lispy_position): For text area clicks, record Y
pixel position relative to the text area, excluding header line.
Also change X and Y to Lisp_Objects, not pointers; don't return
coordinate values via pointers.  Pass ON_TEXT_AREA coordinate to
buffer_posn_from_coords counting from the start of the text area.
(Fposn_at_x_y, make_lispy_event): Callers changed.

* src/w32term.c (w32_read_socket):
* src/msdos.c (dos_rawgetc):
* src/xterm.c (handle_one_xevent): Likewise.

* src/window.c (coordinates_in_window): Change X and Y to ints rather
than pointers; don't return coordinates via pointers.
(struct check_window_data): Change X and Y from pointers to ints.
(window_from_coordinates): Remove args WX and WY; don't return
coordinates via pointers.
(Fcoordinates_in_window_p, window_from_coordinates):
(check_window_containing, Fwindow_at): Callers changed.
(window_relative_x_coord): New function.

* src/window.h (window_from_coordinates, window_relative_x_coord):
Update prototypes.

* src/xdisp.c (remember_mouse_glyph): Change window_from_coordinates
call.  Use window_relative_x_coord.
(note_mouse_highlight): Change window_from_coordinates call.
2010-11-16 14:59:24 -05:00
Dan Nicolaescu
d2762c8641 Convert definitions to standard C.
* src/strftime.c (LOCALE_PARAM_DECL): Update for standard C.
(LOCALE_PARAM, LOCALE_PARAM_PROTO): Remove, unused.
(memcpy_lowcase, so_week_days, extra_args_spec, emacs_strftimeu):
Convert definitions to standard C.
* src/regex.c: Do not include <stdlib.h>, config.h does it.
Include unistd.h.
(xrealloc, init_syntax_once, re_match, regcomp, regexec)
(regerror, regfree): Convert definitions to standard C.
* src/mktime.c (my_mktime_localtime_r, ydhms_tm_diff, ranged_convert)
(__mktime_internal): Convert definitions to standard C.
2010-11-15 22:44:51 -08:00
Dan Nicolaescu
ae76d9e11e * src/callproc.c (child_setup): Fix previous change. 2010-11-15 10:11:52 -08:00
Dan Nicolaescu
42a7e7f1c4 Remove config.h include guards.
* src/w32proc.c:
* src/w32inevt.c:
* src/w32heap.c:
* src/w32.c: Remove config.h include guards.
2010-11-15 09:21:18 -08:00
Dan Nicolaescu
678029433d * src/callproc.c (child_setup): Reorder code to simplify #ifdefs.
No code changes.
2010-11-15 09:11:08 -08:00
Dan Nicolaescu
aa42211e74 * configure.in: Do not check for unconditionally included headers. 2010-11-14 22:39:02 -08:00
Dan Nicolaescu
f0e1af4627 * src/process.c: Include <sys/ioctl.h> unconditionally,
keyboard.c already does it.
2010-11-14 22:27:41 -08:00
Dan Nicolaescu
c2f0866a23 * src/keyboard.c (pending_malloc_warning): Add const to match
definition in alloc.c.
(Fset_input_interrupt_mode): Simplify #ifdefs.
2010-11-14 22:18:50 -08:00
Dan Nicolaescu
12e610e89e Clean up src/systty.h macros.
* systty.h (EMACS_GET_TTY_PGRP, EMACS_SET_TTY_PGRP, EMACS_GET_TTY)
(EMACS_SET_TTY): Remove unneeded abstraction, instead inline the
definition in all uses.
(EMACS_TTY_TABS_OK): Remove, it has a single user.
* src/sysdep.c (discard_tty_input, child_setup_tty)
(init_sys_modes, tabs_safe_p, reset_sys_modes):
* src/emacs.c (shut_down_emacs):
* src/callproc.c (child_setup):
* src/term.c (dissociate_if_controlling_tty): Inline removed macros.
2010-11-14 22:10:35 -08:00
Dan Nicolaescu
92d3ab7e32 * src/data.c (sign_extend_temp, sign_extend_lisp_int): Remove, unused. 2010-11-14 21:52:58 -08:00
Chong Yidong
a3e6bad42c Repeat 2010-11-14 change to xfns.c for w32 and ns.
* w32fns.c (Fx_create_frame):
* nsfns.m (Fx_create_frame): Don't check for the cursorColor
resource here; it's now done at startup.
2010-11-14 14:58:24 -05:00
Jan D
37de8fd0e4 Fix link error on Fedora 14: newer GConf don't use g_type_*.
Forgot to save ChangeLog for previous change.
2010-11-14 12:47:31 +01:00
Jan D
1e60039597 Fix link error on Fedora 14: newer GConf don't use g_type_*.
* configure.in (HAVE_GCONF): Check for g_type_init if GConf is found.

* src/config.in (HAVE_G_TYPE_INIT): New symbol.

* src/xsettings.c (init_gconf): Check HAVE_G_TYPE_INIT.
2010-11-14 12:46:00 +01:00
Jan D
5a232ffb73 Fix last cons in set_wm_state, remove unused variables.
* src/xselect.c (x_send_client_event): Remove unused variables cons and
size.

* src/xterm.c (set_wm_state): Add Qnil to final cons.
2010-11-14 11:21:16 +01:00
YAMAMOTO Mitsuharu
24021b384e Add const to array elements.
* keyboard.c (modify_event_symbol) : Add const to array elements of arg NAME_TABLE.
(lispy_accent_keys, lispy_function_keys, lispy_multimedia_keys)
(lispy_kana_keys, iso_lispy_function_keys, lispy_wheel_names)
(lispy_wheel_names, lispy_drag_n_drop_names, modifier_names):
Add const to array elements.
(scroll_bar_parts): Make static.  Fix position of const.

* w32fns.c (lispy_function_keys): Add const to extern.

* w32inevt.c (lispy_function_keys): Likewise.
2010-11-14 15:55:27 +09:00
Chong Yidong
afa42fe3f1 Let the cursorColor X resource set the the cursor face (Bug#7392).
* lisp/startup.el (command-line): If the cursorColor resource is set,
change the cursor face-spec (Bug#7392).

* src/xfns.c (Fx_create_frame): Don't check for the cursorColor
resource here; it's now done at startup.
2010-11-13 21:09:11 -05:00
Dan Nicolaescu
c865c57571 * src/xmenu.c: Make it clear that ../lwlib/lwlib.h is only needed for Motif. 2010-11-13 14:20:01 -08:00
Dan Nicolaescu
ff2e8052fd Fix compilation on Solaris.
* src/sysdep.c: Do not #include <term.h>.
(tputs): Add declaration, similar to what cm.c does.  (Bug#7178)
2010-11-13 14:17:22 -08:00
Dan Nicolaescu
53260a945a * src/s/ms-w32.h (HAVE_TERMIOS_H): Do not undef, not used anymore. 2010-11-13 14:10:34 -08:00
Jan D
933e29ff5e Fix Atoms and Lisp_Object mixup and related bugs.
* src/xselect.c (x_send_client_event): Move CHECK_STRING ...
(Fx_send_client_event): to here.

* src/xterm.c (set_wm_state): Don't put Atom in cons, call
make_fixnum_or_float on them first.
(x_term_init): Initialize Xatom_net_supporting_wm_check and
Xatom_net_supported correctly.
2010-11-13 19:59:28 +01:00
Martin Rudalics
a048073e24 * src/window.c (Fwindow_use_time): New function. 2010-11-13 13:49:22 -05:00
Dan Nicolaescu
4d613e98a7 Backport fix for Bug#6170 from trunk.
Fix alloca definition when using gcc on non-gnu systems.
* configure.in: Use the code sequence indicated by "info autoconf"
for alloca (bug#6170).
2010-11-13 12:22:52 -05:00
Eli Zaretskii
0eb025fb55 Fix and document display of glyphless characters.
src/xdisp.c (set_cursor_from_row): Fix cursor positioning on
 zero-width characters.
 (syms_of_xdisp) <glyphless-char-display>: Doc fix.
 src/.gdbinit (pgx): Adapt to latest changes in `struct glyph'.
 src/w32term.c (x_draw_glyphless_glyph_string_foreground): Draw the
 box before drawing the glyphs inside it.
 src/dispextern.h (enum glyphless_display_method): Rename
 GLYPHLESS_DISPLAY_HEXA_CODE to GLYPHLESS_DISPLAY_HEX_CODE.  All
 users changed.
 src/term.c (append_glyphless_glyph, produce_glyphless_glyph): Fix
 comments.
 (produce_glyphless_glyph): Enclose "U+nnnn" and "empty box"
 whitespace in "[]", to simulate a box.  Don't use uninitialized
 variable `width'.
 lisp/international/characters.el (glyphless-char-display-control):
 Renamed from glyphless-char-control; all users changed.  Doc fix.
 Signal an error if display method is not one of the recognized
 symbols.
 doc/emacs/rmail.texi (Rmail Coding): Characters with no fonts are not
 necessarily displayed as empty boxes.
 doc/emacs/mule.texi (Language Environments, Fontsets): Characters with no
 fonts are not necessarily displayed as empty boxes.
 doc/emacs/display.texi (Text Display): Document display of glyphless
 characters.
 doc/lispref/display.texi (Usual Display): Characters with no fonts are not
 necessarily displayed as empty boxes.
 etc/NEWS: Document display of glyphless characters.
2010-11-13 15:29:31 +02:00
Eli Zaretskii
c7926fe29b Fix bug #7346: document load-file-name.
src/lread.c (Fload): Mention `load-in-progress' and `load-file-name'.
 doc/lispref/loading.texi (How Programs Do Loading): Document `load-file-name'.
2010-11-12 18:35:35 +02:00