1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-12 14:30:42 -08:00
Commit graph

28816 commits

Author SHA1 Message Date
Eli Zaretskii
a73d395bd9 Fix bug #8020 with quick resizing of the selected frame.
xdisp.c (redisplay_internal): Resynchronize `w' if the selected
 window is changed inside calls to do_pending_window_change.
2011-02-13 20:55:07 +02:00
Eli Zaretskii
cb191a14ce Fix bug #7840 with setting terminal/keyboard encoding of emacsclient frames.
terminal.c (create_terminal): Use default-keyboard-coding-system
 and default-terminal-coding-system to initialize coding systems of
 the new terminal.
2011-02-12 04:47:28 -05:00
Juanma Barranquero
b762841f95 Fix trivial typos in comments and ChangeLogs. 2011-02-12 04:17:00 +01:00
Martin Rudalics
bae1fa42dc Fix to select_window.
http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00346.html

* window.c (select_window): Check inhibit_point_swap argument when
deciding whether to return immediately.
2011-02-08 19:11:15 -05:00
Jan Djärv
9aabf64c78 * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
zero.

Fixes: debbugs:7348
2011-02-08 08:19:20 +01:00
Glenn Morris
95838641ae Doc fixes related to face heights. (Bug#2659)
* lisp/faces.el (set-face-attribute): Doc fix.

* src/xfaces.c (Finternal_set_lisp_face_attribute):
Try to clarify some error messages.
2011-02-02 22:55:48 -08:00
Stefan Monnier
aca092acca * src/editfns.c (save_restriction_restore): Don't forget to invalidate the
current_column cache.

Fixes: debbugs:7946
2011-02-02 10:53:20 -05:00
Kenichi Handa
15d73a19fc merge emacs-23 2011-02-02 11:16:53 +09:00
Kenichi Handa
ea2460a0d8 Use FC_DUAL only when it is defined. 2011-02-02 11:15:29 +09:00
Andreas Schwab
29feb0e9b5 * src/window.c (Fselect_window): Add missing return value. 2011-02-01 20:01:25 +01:00
Andreas Schwab
df61c79005 Fix use of pointers to image library functions
* src/image.c (DEF_IMGLIB_FN): Add parameter rettype, use it instead
of int.  All uses adjusted.
(PNG_JMPBUF, png_load, jpeg_load, tiff_load, gif_load)
(svg_load_image): Remove casts.
2011-01-30 00:56:33 +01:00
Chong Yidong
c2e79cb408 Fix macro definitions in last change to image.c 2011-01-29 17:33:02 -05:00
Chong Yidong
7f9c5df966 Fix png support to allow compiling with libpng-1.5 (Bug#7908).
* image.c (fn_png_longjmp, fn_png_set_longjmp_fn): New png
function definitions for compiling with libpng-1.5.
(PNG_LONGJMP, PNG_JMPBUF): New macros for libpng-1.5.
(my_png_error, png_load): Use them.  Suggested by Thomas Klausner.
2011-01-29 16:28:26 -05:00
Chong Yidong
46b3f2bedc * m/intel386.h: Define NO_ARG_ARRAY. Suggested by Dan Nicolaescu. 2011-01-28 12:07:12 -05:00
Chong Yidong
37d1c45d60 Fix GTK font name parsing to allow numbers in names (Bug#7853).
A better fix is already in the trunk.

* src/font.c (font_parse_fcname): Require GTK-style font sizes to
occur at the end of the font string (Bug#7853).
2011-01-26 19:45:30 -05:00
Chong Yidong
ea08011c7e * src/font.c (font_parse_fcname): Fix typo in string length. 2011-01-26 11:28:49 -05:00
Stefan Monnier
f996bbcb94 * xdisp.c (handle_fontified_prop): Be careful with font-lock changing
the buffer's point-max.

Fixes: debbugs:7876
2011-01-24 17:05:52 -05:00
Chong Yidong
19634648a6 * lisp.h (XPNTR): Obey DATA_SEG_BITS in all non-USE_LSB_TAG cases (Bug#6811).
Remove unused HAVE_SHM branch.
2011-01-23 17:38:13 -05:00
Peter O'Gorman
6de1218f3c Two more hunks from the HP-UX patch at Bug#6811.
* configure.in: Add HP-UX on IA64 (Bug#6811).
* src/s/hpux11.h: Set CANNOT_DUMP on IA64 (Bug#6811).
2011-01-23 17:00:22 -05:00
Chong Yidong
bd2a4b24c4 Fix last change. 2011-01-22 10:55:08 -05:00
Martin Rudalics
e6b84b30bc Rework 2011-01-15 changes to window.c.
* src/window.c (select_window): New function.
(Fselect_window): Call it.
(inhibit_point_swap): Variable deleted.
(Fset_window_configuration): Call select_window directly.
2011-01-21 21:44:53 -05:00
Stefan Monnier
0514b4be51 * image.c (syms_of_image): Don't access XSYMBOL's internals directly. 2011-01-16 10:40:47 -05:00
Eli Zaretskii
e7f50e8ff0 Fix bug #7848 with using SET_SYMBOL_VALUE in image.c
!!!DO NOT MERGE TO THE TRUNK!!!

 image.c (syms_of_image): Don't use SET_SYMBOL_VALUE.
2011-01-16 04:51:59 -05:00
Martin Rudalics
6dc1d2d387 Avoid crash in Fselect_frame due to null selected_window (Bug#7728).
* window.c (inhibit_point_swap): New variable.
(Fselect_window): If inhibit_point_swap is nonzero, avoid swapping
point this time.
(Fset_window_configuration): Set inhibit_point_swap to 1 instead
of setting selected_window to nil (Bug#7728).
2011-01-14 21:55:58 -05:00
Chong Yidong
70ba1ec80c Distinguish between terminfo and termcap on NetBSD (Bug#7642).
* configure.in [netbsd systems]: Check for tputs definition.

* src/config.in (TERMINFO): New definition.

* src/s/netbsd.h: Use it to choose between terminfo and termcap.
2011-01-11 21:29:23 -05:00
Jan Djärv
0ad254447b Backport bug 7517 fixes from trunk.
* coding.h (ENCODE_UTF_8): Remove "Used by ..." comment.

* nsfns.m (ns_set_name_iconic): Remove.
(ns_get_screen): Don't assign integer to f.
(ns_set_name_internal): New function.
(Vicon_title_format): Extern declare.
(ns_set_name): Call ns_set_name_internal.
(x_explicitly_set_name): Remove call to ns_set_name_iconic.
(x_implicitly_set_name): Ditto.
(x_set_title): Remove commet about EXPLICIT.  Call ns_set_name_internal.
(ns_set_name_as_filename): Encode name with ENCODE_UTF_8.
Always use buffer name for title and buffer filename only for
RepresentedFilename. Handle bad UTF-8 in buffer name (Bug#7517).
2011-01-03 22:26:22 +01:00
Eli Zaretskii
fb724e5537 Don't use png_jmpbuf, it doesn't work with dynamic loading.
image.c (png_jmpbuf): Remove definition.
 (my_png_error, png_load): Don't use png_jmpbuf.
2011-01-03 21:32:41 +02:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Eli Zaretskii
18da2e74f0 More elegant solution for accessing png_ptr without GCC warnings.
image.c (png_jmpbuf): New macro.
 (my_png_error, png_load): Use it instead of #ifdef'ing according
 to PNG_LIBPNG_VER_MAJOR and PNG_LIBPNG_VER_MINOR.
2010-12-31 18:33:40 +02:00
Eli Zaretskii
5be1c984b7 Fix bug #7716 with PNG image support libraries on Windows.
src/image.c <Qlibpng_version>: New variable.
 (syms_of_image): Intern and staticpro it.  Set its value to the
 version of PNG library we were compiled with.
 (my_png_error, png_load): Avoid GCC warnings about direct access
 to png_ptr->jmpbuf.
 lisp/term/w32-win.el (image-library-alist): Set up correctly for
 libpng versions both before and after 1.4.0.
 admin/nt/README.W32: Update the information about PNG support libraries.
 nt/INSTALL: Update the information about PNG support libraries.
2010-12-31 14:38:06 +02:00
Stefan Monnier
cf07311b88 * src/.gdbinit (xgetptr): Fix the union+lsb case.
(xbacktrace): Fix the union case.
2010-12-27 10:27:52 -05:00
Stefan Monnier
794b75c769 * src/window.c (Fmove_to_window_line): Avoid abort when called in a buffer
different from selected-window's.
2010-12-25 23:04:58 -05:00
Eli Zaretskii
71fe378d84 Fix bug #7662 with aligning key bindings equivalent to menu items.
keyboard.c (parse_menu_item): Prepend "  " to the key sequence
 equivalent of a menu item when the key sequence is given by the
 `:keys' attribute.
