1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-27 01:01:52 -07:00
Commit graph

29950 commits

Author SHA1 Message Date
Chong Yidong
949752705e Implement tool-bar separators for non-GTK tool-bars.
* lisp/tool-bar.el (tool-bar--image-expression): New function.
(tool-bar-local-item, tool-bar--image-exp): Use it.
(tool-bar-setup): Initialize tool-bar-separator-image-expression.
Use :enable instead of :visible to avoid changing the tool-bar
configuration unnecessarily.

* src/keyboard.c (Vtool_bar_separator_image_expression): New variable.
(parse_tool_bar_item): Use it to obtain image separators for
displays not using native tool-bar separators.

* src/xdisp.c (build_desired_tool_bar_string): Don't handle separators
specially, since this is now done in parse_tool_bar_item.

* lisp/info.el (info-tool-bar-map): Add separators.
2010-12-20 08:17:26 +08:00
Stefan Monnier
ef1b0ba7e5 Minor clean up to silence some gcc warnings.
* src/window.c (Fset_window_buffer):
* src/xterm.c (x_set_frame_alpha): Restructure code to silence
compiler warning.
(handle_one_xevent): Remove unused var `p'.
(do_ewmh_fullscreen): Remove unused var `lval'.
(xembed_set_info): Remove unused var `atom'.
* src/textprop.c (Fremove_list_of_text_properties): Add braces to silence
compiler warning.
* src/fontset.c (fontset_id_valid_p, dump_fontset):
* src/ftfont.c (ftfont_drive_otf): Modernize k&r declaration.
* src/eval.c (Feval, Ffuncall): Avoid unneeded gotos.
* src/dispnew.c (update_frame, update_frame_1): Compile the `do_pause'
label only when it's used.
* src/image.c (x_create_bitmap_from_xpm_data):
* src/dispextern.h (x_create_bitmap_from_xpm_data): Use const char** like
its callers.
* src/coding.c (detect_coding_utf_16): Remove unused vars `src_base' and
`consumed_chars'.
(DECODE_EMACS_MULE_21_COMPOSITION): Remove unused var `charbuf_base'.
(decode_coding_emacs_mule): Remove unused label `retry'.
(detect_eol): Add parens to silence compiler warning.
* src/alloc.c (bytes_used_when_reconsidered): Move to the #ifdef where
it's used to silence the compiler.
(make_number): Modernize k&r declaration.
(mark_char_table): Add parens to silence compiler warning.
2010-12-19 00:43:42 -05:00
Chong Yidong
4039c78625 Support for menu separators in the GTK tool-bar.
* src/gtkutil.c (XG_BIN_CHILD): New macro.
(xg_get_menu_item_label, xg_update_menubar)
(xg_update_menu_item, xg_tool_bar_menu_proxy)
(xg_show_toolbar_item, update_frame_tool_bar): Use it.
(separator_names, xg_separator_p): Move to keyboard.c.
(create_menus, xg_update_submenu, update_frame_tool_bar): Use
menu_separator_name_p.

* src/keyboard.c (parse_tool_bar_item): Allow menu separators in
tool-bar maps.
(menu_separator_name_p): New function, from gtkutil.c.
(separator_names): Move from gtkutil.c.

* src/keyboard.h (menu_separator_name_p): Add prototype.

* src/nsmenu.m (name_is_separator): Function deleted.
(addItemWithWidgetValue): Use menu_separator_name_p.

