aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix syntax error in previous commit.Michael Albinus2010-11-101-1/+1
|
* Add const to array elements of font filter properties.YAMAMOTO Mitsuharu2010-11-105-8/+20
| | | | | | | * font.c (font_filter_properties): Add const to array elements of properties args. * font.h (font_filter_properties): Likewise. * ftfont.c (ftfont_booleans, ftfont_non_booleans): Add const to array elements. * w32font.c (w32font_booleans, w32font_non_booleans): Likewise.
* * dbusbind.c (QCdbus_type_unix_fd): New Lisp object.Michael Albinus2010-11-102-0/+46
| | | | | | | (XD_BASIC_DBUS_TYPE, xd_symbol_to_dbus_type, xd_signature) (xd_append_arg, xd_retrieve_arg): Support DBUS_TYPE_UNIX_FD. (Fdbus_call_method): Add DBUS_TYPE_UNIX_FD type mapping to doc string. (syms_of_dbusbind): Initialize QCdbus_type_unix_fd).
* * src/emacs.c (syms_of_emacs) <system-type>: Doc fix.Glenn Morris2010-11-092-9/+12
|
* Merge from emacs-23Stefan Monnier2010-11-096-12/+70
|\
| * xfns.c (x_real_positions): Fix declaration-after-statement problem.Eli Zaretskii2010-11-092-2/+6
| |
| * Fix the fix for Bug#6426 (Bug#7210), avoiding frame garbaging loop.Chong Yidong2010-11-052-5/+12
| | | | | | | | | | | | * image.c (free_image): Don't garbage the frame here, since this function can be called while redisplaying (Bug#7210). (uncache_image): Garbage the frame here (Bug#6426).
| * Backport fix for Bug#5723 from trunk.Chong Yidong2010-11-042-14/+51
| |\
| | * Backport 2010-03-27T00:45:[email protected] from trunkChong Yidong2010-11-042-13/+27
| | |
| | * Backport 2010-03-25T08:56:[email protected] from trunkYAMAMOTO Mitsuharu2010-11-042-14/+5
| | |
| | * Backport 2010-03-25T08:48:[email protected] from trunkHelmut Eller2010-11-042-5/+37
| |/
| * Backport 2010-05-27T04:24:30Z!handa@etlken from trunkKenichi Handa2010-11-042-2/+42
| |
| * Backport fix for Bug#2423 from trunk.YAMAMOTO Mitsuharu2010-11-044-7/+26
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dispextern.h (TRY_WINDOW_CHECK_MARGINS) (TRY_WINDOW_IGNORE_FONTS_CHANGE): New defines. * xdisp.c (try_window): Change arg from CHECK_MARGINS to FLAGS. Don't abort with fonts change if TRY_WINDOW_IGNORE_FONTS_CHANGE is set in FLAGS. Callers with non-zero CHECK_MARGINS changed to use TRY_WINDOW_CHECK_MARGINS. * xfns.c (Fx_show_tip): Undo last change. Call try_window with TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423).
| | * Backport 2010-04-10T10:52:[email protected] from trunkChong Yidong2010-11-044-8/+23
| | |
| | * Backport 2010-04-10T10:39:[email protected] from trunkChong Yidong2010-11-042-8/+8
| | |
| | * Backport from trunk.Chong Yidong2010-11-042-4/+13
| |/
| * * xfns.c (x_real_positions): Only use _NET_FRAME_EXTENTS if ourJan Djärv2010-11-042-42/+33
| | | | | | | | parent is the root window. Check this after traversing window tree.
| * Remove debug code.Jan Djärv2010-11-041-1/+1
| |
| * Get window position by reading _NET_FRAME_EXTENTS (Bug#5721).Jan Djärv2010-11-044-5/+63
| | | | | | | | | | | | | | | | | | * src/xfns.c (x_real_positions): Try to get _NET_FRAME_EXTENTS first before traversing window tree (Bug#5721). * src/xterm.c (x_term_init): Initialize Xatom_net_frame_extents. * src/xterm.h (struct x_display_info): Xatom_net_frame_extents is new.
| * Fix for Bug#5655, backported from trunk.Glenn Morris2010-11-034-21/+17
| | | | | | | | | | | | | | | | | | | | * 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)
| * Backport fix for Bug#6571 from trunk. NOTE: May cause merge conflicts.Jan Djärv2010-11-014-1/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/keyboard.c (input_available_signal): Declare. (kbd_buffer_nr_stored): New function. (kbd_buffer_store_event_hold): If kbd_buffer_nr_stored returns more than KBD_BUFFER_SIZE/2, stop reding input (Bug#6571). (kbd_buffer_get_event): If input is suspended and kbd_buffer_nr_stored returns less than KBD_BUFFER_SIZE/4, resume reding input (Bug#6571). (tty_read_avail_input): If input is on hold, return. Don't read more that free slots in kbd_buffer (Bug#6571). * src/process.c (kbd_is_on_hold): New variable. (hold_keyboard_input, unhold_keyboard_input, kbd_on_hold_p): New functions. (wait_reading_process_output): If kbd_on_hold_p returns non-zero, select on empty input mask. (init_process): Initialize kbd_is_on_hold to 0. * src/process.h (hold_keyboard_input, unhold_keyboard_input) (kbd_on_hold_p): Declare.
* | * src/xfns.c (set_machine_and_pid_properties): Let X set WM_CLIENT_MACHINE.Jan D2010-11-072-17/+5
| |
* | * src/xdisp.c (note_mode_line_or_margin_highlight): InitializeJan D2010-11-072-3/+6
| | | | | | | | Cursor to No_Cursor for HAVE_WINDOW_SYSTEM also.
* | xdisp.c: Add commentary about character compositions in bidirectional text.Eli Zaretskii2010-11-061-1/+31
| |
* | src/ChangeLog: Fix log entry for 2010-11-06T09:33:[email protected].Eli Zaretskii2010-11-061-0/+1
| |
* | Support R2L lines in tool-tip text.Eli Zaretskii2010-11-063-18/+140
| | | | | | | | | | | | | | xfns.c (Fx_show_tip): If any of the tool-tip text lines is R2L, adjust width of tool-tip frame to the width of text, excluding the stretch glyph at the beginning of R2L glyph rows. w32fns.c (Fx_show_tip): Likewise.
* | configure.in: Fix indentationAndreas Schwab2010-11-061-9/+9
| |
* | * src/nsfont.m: Include termchar for new mouse-highlight.Jan Djärv2010-11-062-2/+6
| |
* | Unify mouse-highlight code for all GUI and TTY sessions.Eli Zaretskii2010-11-0617-1519/+821
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | term.c: Remove static mouse_face_* variables. All users changed. (term_show_mouse_face, term_clear_mouse_face) (fast_find_position, term_mouse_highlight): Functions deleted. (tty_draw_row_with_mouse_face): New function. (term_mouse_movement): Call note_mouse_highlight instead of term_mouse_highlight. nsterm.m (ns_update_window_begin, ns_update_window_end) (ns_update_end, x_destroy_window, ns_frame_up_to_date) (ns_dumpglyphs_box_or_relief, ns_maybe_dumpglyphs_background) (ns_dumpglyphs_image, ns_dumpglyphs_stretch) (ns_initialize_display_info, keyDown, mouseMoved, mouseExited): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. xterm.c (x_update_window_begin, x_update_window_end) (x_update_end, XTframe_up_to_date, x_set_mouse_face_gc) (handle_one_xevent, x_free_frame_resources, x_term_init): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. w32term.c (x_update_window_begin, x_update_window_end) (x_update_end, w32_read_socket, x_free_frame_resources) (w32_initialize_display_info): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. xdisp.c (show_mouse_face, note_mode_line_or_margin_highlight) (note_mouse_highlight) [HAVE_WINDOW_SYSTEM]: Don't run GUI code unless the frame is on a window-system. (get_tool_bar_item, handle_tool_bar_click) (note_tool_bar_highlight, draw_glyphs, erase_phys_cursor) (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p) (note_mode_line_or_margin_highlight, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face, expose_frame): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. (coords_in_mouse_face_p): Move prototype out of the HAVE_WINDOW_SYSTEM conditional. (x_y_to_hpos_vpos, frame_to_window_pixel_xy): Move out of the HAVE_WINDOW_SYSTEM block. (try_window_id) [HAVE_GPM || MSDOS]: Call x_clear_window_mouse_face. (draw_row_with_mouse_face): Implementation for HAVE_WINDOW_SYSTEM systems. Call tty_draw_row_with_mouse_face for TTY systems. (show_mouse_face): Call draw_row_with_mouse_face, instead of calling draw_glyphs directly. (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p) (cursor_in_mouse_face_p, rows_from_pos_range) (mouse_face_from_buffer_pos, mouse_face_from_string_pos) (note_mode_line_or_margin_highlight, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face): Move out of the HAVE_WINDOW_SYSTEM block. Ifdef away window-system specific fragments. (note_mouse_highlight): Call popup_activated for MSDOS as well. Clear mouse highlight if pointer is over glyphs whose OBJECT is an integer. (mouse_face_from_buffer_pos): Add parentheses around && within ||. (x_consider_frame_title, tool_bar_lines_needed): Move prototypes to HAVE_WINDOW_SYSTEM-only part. (get_window_cursor_type): Move inside a HAVE_WINDOW_SYSTEM-only part. Remove "#ifdef HAVE_WINDOW_SYSTEM" from body of function. (null_glyph_slice): Move declaration into HAVE_WINDOW_SYSTEM-only part. dispnew.c (mirror_make_current): Set Y coordinate of the mode-line and header-line rows. (init_display): Setup initial frame's output_data for text terminal frames. xmenu.c (popup_activated): Don't define on MSDOS, which now has its own definition on msdos.c. msdos.c (show_mouse_face, clear_mouse_face) (fast_find_position, IT_note_mode_line_highlight) (IT_note_mouse_highlight): Functions deleted. (IT_frame_up_to_date, dos_rawgetc): Call note_mouse_highlight instead of IT_note_mouse_highlight. (draw_row_with_mouse_face, popup_activated): New functions. (dos_set_window_size, draw_row_with_mouse_face, IT_update_begin) (IT_update_end, IT_frame_up_to_date, internal_terminal_init) (dos_rawgetc): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. msdos.h (initialize_msdos_display): Add prototype. frame.h (MOUSE_HL_INFO): New macro. lisp.h (Mouse_HLInfo): New data type. xterm.h (struct x_display_info): w32term.h (struct w32_display_info): nsterm.h (struct ns_display_info): termchar.h (struct tty_display_info): Use it instead of mouse_face_* members. dispextern.h (show_mouse_face, clear_mouse_face): Update type of 1st argument. (frame_to_window_pixel_xy, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face, clear_mouse_face) (show_mouse_face, cursor_in_mouse_face_p): Move prototypes out of HAVE_WINDOW_SYSTEM conditional. (draw_row_with_mouse_face): Declare prototype. (tty_draw_row_with_mouse_face): Declare prototype.
| * | Cleanup -Wall warnings.Eli Zaretskii2010-11-052-12/+10
| | | | | | | | | | | | | | | | | | xdisp.c (get_window_cursor_type): Move inside a HAVE_WINDOW_SYSTEM-only part. Remove "#ifdef HAVE_WINDOW_SYSTEM" from body of function. (null_glyph_slice): Move declaration into HAVE_WINDOW_SYSTEM-only part.
| * | Fix unified mouse highlight after compiling on Unix.Eli Zaretskii2010-11-053-7/+19
| | | | | | | | | | | | | | | | | | | | | xdisp.c (x_consider_frame_title, tool_bar_lines_needed): Move prototypes to HAVE_WINDOW_SYSTEM-only part. frame.h (MOUSE_HL_INFO): Fix definition to work both for TTY-only and GUI builds.
| * | Fix mouse redesigned mouse highlight on MSDOS.Eli Zaretskii2010-11-054-1/+14
| | | | | | | | | | | | | | | | | | | | | dispnew.c (init_display): Setup initial frame's output_data for text terminal frames. frame.h (MOUSE_HL_INFO): Fix TTY definition. msdos.h (initialize_msdos_display): Add prototype.
| * | Cleanup fallout from redesigning mouse highlight.Eli Zaretskii2010-11-055-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dispextern.h (tty_draw_row_with_mouse_face): Add prototype. xdisp.c (draw_row_with_mouse_face): Don't #ifdef away on MSDOS. Call tty_draw_row_with_mouse_face on MSDOS as well. msdos.c (tty_draw_row_with_mouse_face): Renamed from draw_row_with_mouse_face. Make the argument list identical to the GPM implementation. msdos.h (Display_Info): Restore typedef.
| * | Reflect mouse-highlight redesign in term.cEli Zaretskii2010-11-022-422/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | term.c: Remove static mouse_face_* variables. All users changed. (term_show_mouse_face, term_clear_mouse_face) (fast_find_position, term_mouse_highlight): Functions deleted. (tty_draw_row_with_mouse_face): New function. (term_mouse_movement): Call note_mouse_highlight instead of term_mouse_highlight.
| * | REALLY finish coding portable mouse highlight.Eli Zaretskii2010-11-012-47/+55
| | | | | | | | | | | | | | | | | | | | | | | | msdos.c (dos_set_window_size, draw_row_with_mouse_face) (IT_update_begin, IT_update_end, IT_frame_up_to_date) (internal_terminal_init, dos_rawgetc): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes.
| * | Finish coding mouse highlight redesigned for portability.Eli Zaretskii2010-11-015-187/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not compiled yet. nsterm.m (ns_update_window_begin, ns_update_window_end) (ns_update_end, x_destroy_window, ns_frame_up_to_date) (ns_dumpglyphs_box_or_relief, ns_maybe_dumpglyphs_background) (ns_dumpglyphs_image, ns_dumpglyphs_stretch) (ns_initialize_display_info, keyDown, mouseMoved, mouseExited): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. xterm.c (x_update_window_begin, x_update_window_end) (x_update_end, XTframe_up_to_date, x_set_mouse_face_gc) (handle_one_xevent, x_free_frame_resources, x_term_init): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. w32term.c (x_update_window_begin, x_update_window_end) (x_update_end, w32_read_socket, x_free_frame_resources) (w32_initialize_display_info): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. xdisp.c (show_mouse_face, note_mode_line_or_margin_highlight) (note_mouse_highlight) [HAVE_WINDOW_SYSTEM]: Don't run GUI code unless the frame is on a window-system.
| * | Start redesigning portable mouse highlight. Not compiled.Eli Zaretskii2010-10-319-309/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xdisp.c (get_tool_bar_item, handle_tool_bar_click) (note_tool_bar_highlight, draw_glyphs, erase_phys_cursor) (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p) (note_mode_line_or_margin_highlight, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face, expose_frame): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. frame.h (MOUSE_HL_INFO): New macro. lisp.h (Mouse_HLInfo): New data type. xterm.h (struct x_display_info): w32term.h (struct w32_display_info): nsterm.h (struct ns_display_info): termchar.h (struct tty_display_info): Use it instead of mouse_face_* members. dispextern.h (DPYINFO_DEFINED): Remove definition. (FRAME_X_DISPLAY_INFO): Remove definition. (show_mouse_face, clear_mouse_face): Update type of 1st argument.
| * | Unify mouse highlight code of MSDOS and GUI sessions.Eli Zaretskii2010-10-308-581/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xdisp.c (coords_in_mouse_face_p): Move prototype out of the HAVE_WINDOW_SYSTEM conditional. (x_y_to_hpos_vpos, frame_to_window_pixel_xy): Move out of the HAVE_WINDOW_SYSTEM block. (try_window_id) [HAVE_GPM || MSDOS]: Call x_clear_window_mouse_face. (draw_row_with_mouse_face): Implementation for HAVE_WINDOW_SYSTEM systems. (show_mouse_face): Call it, instead of calling draw_glyphs directly. (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p) (cursor_in_mouse_face_p, rows_from_pos_range) (mouse_face_from_buffer_pos, mouse_face_from_string_pos) (note_mode_line_or_margin_highlight, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face): Move out of the HAVE_WINDOW_SYSTEM block. Ifdef away window-system specific fragments. (note_mouse_highlight): Call popup_activated for MSDOS as well. Clear mouse highlight if pointer is over glyphs whose OBJECT is an integer. (mouse_face_from_buffer_pos): Add parentheses around && within ||. xmenu.c (popup_activated): Don't define on MSDOS. dispnew.c (mirror_make_current): Set Y coordinate of the mode-line and header-line rows. termchar.h (struct tty_display_info): Define mouse_face_* members not only for MSDOS. Delete stray whitespace. <mouse_face_beg_x, mouse_face_beg_y, mouse_face_overlay>: New struct members. dispextern.h (DPYINFO_DEFINED) [HAVE_X_WINDOWS]: Define. (DPYINFO_DEFINED) [HAVE_NTGUI]: Define. (DPYINFO_DEFINED) [HAVE_NS]: Define. (Display_Info) [!DPYINFO_DEFINED]: Define here. (FRAME_X_DISPLAY_INFO) [HAVE_GPM]: Define. (FRAME_X_DISPLAY_INFO): Define to NULL if not defined. (frame_to_window_pixel_xy, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face, clear_mouse_face) (show_mouse_face, cursor_in_mouse_face_p): Move prototypes out of HAVE_WINDOW_SYSTEM conditional. (draw_row_with_mouse_face): Declare prototype. msdos.h (Display_Info): Don't define here. msdos.c (show_mouse_face, clear_mouse_face) (fast_find_position, IT_note_mode_line_highlight) (IT_note_mouse_highlight): Functions deleted. (IT_frame_up_to_date, dos_rawgetc): Call note_mouse_highlight instead of IT_note_mouse_highlight. (draw_row_with_mouse_face, popup_activated): New functions.
* | | term.c (append_glyphless_glyph, produce_glyphless_glyph): Remove unused ↵Eli Zaretskii2010-11-052-5/+5
| | | | | | | | | | | | variables.
* | | * nsterm.m (EmacsView-mouseExited:): Correct error in conditional logic ↵Adrian Robert2010-11-052-4/+15
| | | | | | | | | | | | pointed out by Eli Zaretskii.
* | | ChangeLog fix.Glenn Morris2010-11-041-2/+2
| | |
* | | Refer to set-coding-system-priority instead of the obsoleteLars Magne Ingebrigtsen2010-11-042-1/+6
| | | | | | | | | | | | set-coding-priority in the doc string.
* | | ChangeLog fix.Glenn Morris2010-11-041-1/+2
| | | | | | | | | | | | Ref: http://lists.gnu.org/archive/html/emacs-devel/2010-11/msg00133.html
* | | * nsfont.m (nsfont_draw) * nsimage.m (EmacsImage-setXBMColor:) * nsterm.m ↵Adrian Robert2010-11-044-5/+12
| | | | | | | | | | | | (EmacsView-performDragOperation:): Correct empty return statements. Based on a patch by Ismail Donmez <[email protected]>.
* | | Support for gif transparency.Julien Danjou2010-11-032-4/+37
| | | | | | | | | | | | | | | * image.c (gif_load): Add support for transparency and specified :background.
* | | Don't be so lax with spelling.Glenn Morris2010-11-021-8/+7
| | | | | | | | | | | | | | | | | | * lisp/net/dbus.el (dbus-name-owner-changed-handler): Doc fix. * doc/misc/ediff.texi (Quick Help Commands, Miscellaneous): Spelling fix.
* | | Mere anarchy is loosed upon the world.Glenn Morris2010-11-021-6/+5
| | | | | | | | | | | | * doc/misc/gnus.texi (Agent Variables): Spelling fix.
* | | Fix error in last merge from branch.Chong Yidong2010-11-012-18/+0
| | | | | | | | | | | | | | | Remove 2010-10-25 commit by Michael Albinus to dbusbind.c, which is not intended for trunk.
* | | Fix dates in ChangeLog entries.Juanma Barranquero2010-11-011-12/+10
| | |
* | | merge trunkKenichi Handa2010-11-0110-66/+136
|\ \ \