summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
*-. Merge from trunk.Paul Eggert2011-11-1880-709/+1243
|\ \
| | * Fix minor problems found by static checking.Paul Eggert2011-11-184-1/+12
| |/ | | | | | | | | * dispextern.h, xdisp.c (row_hash): Declare extern only if XASSERTS. * dispnew.c (verify_row_hash): Now static.
| * * src/keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.Dmitry Antipov2011-11-182-2/+6
| |
| * * src/intervals.c: Fix grafting over the whole buffer.Stefan Monnier2011-11-184-65/+53
| | | | | | | | | | | | (graft_intervals_into_buffer): Simplify. Fixes: debbugs:10071
| * Add assertion for hash values of rows.Eli Zaretskii2011-11-182-0/+2
| | | | | | | | | | src/dispnew.c (add_row_entry): Add xassert to verify that ROW's hash code is valid.
| * Fix another crash due to incorrect hash value of glyph rows, bug #10035.Eli Zaretskii2011-11-184-25/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | src/dispnew.c (swap_glyph_pointers): Swap the used[] arrays and the hash values of the two rows. (copy_row_except_pointers): Preserve the used[] arrays and the hash values of the two rows. src/xdisp.c (row_hash): New function, body extracted from compute_line_metrics. (compute_line_metrics): Call row_hash, instead of computing the hash code inline. src/dispnew.c (verify_row_hash): Call row_hash for computing the hash code of a row, instead of duplicating code from xdisp.c. src/dispextern.h (row_hash): Add prototype.
| * Work around GTK bug crashing emacs GTK builds.Tassilo Horn2011-11-182-0/+12
| | | | | | | | | | * frame.c (delete_frame): Don't delete the terminal when the last X frame is closed if emacs is built with GTK toolkit.
| * Spelling fixes.Paul Eggert2011-11-182-2/+2
| |
| * Spelling fixes.Paul Eggert2011-11-178-9/+9
| |
| * Fix typos.Juanma Barranquero2011-11-172-1/+5
| |
| * Rename window-splits to window-combination-resize.Martin Rudalics2011-11-172-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * window.c (Vwindow_splits): Rename to Vwindow_combination_resize. Suggested by Juri Linkov. (Fsplit_window_internal): Use Vwindow_combination_resize instead of Vwindow_splits. * window.el (window-resize, delete-window, split-window): Replace window-splits by window-combination-resize. * cus-start.el (window-splits): Replace by window-combination-resize. * windows.texi (Resizing Windows, Splitting Windows) (Deleting Windows): Use term window-combination-resize instead of window-splits.
| * Spelling fixes.Paul Eggert2011-11-1711-14/+14
| |
| * Fix typos.Juanma Barranquero2011-11-167-12/+11
| |
| * Fix typos.Juanma Barranquero2011-11-164-7/+11
| |
| * Rename window-nest to window-combination-limit.Martin Rudalics2011-11-163-44/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * window.h (window): Rename slot "nest" to "combination_limit". * window.c (Fwindow_nest): Rename to Fwindow_combination_limit. (Fset_window_nest): Rename to Fset_window_combination_limit. (Vwindow_nest): Rename to Vwindow_combination_limit. (recombine_windows, make_parent_window, make_window) (Fsplit_window_internal, saved_window) (Fset_window_configuration, save_window_save): Rename all occurrences of window_nest to window_combination_limit. * window.el (split-window, window-state-get-1) (window-state-put-1, window-state-put-2): Rename occurrences of window-nest to window-combination-limit. * cus-start.el (window-nest): Rename to window-combination-limit. * windows.texi (Resizing Windows, Splitting Windows): Rename occurrences of window-nest to window-combination-limit.
| * Fix typos.Juanma Barranquero2011-11-156-8/+12
| |
| * Spelling fixes.Paul Eggert2011-11-1417-21/+19
| |
| * Fix typos.Juanma Barranquero2011-11-153-10/+10
| |
| * Spelling fixes.Paul Eggert2011-11-1414-14/+14
| |
| * Fix typos.Juanma Barranquero2011-11-1413-19/+19
| |
| * Spelling fixes.Paul Eggert2011-11-1413-23/+19
| |
| * Fix bug #10035 with assertion violation in row_equal_p.Eli Zaretskii2011-11-142-4/+17
| | | | | | | | | | | | | | | | src/xdisp.c (display_line): Move the call to highlight_trailing_whitespace before the call to compute_line_metrics, since the latter needs to see the final faces of all the glyphs to compute ROW's hash value. Fixes assertion violations in row_equal_p.
| * Fix bug#10044Juanma Barranquero2011-11-142-2/+7
| | | | | | | | | | src/w32proc.c (reader_thread): Don't check pending input if cp->fd < 0, just return.
| * Spelling fixes.Paul Eggert2011-11-138-9/+9
| |
| * Spelling fixes.Paul Eggert2011-11-121-4/+4
| |
| * Allow building temacs with a larger heap on MS-Windows.Eli Zaretskii2011-11-122-1/+9
| | | | | | | | | | | | | | src/makefile.w32-in (HEAPSIZE): New variable, allows to build temacs with user-defined heap size. Bump the default size of the temacs heap to 27MB, to avoid memory warning when running temacs. ($(TEMACS)): Use HEAPSIZE instead of a hardcoded value.
| * Verify glyph row's hash values.Eli Zaretskii2011-11-122-0/+26
| | | | | | | | | | | | src/dispnew.c (verify_row_hash) [XASSERTS]: New function. (adjust_glyph_matrix, row_equal_p): Use it in xassert to verify that the hash value of glyph rows is correct.
| * dispnew.c (scrolling_window): Fix index usage.Eli Zaretskii2011-11-122-4/+9
| | | | | | | | | | src/dispnew.c (scrolling_window): Fix incorrect indices in accessing current_matrix and desired_matrix. (Bug#9990)
| * Don't handle splits status.Martin Rudalics2011-11-123-68/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * window.h (window): Remove splits slot. * window.c (Fwindow_splits, Fset_window_splits): Remove. (Fdelete_other_windows_internal, make_parent_window) (make_window, Fsplit_window_internal, Fdelete_window_internal) (Fset_window_configuration, save_window_save): Don't deal with split status of windows. (saved_window): Remove splits slot. (Vwindow_splits): Rewrite doc-string. * window.el (window-resize, delete-window): Use window-splits variable instead of function. (window-state-get-1, window-state-put-2, window-state-put): Don't deal with windows' splits status. * windows.texi (Splitting Windows, Deleting Windows): Remove references to splits status of windows.
| * Fix more typos.Juanma Barranquero2011-11-122-2/+2
| |
| * Fix typos.Juanma Barranquero2011-11-124-6/+6
| |
| * * xfns.c (unwind_create_frame):Jan Djärv2011-11-114-3/+10
| | | | | | | | | | | | | | | | * nsfns.m (unwind_create_frame): * w32fns.c (unwind_create_frame): Use Fmemq to check if frame is in Vframe_list. Fixes: debbugs:9999
| * Spelling fixes.Paul Eggert2011-11-112-3/+3
| |
| * * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.Dmitry Antipov2011-11-112-1/+4
| |
| * callproc.c (Fcall_process): Set the member dst_multibyte of process_coding.Kenichi Handa2011-11-112-0/+8
| |
| * merge trunkKenichi Handa2011-11-1113-133/+219
| |\
| | * Disallow calling window-inside-edges and related functions on internal windows.Chong Yidong2011-11-092-9/+14
| | | | | | | | | | | | | | | * src/window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges) (Fwindow_inside_absolute_pixel_edges): Only allow live windows.
| | * Spelling fixes.Paul Eggert2011-11-082-2/+2
| | |
| | * * s/gnu.h (GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS (Bug#9926).Paul Eggert2011-11-082-0/+6
| | |
| | * Avoid some portability problems by eschewing 'extern inline' functions.Paul Eggert2011-11-084-28/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The trivial performance wins aren't worth the portability hassles; see <http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00084.html> et seq. * dispextern.h (window_box, window_box_height, window_text_bottom_y) (window_box_width, window_box_left, window_box_left_offset) (window_box_right, window_box_right_offset): Undo previous change, by removing the "extern"s. * intervals.c (adjust_intervals_for_insertion) (adjust_intervals_for_deletion): Undo previous change, making these static again. (offset_intervals, temp_set_point_both, temp_set_point) (copy_intervals_to_string): No longer inline. * xdisp.c (window_text_bottom_y, window_box_width) (window_box_height, window_box_left_offset) (window_box_right_offset, window_box_left, window_box_right) (window_box): No longer inline.
| | * Move low-level window width/height functions to C, and high-level functions ↵Chong Yidong2011-11-082-48/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to Lisp. * lisp/window.el (window-total-height, window-total-width): Doc fix. (window-body-size): Move from C. (window-body-height, window-body-width): Move to C. * src/window.c (Fwindow_left_column, Fwindow_top_line): Doc fix. (Fwindow_body_height, Fwindow_body_width): Move from Lisp. Signal an error if not a live window. (Fwindow_total_width, Fwindow_total_height): Move from Lisp. (Fwindow_total_size, Fwindow_body_size): Move to Lisp.
| | * src/lisp.h (syms_of_abbrev): Remove declaration.Juanma Barranquero2011-11-072-4/+5
| | | | | | | | | | | | Reported by CHENG Gao <chenggao@royau.me>.
| | * Allow to run temacs.exe on MS-Windows in GUI mode.Eli Zaretskii2011-11-072-1/+10
| | | | | | | | | | | | | | | | | | src/w32.c (check_windows_init_file): Don't look for term/w32-win.el if Vpurify_flag is non-nil. Fixes a crash when running w32 build of temacs in GUI mode.
| | * Remove term "subwindow" from code and documentation.Martin Rudalics2011-11-074-40/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * window.h: Declare delete_all_child_windows instead of delete_all_subwindows. * window.c (Fwindow_nest, Fset_window_nest) (Fset_window_new_total, Fset_window_new_normal) (Fwindow_resize_apply): Don't use term subwindow in doc-strings. (delete_all_subwindows): Rename to delete_all_child_windows. (Fdelete_other_windows_internal, Fset_window_configuration): Call delete_all_child_windows instead of delete_all_subwindows. * frame.c (delete_frame): Call delete_all_child_windows instead of delete_all_subwindows. * window.el (window-combinations): Make WINDOW argument mandatory. Rewrite doc-string. (walk-window-subtree, window-atom-check, window-min-delta) (window-max-delta, window--resize-this-window) (window--resize-root-window-vertically, window-tree) (balance-windows, window-state-put): Rewrite doc-strings as to not mention the term "subwindow". (window--resize-subwindows-skip-p): Rename to window--resize-child-windows-skip-p. (window--resize-subwindows-normal): Rename to window--resize-child-windows-normal. (window--resize-subwindows): Rename to window--resize-child-windows. (window-or-subwindow-p): Rename to window--in-subtree-p. * windows.texi (Resizing Windows, Splitting Windows) (Window Configurations): Use "child window" instead of "subwindow".
| | * * alloc.c (DEADP): New macro, for porting to GNU/Hurd (Bug#9926).Paul Eggert2011-11-062-1/+13
| | | | | | | | | | | | | | | | | | This is also needed for porting to any host where GC_MARK_STACK is not GC_MAKE_GCPROS_NOOPS. (which_symbols): Use it.
| * | xdisp.c (fill_composite_glyph_string): Always set s->face, to avoid a crash ↵Kenichi Handa2011-11-112-0/+11
| |/ | | | | | | (bug#9496).
| * merge trunkKenichi Handa2011-11-0719-274/+579
| |\
| | * Merge from emacs-23; up to 2010-06-22T07:41:10Z!rgm@gnu.orgGlenn Morris2011-11-062-4/+33
| | |\
| | | * Fix memory leak by y-or-n-p-with-timeout with GUI (Bug#9830).YAMAMOTO Mitsuharu2011-10-312-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | * xmenu.c (cleanup_widget_value_tree): New function. (xmenu_show, xdialog_show): Use it in record_unwind_protect instead of calling free_menubar_widget_value_tree directly (Bug#9830).
| | * | Fix some portability problems with 'inline'.Paul Eggert2011-11-063-20/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dispextern.h (window_box, window_box_height, window_text_bottom_y) (window_box_width, window_box_left, window_box_left_offset) (window_box_right, window_box_right_offset): Declare extern. Otherwise, these inline functions do not conform to C99 and are miscompiled by Microsoft compilers. Reported by Eli Zaretskii in <http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00084.html>. * intervals.c (adjust_intervals_for_insertion) (adjust_intervals_for_deletion): Now extern, because otherwise the extern inline functions 'offset_intervals' couldn't refer to it. (static_offset_intervals): Remove. (offset_intervals): Rewrite using the old contents of static_offset_intervals. The old version didn't conform to C99 because an extern inline function contained a reference to an identifier with static linkage.
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-18 16:18:49 +0000