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

35524 commits

Author SHA1 Message Date
Paul Eggert
ed44be700c Minor cleanup of previous change.
* image.c (imagemagick_error, Fimagemagick_types):
Omit some recently-introduced and unnecessary casts and assignments.
2014-01-23 09:27:37 -08:00
Dmitry Antipov
565935c89f Fix two memory leaks discovered with Valgrind.
* ftfont.c (ftfont_list) [HAVE_LIBOTF]: Call OTF_close.
* image.c (Fimagemagick_types): Call MagickRelinquishMemory.
2014-01-23 16:18:08 +04:00
Martin Rudalics
6cb4da45dc Fixes in window size functions around Bug#16430 and Bug#16470.
* window.c (Fwindow_pixel_width, Fwindow_pixel_height)
(Fwindow_mode_line_height, Fwindow_header_line_height)
(Fwindow_right_divider_width, Fwindow_bottom_divider_width):
Minor doc-string adjustments.
(Fwindow_total_height, Fwindow_total_width): New argument ROUND.
Rewrite doc-strings.
(window_body_height, window_body_width): Do not count partially
visible lines/columns when PIXELWISE is nil (Bug#16470).
(Qfloor, Qceiling): New symbols.
* window.el (window-total-size, window-size): New argument
ROUND.
(window--min-delta-1, window-min-delta, window--max-delta-1): Be
more conservative when calculating the numbers of lines or
columns a window can shrink (Bug#16430).
(fit-window-to-buffer): Simplify code.
* term.el (term-window-width): Call window-body-width again.
2014-01-22 11:29:23 +01:00
Eli Zaretskii
f7551c6c33 Fix bug #16509 with segfault in an assertion when exiting due to missing font.
src/w32fns.c (unwind_create_frame): Avoid crashing inside assertion
 when the image cache is not yet allocated.
2014-01-21 18:08:31 +02:00
Glenn Morris
38942b9cf5 ChangeLog fixes 2014-01-21 00:49:46 -08:00
Dmitry Antipov
5004c3bfbb * buffer.c (Fkill_buffer): When killing an indirect buffer,
re-attach intervals to its base buffer (Bug#16502).
* intervals.c (set_interval_object): Move from here...
* intervals.h (set_interval_object): ... to here.  Fix comments.
2014-01-21 06:28:57 +04:00
Glenn Morris
a6c4680aa2 Fix spelling of "GNUstep" 2014-01-20 14:44:56 -05:00
Paul Eggert
009581fa65 Apply previous change even if valgrind is not in use, since it avoids undefined behavior. This is simpler. 2014-01-20 08:55:28 -08:00
Paul Eggert
3c35702fe9 Pacify valgrind by initializing buffer redisplay bit.
Problem reported by Dmitry Antipov in
<http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01756.html>.
* alloc.c (USE_VALGRIND): Move this to ...
* conf_post.h (USE_VALGRIND): ... here.  Use booleans.
* buffer.c (Fget_buffer_create): Initialize redisplay bit
to pacify valgrind.
2014-01-20 08:47:41 -08:00
Paul Eggert
f952002e0a Revert some of the CANNOT_DUMP fix.
Because of this, "make bootstrap" won't work if CANNOT_DUMP=yes,
but fixing this can wait until after the next release.
* leim/Makefile.in (RUN_EMACS): Keep EMACSLOADPATH empty.
* lisp/Makefile.in (emacs): Keep EMACSLOADPATH empty.
* src/lread.c (init_lread): Fix typo: NILP, not !NILP.

Fixes: debbugs:16494
2014-01-19 23:56:28 -08:00
Eli Zaretskii
21f9541125 Fix Cygwin w32 build broken by last commit in w32font.c.
src/w32font.c (w32_load_unicows_or_gdi32, get_outline_metrics_w)
 (get_text_metrics_w, get_glyph_outline_w, get_char_width_32_w)
 [!WINDOWSNT]: These functions are no longer compiled on Cygwin;
 they are replaced by macros that expand into direct calls to the
 corresponding functions from GDI32.DLL.
 (globals_of_w32font) [WINDOWSNT]: Don't initialize g_b_* static
 variables in the Cygwin build, they are unused.
2014-01-19 17:42:48 +02:00
Kenichi Handa
d25f735b87 composite.c (composition_update_it): Fix previous change. 2014-01-19 22:26:21 +09:00
Eli Zaretskii
5197f0c2fe Fix file name handling on MS-Windows 9X.
src/w32.c (maybe_load_unicows_dll): New function.
 src/emacs.c (main) [WINDOWSNT]: Call maybe_load_unicows_dll early
 on, to make sure we can convert file names to and from UTF-8 on
 Windows 9X.  This fixes a failure to start up because Emacs cannot
 find term/w32-win.el.  Reported by oslsachem <oslsachem@gmail.com>.
 src/w32font.c [WINDOWSNT]: Include w32.h.
 (w32_load_unicows_or_gdi32): Call maybe_load_unicows_dll, instead
 of implementing the same stuff.
 Remove now unused g_b_init_is_windows_9x.
 src/w32.h (maybe_load_unicows_dll): Add prototype.

 nt/runemacs.c (ensure_unicows_dll): Don't tell in the message box
 that "emacs -nw" can do without UNICOWS.DLL on Windows 9X.  See
 w32.c:maybe_load_unicows_dll and its callers for the reason.
2014-01-18 13:46:22 +02:00
Glenn Morris
812a093042 ChangeLog and Author: header comment fixes 2014-01-17 20:51:38 -05:00
Eli Zaretskii
20adfbd8ea Provisional fix for bug #16479 with client connecting while in a TTY menu.
src/menu.c (Fx_popup_menu): When invoking tty_menu_show, temporarily
 switch to single keyboard.  Prevents daemon crashes when a new
 client connects while we show a TTY menu in an existing client.
2014-01-17 13:55:00 +02:00
Glenn Morris
56db2b1bfd ChangeLog fixes 2014-01-16 20:54:23 -05:00
Glenn Morris
d967cd184c ChangeLog fixes 2014-01-16 00:34:43 -08:00
Paul Eggert
c91c771dbe Spelling fixes. 2014-01-15 22:24:06 -08:00
Eli Zaretskii
fa9daa2852 src/ChangeLog: Fix typos. 2014-01-15 19:56:40 +02:00
Glenn Morris
39c871402f ChangeLog fixes 2014-01-14 22:06:07 -05:00
Paul Eggert
d9784824e2 Space before paren, updating recent change. 2014-01-14 09:59:19 -08:00
Paul Eggert
d1eaf34b2f Fix MinGW64 porting problem with _setjmp.
Reported by Eli Zaretskii in:
http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01297.html
* image.c (FAST_SETJMP, FAST_LONGJMP): New macros, replacing
the old _setjmp and _longjmp.  All uses changed.
2014-01-13 17:19:42 -08:00
Daniel Colascione
1b49bd5d72 Correctly handle reaching the end of the interval tree. (Bug#15344) 2014-01-13 15:41:43 -08:00
Martin Rudalics
a3f2bf1b86 Fix bug when resizing mini window (Bug#16424).
* xdisp.c (resize_mini_window): Round height to a multiple of
frame's line height.  Fix bug in calculation of window start
position (Bug#16424).
2014-01-13 12:30:30 +01:00
Jan Djärv
6c21e306f2 * macfont.m: Include termchar.h.
(CG_SET_FILL_COLOR_WITH_FACE_FOREGROUND)
(CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND)
(CG_SET_STROKE_COLOR_WITH_FACE_FOREGROUND): Modified from
*_WITH_GC_* to take face and f as parameters.
(macfont_draw): Check for DRAW_MOUSE_FACE and set face accordingly.
Use *_WITH_FACE_*, and pass face as parameter.

Fixes: debbugs:16425
2014-01-13 11:32:48 +01:00
Daniel Colascione
7d29a37a5b Make GTK+ menus work correctly with the Unity global menu 2014-01-12 17:50:46 -08:00
Daniel Colascione
a787d37a3e Fix changelog 2014-01-12 17:50:11 -08:00
Daniel Colascione
7a1b473ce8 Make GTK+ menus work correctly with Unity global menu 2014-01-12 17:40:35 -08:00
Kenichi Handa
67671fb1dc composite.c (composition_update_it): Fix indexing of LGSTRING_CHAR (Bug#15984). 2014-01-13 08:23:55 +09:00
Fabrice Popineau
e05d3a05bf Fix minor build problems related to MinGW64.
configure.ac: Read $srcdir/nt/mingw-cfg.site when $MSYSTEM is
 "MINGW64" as well.

 nt/inc/ms-w32.h (pthread_sigmask): Undefine if defined, for MinGW64.

 src/unexw32.c (_start) [__MINGW64__]: Define to __start.
2014-01-11 15:36:06 +02:00
Eli Zaretskii
02013850f6 Fix bug #16347 with updating redisplay of company-mode's "tooltip".
src/xdisp.c (try_window_id): Don't use this function's optimizations
 if overlays in the buffer displayed by the window have changed
 since last redisplay.
 (message_dolog): Fix indentation.
2014-01-11 13:54:08 +02:00
Eli Zaretskii
dc604697f8 src/xdisp.c (try_window_id): Update commentary. 2014-01-11 13:28:57 +02:00
Martin Rudalics
f96d0a6b46 Fix doc-string of frame_resize_pixelwise.
* frame.c (frame_resize_pixelwise): Fix doc-string.
2014-01-11 11:01:01 +01:00
Martin Rudalics
7d7ccb8829 Fix handling of internal borders (Bug#16348).
* dispnew.c (adjust_frame_glyphs_for_window_redisplay): Remove
internal border width from pixel width of windows.
(change_frame_size_1): Don't return early when frame's pixel
size changes - we still have to record the new sizes in the
frame structure.
* w32fns.c (x_set_tool_bar_lines): Clear internal border width
also when toolbar gets larger.
* window.c (check_frame_size): Include internal_border_width in
check.
* xdisp.c (Ftool_bar_height): Fix doc-string typo.
* xfns.c (x_set_menu_bar_lines, x_set_tool_bar_lines): In
non-toolkit/non-GTK version clear internal border.
* xterm.c (x_clear_under_internal_border): New function for
non-toolkit/non-GTK version.
(x_after_update_window_line): In non-toolkit/non-GTK version
don't do that.
(handle_one_xevent, x_set_window_size): Call
x_clear_under_internal_border in non-toolkit/non-GTK version.
* xterm.h (x_clear_under_internal_border): Extern it.
2014-01-11 10:31:09 +01:00
Glenn Morris
a12bf61ed4 ChangeLog fixes 2014-01-10 19:55:50 -08:00
Paul Eggert
06827ec842 Spelling fixes.
* mail/unrmail.el (unrmail-mbox-format): Choice is mboxo, not mboxro.
* woman.el (woman-mark-horizontal-position):
Rename from woman-mark-horizonal-position.  Use changed.
2014-01-09 23:10:37 -08:00
Paul Eggert
be316ede5f Fix misdisplay of interlaced GIFs with libgif5.
* image.c (gif_load): libgif5 deinterlaces for us, so don't do
it again.

Fixes: debbugs:16372
2014-01-07 13:14:32 -08:00
Eli Zaretskii
9f4e49e93e Fix bug #16129 with slow and incorrect redisplay in follow-mode.
src/xdisp.c (redisplay_window): Don't skip window redisplay if the
 last value of point is not equal to buffer's point.
2014-01-06 18:28:26 +02:00
Paul Eggert
d5081c1ed8 Spelling fixes.
* calc/calc-yank.el (calc-edit-mode, calc-edit-cancel):
* emacs-lisp/debug.el (cancel-debug-on-entry):
* epg.el (epg-error-to-string):
* files.el (recover-file):
* lpr.el (lpr-buffer, print-buffer, lpr-region, print-region):
* mail/emacsbug.el (report-emacs-bug-hook):
* mail/sendmail.el (mail-recover):
* ses.el (ses-yank-resize):
* term/ns-win.el (ns-print-buffer):
Spelling fixes in diagnostics, mostly for "canceled" with one L.
* epg.el (epg-key-capability-alist): Rename from misspelled version.
All uses changed.
* obsolete/xesam.el (xesam-all-fields): Fix misspelled field name.
2014-01-05 22:25:30 -08:00
Paul Eggert
dc300e285a Spelling fix. 2014-01-04 20:56:23 -08:00
Paul Eggert
da5ecfa9b9 Spelling fixes.
* lib-src/Makefile.in (regex.o): Remove reference to no-longer-used macros
CONFIG_BROKETS and INHIBIT_STRING_HEADER.  "BROKETS" was a
misspelling anyway....
* src/nsterm.h (updateCollectionBehavior): Rename from
updateCollectionBehaviour.  All uses changed.
2014-01-04 18:56:08 -08:00
Paul Eggert
81da295eeb Port to GNU/Linux with recent grsecurity/PaX patches (Bug#16343).
Problem and proposed patch reported by Ulrich Mueller;
this patch uses a somewhat-different approach.
* configure.ac (SETFATTR): New variable.
* src/Makefile.in (SETFATTR): New macro.
(temacs$(EXEEXT)): Use it.
2014-01-04 16:55:29 -08:00
Martin Rudalics
5159d5902f Fix maximization behavior on Windows (Bug#16300).
Fix maximization behavior on Windows (Bug#16300).
* w32fns.c (w32_fullscreen_rect): Don't handle
FULLSCREEN_MAXIMIZED and FULLSCREEN_NONE specially.
* w32term.c (w32fullscreen_hook): Use SetWindowPlacement instead
of SetWindowPos.  Restore last placement also when leaving
FULLSCREEN_HEIGHT and FULLSCREEN_WIDTH.  Call ShowWindow in all
but the FULLSCREEN_BOTH case.
2014-01-04 10:31:30 +01:00
Paul Eggert
56a0e35287 Port to C89.
* data.c (arithcompare_driver):
* fileio.c (Fcar_less_than_car):
* fns.c (internal_equal):
* frame.c (delete_frame):
* lisp.h (enum More_Lisp_Bits):
* lread.c (read1):
Avoid C99 constructs that don't work in C89.
* data.c (ULL_MAX, count_trailing_zeros_ll): New macros,
to port to C89, which doesn't have 'long long'.
(count_trailing_zero_bits): Use them.
2014-01-02 22:47:27 -08:00
Paul Eggert
ed0ca4a51a Whitespace fixes for recently-added code. 2014-01-02 22:42:23 -08:00
Chong Yidong
0d53f628be Remove the dynamic-docstring-function feature.
* emacs-lisp/advice.el (ad--make-advised-docstring): Change args.
Ignore function-documentation property when getting documentation.
(ad-activate-advised-definition): Use function-documentation
generate the docstring.
(ad-make-advised-definition): Don't call
ad-make-advised-definition-docstring.
(ad-make-advised-definition-docstring, ad-advised-definition-p):
Delete functions.

* emacs-lisp/nadvice.el (advice--make-docstring): Change args.
(advice--docstring): Delete variable.
(advice--make-1): Leave the docstring empty.
(advice-add): Use function-documentation for advised docstring.

* progmodes/sql.el (sql-help): Use function-documentation instead
of dynamic-docstring-function property.  No need to autoload now.
(sql--help-docstring): New variable.
(sql--make-help-docstring): Use it.

* doc.c (Fdocumentation): Remove dynamic-docstring-function.
2014-01-03 13:37:58 +08:00
Martin Rudalics
44c5e192be Further adjust frame/window scrollbar width calculations.
* window.c (apply_window_adjustment): Set
windows_or_buffers_changed.
(Fwindow_scroll_bars): Return actual scrollbar width.
* xfns.c (x_set_scroll_bar_default_width): Rename wid to unit.
For non-toolkit builds again use 14 as minimum width and set
FRAME_CONFIG_SCROLL_BAR_WIDTH accordingly.
* xterm.c (XTset_vertical_scroll_bar): Take width from
WINDOW_SCROLL_BAR_AREA_WIDTH.
(x_new_font): Rename wid to unit.  Base calculation of new
scrollbar width on toolkit used and make it analogous to that of
x_set_scroll_bar_default_width.
* w32fns.c (x_set_scroll_bar_default_width): Rename wid to unit.
(Fx_create_frame): Call x_set_scroll_bar_default_width instead
of GetSystemMetrics.
* w32term.c (w32_set_vertical_scroll_bar): Take width from
WINDOW_SCROLL_BAR_AREA_WIDTH.
(x_new_font): Make it correspond to changes in xterm.c.
2014-01-02 16:58:48 +01:00
Paul Eggert
b483c5703d Prefer ASCII in doc and comments when the difference does not matter. 2014-01-01 15:13:59 -08:00
Paul Eggert
b00cdd96e9 * lisp.h (EMACS_INT): Configure based on INTPTR_MAX, not LONG_MAX.
This is a cleaner way to fix the MinGW-w64 porting problem.
Check for INTPTR_MAX misconfiguration.
2014-01-01 11:27:41 -08:00
Eli Zaretskii
c10e9ece08 Fix bug #16265 with buffer caches when modifying text in indirect buffers.
src/search.c (newline_cache_on_off, find_newline): In indirect
 buffers, use the newline cache of the base buffer.
 src/insdel.c (invalidate_buffer_caches): If BUF is an indirect
 buffer, invalidate the caches of its base buffer.
 src/indent.c (width_run_cache_on_off, compute_motion): In indirect
 buffers, use the width-run cache of the base buffer.
 src/xdisp.c (redisplay_window): When the window displays an indirect
 buffer, and the character widths in the display table have
 changed, invalidate the width-run cache of the corresponding base
 buffer.
 src/fileio.c (Finsert_file_contents): When invalidating the newline
 cache, consider the case of inserting into indirect buffer.
 src/bidi.c (bidi_paragraph_cache_on_off, bidi_find_paragraph_start):
 In indirect buffers, use the paragraph cache of the base buffer.
2014-01-01 19:44:48 +02:00