1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-01 13:21:11 -08:00
Commit graph

32246 commits

Author SHA1 Message Date
Juanma Barranquero
febe6beadc src/dispnew.c (adjust_glyph_matrix) [XASSERTS]: Add missing check. 2011-11-30 13:58:42 +01:00
Eli Zaretskii
801a431304 Fix bug #10164 with assertion violations in linum-mode.
src/dispnew.c (adjust_glyph_matrix) [XASSERTS]: Ensure ROW's
 attributes are tested _before_ calling verify_row_hash, to protect
 against GCC re-ordering of the tests.
2011-11-30 07:25:09 -05:00
Jan Djärv
2b56b87e02 * xterm.c (handle_one_xevent): Only set async_visible and friends
if net_wm_state_hidden_seen is non-zero
(get_current_wm_state):  Set net_wm_state_hidden_seen to 1 if
_NET_WM_STATE_HIDDEN is in NET_WM_STATE.

* xterm.h (struct x_output): net_wm_state_hidden_seen is new.

Fixes: debbugs:10002
2011-11-29 19:08:53 +01:00
Paul Eggert
dbf312256d Remove GCPRO-related macros that exist only to avoid shadowing locals.
* lisp.h (GCPRO1_VAR, GCPRO2_VAR, GCPRO3_VAR, GCPRO4_VAR, GCPRO5_VAR)
(GCPRO6_VAR, UNGCPRO_VAR): Remove.  See
<http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
All uses changed to use GCPRO1 etc.
(GCPRO1, GCPRO2, GCPRO3, GCPRO4, GCPRO5, GCPRO6, UNGCPRO):
Revert to old implementation (i.e., before 2011-03-11).
2011-11-28 00:20:58 -08:00
YAMAMOTO Mitsuharu
1305621bc2 Truncate scroll runs that copy to where we copied to.
* dispnew.c (scrolling_window): Truncate overlaps in copy destination
of scroll runs so as to avoid assigning disabled bogus rows and
unnecessary graphics copy operations.
2011-11-28 10:07:01 +09:00
Eli Zaretskii
8c9afb4694 Fix MS-Windows build with MSVC compiler.
Parts of the changes by Fabrice Popineau  <fabrice.popineau@supelec.fr>.

 lib-src/makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS).
 lib-src/emacsclient.c (main) <environ>: Remove declaration, already
 pulled in by unistd.h on Posix hosts and stdlib.h on MS-Windows.
 nt/inc/stdint.h (uint32_t, uint64_t) [_WIN64]: New typedefs.
 (UINT64_MAX) [_WIN64]: Fix definition.
 (uintmax_t, intmax_t): Fix definitions.
 nt/inc/inttypes.h (strtoumax, strtoimax) [!__MINGW32__]: Provide
 correct definitions.
 nt/config.nt (HAVE_DECL_STRTOLL): Define.
 (va_copy) [_WIN64]: Provide a better definition.
 src/s/ms-w32.h (utimbuf) [_MSC_VER]: Don't define.
 (snprintf) [_MSC_VER]: Redirect to _snprintf.
 (strtoll) [_MSC_VER]: Redirect to _strtoi64.
 (malloc, free, realloc, calloc): Redirect to e_* only when
 compiling Emacs.
 src/lisp.h (GCTYPEBITS): Move before first use.
 (ALIGN_GCTYPEBITS) [_MSC_VER]: Define.
 (DECL_ALIGN) [_MSC_VER]: Use it, as MSVC doesn't like bit ops in
 this macro definition.
 (tzname): Redirect to _tzname for all values of _MSC_VER.

Fixes: debbugs:9960
2011-11-27 20:52:53 +02:00
Jan Djärv
54e9e3bf84 Work around an Ubuntu 11.10 bug where Emacs loops forever when started.
* configure.in: Check for gtk_window_set_has_resize_grip.

* src/gtkutil.c (xg_create_frame_widgets): Call
gtk_window_set_has_resize_grip (FALSE) if that function is
present with Gtk+ 2.0.
2011-11-27 19:33:17 +01:00
Paul Eggert
e9a452d9cd Spelling fixes (mostly "inactive" vs "deactivate"). 2011-11-27 10:17:40 -08:00
Paul Eggert
e47695319f Spelling fixes. 2011-11-26 20:43:11 -08:00
Paul Eggert
83aca1cb69 * fileio.c (Finsert_file_contents): Undo previous change.
See <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
2011-11-26 13:40:41 -08:00
Eli Zaretskii
394305db34 src/dispnew.c (update_window): Fix outdated commentary. 2011-11-26 15:11:03 +02:00
Paul Eggert
b0b199744d Spelling fixes. 2011-11-26 00:26:37 -08:00
Paul Eggert
5b76caa476 Rename locals to avoid shadowing.
* fileio.c (Finsert_file_contents):
Rename inner 'gcpro1' to 'inner_gcpro1' to avoid shadowing.
* process.c (wait_reading_process_output):
Rename inner 'proc' to 'p' to avoid shadowing.
Indent for consistency with usual Emacs style.
2011-11-25 23:42:44 -08:00
Eli Zaretskii
91b4a71898 Fix bug #10119 with C-e and whitespace-mode.
src/xdisp.c (start_display): Don't move to the next line if the display
 should start at a newline that is part of a display vector or an overlay
 string.