* src/w32menu.c (name_is_separator): Function deleted.
(add_menu_item): Use menu_separator_name_p.
2010-12-17 12:04:06 +08:00
Jan Djärv
aa936e8e0a Handle invisible cursor (bg same as cursor color) for Nextstep.
* nsterm.m (ns_draw_window_cursor): If the cursor color is the
same as the background, use the face forground as cursor.
2010-12-16 20:37:13 +01:00
Stefan Monnier
f49d1f52b2 Merge from emacs-23 2010-12-13 10:27:36 -05:00
Eli Zaretskii
1557947189 Document that expand-file-name collapses multiple slashes. (Bug#7617)
fileio.c (Fexpand_file_name): Doc fix.
2010-12-12 22:37:54 +02:00
Eli Zaretskii
39321b94bf Fix bug #7398 with truncated glyphs in w32 tooltips.
w32fns.c (Fx_show_tip): Call try_window with last argument
 TRY_WINDOW_IGNORE_FONTS_CHANGE.  Delete the TODO ifdef: problem
 solved.  Round up the tip height to an integral multiple of the
 frame's line height.  Add FRAME_COLUMN_WIDTH to the tip width.
2010-12-11 17:41:04 +02:00
Eli Zaretskii
76feb8641e Fix bug #7398 with truncated glyphs in tooltip display on w32.
w32fns.c (Fx_show_tip): Call try_window with last argument
 TRY_WINDOW_IGNORE_FONTS_CHANGE.  Delete the TODO ifdef: problem
 solved.  Round up the tip height to an integral multiple of the
 frame's line height.  Add FRAME_COLUMN_WIDTH to the tip width.
2010-12-11 17:20:11 +02:00
Eli Zaretskii
f055902693 Code cleanup in xdisp.c regarding string_char_and_length.
xdisp.c (string_pos_nchars_ahead, c_string_pos)
 (face_before_or_after_it_pos, next_element_from_string)
 (next_element_from_c_string, produce_stretch_glyph): Remove unused
 calculations of maximum string length before calling
 string_char_and_length and STRING_CHAR_AND_LENGTH.
 (string_char_and_length): Update commentary: MAXLEN is no longer
 needed.
2010-12-11 14:27:13 +02:00
Glenn Morris
d1ddd1d02e ChangeLog fix. 2010-12-10 18:41:47 -08:00
Jan Djärv
0b9fc69a76 Move call to Fkill_emacs from signal handler (session event) (Bug#7552).
* keyboard.c (kbd_buffer_get_event): Construct SAVE_SESSION_EVENT
as (Qsave_session arg).

* xsmfns.c (smc_interact_CB): Set arg to Qnil.
(smc_die_CB): Make an event with arg Qt.
(Fhandle_save_session): If event has Qt as argument,
call Fkill_emacs.
2010-12-10 19:23:43 +01:00
Glenn Morris
ec1b9b17fa Make verify-visited-file-modtime default to the current buffer.
* src/fileio.c (Fverify_visited_file_modtime): Default to current buffer.
* doc/lispref/buffers.texi (Modification Time):
verify-visited-file-modtime now defaults to the current buffer.
2010-12-07 19:45:45 -08:00
Jan Djärv
2b815743b2 * xsmfns.c (smc_die_CB): Call Fkill_emacs.
Fixes: debbugs:7552
2010-12-07 07:36:25 +01:00
Lars Magne Ingebrigtsen
3c2317e891 Return CDATA sections (like <style>foo</style>) as text nodes.
Also ignore blank HTML nodes.
2010-12-06 17:59:52 +01:00
Stefan Monnier
bba3e50834 * src/lread.c (read1): Allow newstyle unquote outside of backquote.
Disallow old-style backquotes inside new-style backquotes.
Don't count unquotes to figure out when we're "syntactically inside
but semantically outside of a backquote" any more.
Extend the restriction no-unescaped-commas-and-backquotes-in-symbols
to all contexts.
2010-12-06 11:37:26 -05:00
Chong Yidong
d8b2a96214 Fix crash with invisible text and overlays (Bug#7016).
* src/dispextern.h (struct it): New member overlay_strings_charpos.

* src/xdisp.c (next_overlay_string, load_overlay_strings): Record the
charpos where we computed n_overlay_strings.
(next_overlay_string): Load overlay strings at recorded position,
which may not be the same as the iterator's charpos (Bug#7016).
2010-12-06 01:54:52 -05:00
Jan Djärv
a56d164e67 Fix for 7412 (no cursor on image) backported from trunk.
* nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background
with cursor color and draw a rectangle around the image.
2010-12-05 11:33:48 +01:00
Chong Yidong
d23d86081b * src/process.c: Remove checks for HAVE_SYS_IOCTL_H (Bug#7484). 2010-12-04 20:23:22 -05:00
Chong Yidong
77f1ed6cb6 Avoid infloop when scrolling conservatively (Bug#7537).
* src/xdisp.c (try_scrolling): Avoid infloop if the first line is obscured
due to a vscroll (Bug#7537).
2010-12-04 19:32:32 -05:00
Andreas Schwab
d6a003a8b5 Remove empty machine description files
* configure.in: Remove reference to removed machine description
files and allow $machine and $machfile to be empty.  Substitute
M_FILE/S_FILE instead of machfile/opsysfile.

* msdos/sed1v2.inp (M_FILE, S_FILE): Add $(srcdir)/ prefix.

* Makefile.in (M_FILE): Substitute @M_FILE@ instead of @machfile@.
(S_FILE): Substitute @S_FILE@ instead of @opsysfile@.
* src/m/arm.h, src/m/sh3.h, src/m/xtensa.h: Remove files.
2010-12-04 20:50:39 +01:00
Andreas Schwab
201ef780e0 Remove EXPLICIT_SIGN_EXTEND.
* lisp.h (union Lisp_Object): Explicitly declare signedness of
bit-field.
(XINT): Remove variant for EXPLICIT_SIGN_EXTEND.
* m/alpha.h (EXPLICIT_SIGN_EXTEND): Don't define.
* m/amdx86-64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ia64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390x.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/iris4d.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/m68k.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/sparc.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/template.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/hp800.h: Remove file.
* m/mips.h: Remove file.
2010-12-03 17:08:05 -05:00
Chong Yidong
903653532f Revert to 2010-12-03T11:48:24Z!jan.h.d@swipnet.se. 2010-12-03 17:01:43 -05:00
Andreas Schwab
e5bd16703f Remove EXPLICIT_SIGN_EXTEND.
* lisp.h (union Lisp_Object): Explicitly declare signedness of
bit-field.
(XINT): Remove variant for EXPLICIT_SIGN_EXTEND.
* m/alpha.h (EXPLICIT_SIGN_EXTEND): Don't define.
* m/amdx86-64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ia64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390x.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/iris4d.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/m68k.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/sparc.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/template.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/hp800.h: Remove file.
* m/mips.h: Remove file.

* CPP-DEFINES (EXPLICIT_SIGN_EXTEND): Remove.
2010-12-03 21:55:23 +01:00
Jan Djärv
146490c35d Draw cursor and images correctly for Nextstep (bug#7412).
* src/nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background
with cursor color and draw a rectangle around the image.
2010-12-03 11:54:44 +01:00
Andreas Schwab
babc8f0d4a * frame.c (x_set_font): Remove unused variable. 2010-12-03 11:07:40 +01:00
Jan Djärv
dd723bbd42 * nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image. 2010-12-02 10:33:57 +01:00
Jan Djärv
9583e9a03c Draw text under filled box cursor in inverted color (Bug#7479).
* src/nsterm.m (ns_draw_glyph_string): Switch fore- and background if
drawing text under filled box cursor.
2010-12-02 09:24:16 +01:00
Jan Djärv
2a91a0b5c0 Handle negative top/left in frame parameters (Bug#7510).
* src/nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGHT.

* src/nsterm.m (x_set_window_size, windowWillResize, initFrameFromEmacs):
Use FRAME_TOOLBAR_HEIGHT.
(x_set_offset): Handle XNegative and YNegative in
f->size_hint_flags.
2010-12-02 08:12:54 +01:00
Chong Yidong
088c8c092b Fix error in last merge.
src/gtkutil.c (menubar_map_cb): Use xg_height_or_width_changed.
2010-11-30 12:01:18 -05:00
Chong Yidong
07976ae3b8 Merge changes from emacs-23 branch 2010-11-27 15:04:57 -05:00
Eli Zaretskii
228482b229 Force left-to-right paragraph direction in echo area and prog-mode buffers.
src/xdisp.c (set_message_1): Force paragraph direction in echo area
 be left-to-right.
 lisp/simple.el (prog-mode): Set bidi-paragraph-direction to left-to-right.
2010-11-26 21:10:26 +02:00
Eli Zaretskii
8547874a7c Fix and document components of mouse event position.
src/keyboard.c (make_lispy_position): Put a meaningful value in yret
 when the click is on the header or mode line.
 doc/lispref/commands.texi (Click Events): Document the values of X, Y and
 COL, ROW in the event's position, when the click is on the header or
 mode line, on the fringes, or in the margins.
2010-11-26 20:15:09 +02:00
Eli Zaretskii
123652403c Fixing bug #7474 also fixes #7481. 2010-11-25 22:28:14 +02:00
Eli Zaretskii
1e2dddbe93 Fix bug #7474 with cursor positioning in overlay strings.
xdisp.c (set_cursor_from_row): Don't forget to consider the
 `cursor' property of the first character in overlay strings.
2010-11-25 20:38:09 +02:00
Kenichi Handa
e957f9ae90 merge emacs-23 2010-11-25 12:56:41 +09:00
Kenichi Handa
b84ae58433 Fix decoding of emacs-mule coding system. 2010-11-25 12:55:14 +09:00
Jan Djärv
c80c6166fb nsterm.m (keyDown): Compare Left key masks exactly (Bug#7458). 2010-11-24 15:52:14 +01:00
Jan Djärv
50795d1ff3 Bug 7458: Make key press like Left + right ctrl work when right is not control.
Ditto Alt and Command.

* src/nsterm.m (NSLeftControlKeyMask, NSLeftCommandKeyMask)
(NSLeftAlternateKeyMask): New defines.
(keyDown): Parse left and right keys separatly.
2010-11-24 08:50:08 +01:00
Eli Zaretskii
f8ab8c1f81 Avoid GCC warning with inline functions.
intervals.c (temp_set_point_both): Define before calling, to
 avoid GCC warnings.
2010-11-23 22:27:22 +02:00
Dan Nicolaescu
b29116efce * src/nsmenu.m: Use #include <config.h> instead of "config.h". 2010-11-23 11:36:48 -08:00
Dan Nicolaescu
b932f8b17e Move extern declarations from term.c to lisp.h.
* src/term.c (Qglyphless_char,last_glyphless_glyph_frame)
(last_glyphless_glyph_face_id. last_glyphless_glyph_merged_face_id):
Move declarations ...
* src/lisp.h (Qglyphless_char,last_glyphless_glyph_frame)
(last_glyphless_glyph_face_id. last_glyphless_glyph_merged_face_id):
... here.
2010-11-23 10:56:28 -08:00
Dan Nicolaescu
42c8bc9b87 Mark debugger related variables and functions as EXTERNALLY_VISIBLE
so that they do not get optimized away.

* configure.in (EXTERNALLY_VISIBLE): New definition.

* src/emacs.c (gdb_use_union, gdb_valbits,gdb_gctypebits)
(gdb_data_seg_bits, gdb_array_mark_flag, PVEC_FLAG)
(gdb_pvec_type):
* src/print.c (print_output_debug_flag):
* src/lisp.h (debug_print): Mark as EXTERNALLY_VISIBLE.
(safe_debug_print): New declaration.
2010-11-23 10:47:23 -08:00
Dan Nicolaescu
2e8a479790 Include <sys/ioctl.h> unconditionally.
* configure.in <AC_CHECK_HEADERS>: Remove sys/ioctl.h.
* src/xterm.c:
* src/systty.h:
* src/sound.c: Include <sys/ioctl.h> unconditionally.
2010-11-23 10:09:55 -08:00
Eli Zaretskii
a6d3e72e37 w32.c: Fix a typo in a comment. 2010-11-22 20:15:07 +02:00
Eli Zaretskii
b8e5cf1da0 Back-port 2010-09-17T21:34:45Z!eliz@gnu.org from the trunk, to resolve bug #7452.
w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
 of w32api >= 3.15.
2010-11-22 20:09:29 +02:00
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
YAMAMOTO Mitsuharu
96ad0af741 Fix image cache marking bug (Bug#6301).
* src/alloc.c (mark_terminals): Ensure that the image cache is marked
even if the terminal object was marked earlier (Bug#6301).
2010-11-21 19:39:42 -05:00
Chong Yidong
35f1de62f2 * editfns.c (Fbyte_to_string): Signal an error if arg is not a byte. 2010-11-21 13:16:19 -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