2010-12-25 19:19:57 +02:00
Eli Zaretskii
2e4ab21153 More fallout from fixing bug #7587.
src/xdisp.c (Fformat_mode_line): Doc fix: no need to state that only
 the basic faces are supported.
 doc/lispref/modes.texi (Emulating Mode Line): Fix last change.
 etc/NEWS: Remove the entry about format-mode-line accepting only
 basic faces.
2010-12-25 12:14:48 +02:00
Jan Djärv
84595ff0e3 * xterm.c (x_check_fullscreen): Fix pixel/character mixup. 2010-12-24 11:14:44 +01:00
Eli Zaretskii
30d621a239 Fix change that fixed bug #7587.
xdisp.c (Fformat_mode_line): Fix last change.
2010-12-17 17:38:37 +02:00
Chong Yidong
4bf3e46ed9 * xdisp.c (Fformat_mode_line): Restrict the FACE argument to basic faces (Bug#7587). 2010-12-16 10:13:28 +08:00
Eli Zaretskii
1b2a627f96 Fix bug #7617 with documentation of expand-file-name.
fileio.c (Fexpand_file_name): One more doc fix.
2010-12-13 18:13:29 +02: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
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
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
Jan Djärv
2b815743b2 * xsmfns.c (smc_die_CB): Call Fkill_emacs.
Fixes: debbugs:7552
2010-12-07 07:36:25 +01: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
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
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
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
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