2011-11-25 21:52:46 +02:00
Eli Zaretskii
5c730f48c5 Fix a thinko in 2011-11-25T11:32:14Z!eliz@gnu.org. 2011-11-25 17:22:30 +02:00
Juanma Barranquero
e9fce1acd8 Fix typos. 2011-11-25 14:26:30 +01:00
Eli Zaretskii
8c535114e2 Fix bug #10105 with Isearch triggered scrolling under scroll-conservatively.
src/xdisp.c (redisplay_window): If cursor row is not fully visible
 after recentering, and scroll-conservatively is set to a large
 number, scroll window by a few more lines to make the cursor fully
 visible and out of scroll-margin.
2011-11-25 13:32:14 +02:00
Paul Eggert
e4920bc99d Spelling fixes. 2011-11-24 23:14:48 -08:00
Juri Linkov
fa4fdb5ca5 * src/image.c (imagemagick_load_image): Move `MagickSetResolution' down
after the `MagickPingImage' call.

Fixes: debbugs:10112
2011-11-24 21:02:39 +02:00
Juanma Barranquero
20db1522fe Fix typos. 2011-11-24 02:58:14 +01:00
Chong Yidong
90ec88df9f * src/window.c (Fcoordinates_in_window_p): Accept only live windows. 2011-11-24 00:09:08 +08:00
Martin Rudalics
56e2e794b0 In Fkill_buffer do replace_buffer_in_windows before Fset_buffer. (Bug#10114)
* buffer.c (Fkill_buffer): Run replace_buffer_in_windows before
making another buffer current.  (Bug#10114)
2011-11-23 10:57:27 +01:00
Glenn Morris
b6e64c4136 * src/font.c (font_find_for_lface) [HAVE_NS]: Ignore case.
Fixes: debbugs:2526
2011-11-22 23:09:27 -08:00
Paul Eggert
ee7683ebb7 Spelling fixes. 2011-11-22 23:03:56 -08:00
Chong Yidong
6b21de180f * xdisp.c (compute_stop_pos): Check validity of end_charpos before using it.
Fixes: debbugs:5984
2011-11-23 14:47:09 +08:00
Eli Zaretskii
b12cd78937 Fix bug #10098 with assertion violation during frame resize.
src/dispnew.c (adjust_glyph_matrix): Don't verify hash code of mode-
 and header-lines, as they don't have one computed for them.
 src/.gdbinit (prow): Make displayed values more self-explaining.
 Add row's hash code.
2011-11-22 20:00:38 +02:00
Lars Magne Ingebrigtsen
16c1ad08dc (wait_reading_process_output): Add comment and URL. 2011-11-21 21:39:44 +01:00
Lars Magne Ingebrigtsen
261b6fd466 Fix asynchrounous GnuTLS socket handling on some versions of the GnuTLS library.
Some versions of the GnuTLS library doesn't respons to poll reliably.
Work around this by checking all GnuTLS sockets explicitly from the
idle loop.
2011-11-21 19:21:42 +01:00
Jan Djärv
e7cfd277bd * xterm.c (x_clear_frame): Reinstate the XClearWindow call. 2011-11-21 19:01:04 +01:00
Chong Yidong
a9b9b7f5b1 More updates to Windows chapter of Lisp manual.
* doc/lispref/windows.texi (Splitting Windows): Fix error in documentation of
window-combination-limit.
(Cyclic Window Ordering): Minor fixes to next-window,
one-window-p, and get-lru-window docs.  Don't document
window-list-1.
(Buffers and Windows): Copyedits.
(Choosing Window): Document special handling of special-display-*.
(Choosing Window Options): Fix display-buffer-reuse-frames doc.
Don't document even-window-heights, which is going away.  Clarify
which options are obeyed by which action functions.

* src/window.c (Fnext_window, Fprevious_window): Doc fix.
2011-11-21 14:05:16 +08:00
Stefan Monnier
b0d15b4f05 * src/window.c (get_phys_cursor_glyph): Fix Lisp_Object/int mixup. 2011-11-20 15:17:13 -05:00
Juanma Barranquero
fe7a3057a3 Fix typos. 2011-11-20 20:35:27 +01:00
Martin Rudalics
d2999b1a52 Remove term "status" with "window combination limits".
* window.c (Fset_window_combination_limit): Rename argument
STATUS to LIMIT.
(Vwindow_combination_limit): Remove "status" from doc-string.
* windows.texi (Resizing Windows, Splitting Windows): Remove
term "status" when talking about combination limits.
2011-11-20 11:57:04 +01:00
Andreas Schwab
d5ff9cd046 * configure.in: Remove reference to src/m/ibms390.h.
* admin/CPP-DEFINES (VIRT_ADDR_VARIES): Remove.

* src/m/ibms390.h: Remove.
* src/m/ibms390x.h: Don't include "ibms390.h".
2011-11-20 10:24:06 +01:00
Paul Eggert
40ba43b4b7 Spelling fixes. 2011-11-19 23:30:16 -08:00
Stefan Monnier
a5bb9bd3a8 * src/fileio.c (Finsert_file_contents): Add missing gcpro1 variable.
Suggested by Dmitry Antipov <dmantipov@yandex.ru>.
2011-11-19 23:34:32 -05:00
Juanma Barranquero
cd1181dbec Fix typos. 2011-11-20 04:48:53 +01:00
Paul Eggert
17e845af73 Standardize on VIRT_ADDR_VARIES behavior.
Otherwise, valgrind does not work on some platforms.
Problem reported by Andreas Schwab in
<http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00081.html>.
* puresize.h (pure, PURE_P): Always behave as if VIRT_ADDR_VARIES
is set, removing the need for VIRT_ADDRESS_VARIES.
(PURE_P): Use a more-efficient implementation that needs just one
comparison, not two: on x86-64 with GCC 4.6.2, this cut down the
number of instructions from 6 (xorl, cmpq, jge, xorl, cmpq, setge)
to 4 (xorl, subq, cmpq, setbe).
* alloc.c (pure): Always extern now, since that's the
VIRT_ADDR_VARIES behavior.
(PURE_POINTER_P): Use a single comparison, not two, for
consistency with the new puresize.h.
* lisp.h (PNTR_COMPARISON_TYPE): Remove; no longer needed.
* m/ibms390.h, m/intel386.h, m/template.h, s/cygwin.h, s/hpux10-20.h:
Remove VIRT_ADDR_VARIES no longer needed.

Fixes: debbugs:10042
2011-11-19 19:19:22 -08:00
Paul Eggert
615a3b8d0d Merge from trunk. 2011-11-19 19:07:02 -08:00
Paul Eggert
e1dbe924b5 Spelling fixes. 2011-11-19 18:29:42 -08:00
Eli Zaretskii
f8fe6f9674 Fix bug #10075 with cursor drawing in an hscrolled window.
src/xdisp.c (x_write_glyphs, draw_phys_cursor_glyph)
 (erase_phys_cursor, update_window_cursor, show_mouse_face)
 (cursor_in_mouse_face_p): If the cursor position is out of bounds,
 behave as if the cursor position were at the window margin.
 src/window.c (get_phys_cursor_glyph): If the window is hscrolled,
 and the cursor position is out of bounds, behave as if the cursor
 position were at the window margin.
2011-11-19 17:50:23 +02:00
Chong Yidong
df05a53c61 * window.c (Fwindow_combination_limit): Make first arg non-optional
since it is meaningless for live windows like the selected window.
2011-11-19 19:09:10 +08:00
Paul Eggert
5396468298 Spelling fixes. 2011-11-19 01:18:31 -08:00
Eli Zaretskii
7430c2a179 Revert last commit. 2011-11-19 10:39:42 +02:00
Paul Eggert
61ccba97a1 Fix minor problems found by static checking.
* dispextern.h, xdisp.c (row_hash): Declare extern only if XASSERTS.
* dispnew.c (verify_row_hash): Now static.
2011-11-18 10:29:29 -08:00
Dmitry Antipov
2071918ec9 * src/keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs. 2011-11-18 11:50:16 -05:00
Stefan Monnier
b50a28de87 * src/intervals.c: Fix grafting over the whole buffer.
(graft_intervals_into_buffer): Simplify.

Fixes: debbugs:10071
2011-11-18 11:00:40 -05:00
Eli Zaretskii
68c95424af Add assertion for hash values of rows.
src/dispnew.c (add_row_entry): Add xassert to verify that ROW's hash code
 is valid.
2011-11-18 14:41:36 +02:00
Eli Zaretskii
015137db60 Fix another crash due to incorrect hash value of glyph rows, bug #10035.
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.
2011-11-18 14:21:42 +02:00
Tassilo Horn
a2addb0464 Work around GTK bug crashing emacs GTK builds.
* frame.c (delete_frame): Don't delete the terminal when the last
X frame is closed if emacs is built with GTK toolkit.
2011-11-18 10:36:59 +01:00