1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-23 04:53:12 -08:00
Commit graph

35679 commits

Author SHA1 Message Date
Glenn Morris
5671dc5159 Merge from emacs-24; up to 2014-03-21T08:51:02Z!eliz@gnu.org 2014-03-21 12:04:57 -07:00
Glenn Morris
26e91130ed Increase default history-length from 30 to 100
Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg02008.html

* lisp/cus-start.el (history-length): Bump :version.

* src/minibuf.c (history-length): Increase default from 30 to 100.
2014-03-21 13:04:50 -04:00
Daniel Colascione
aa46590754 Code for previous change 2014-03-21 05:10:23 -07:00
Daniel Colascione
c4beb8da58 Frame icon optimization 2014-03-21 05:09:57 -07:00
Daniel Colascione
50e4eb2d52 Move might_dump assignment earlier in initialization 2014-03-21 03:38:41 -07:00
YAMAMOTO Mitsuharu
fef27dc1ad Fix regression introduced by patch for Bug#10500.
* xterm.c (x_draw_image_relief): Respect Vtool_bar_button_margin.
* w32term.c (x_draw_image_relief): Likewise.
2014-03-21 19:14:10 +09:00
Daniel Colascione
f20b8315e0 Allow lisp allocation via mmap in dumped emacs 2014-03-21 03:13:38 -07:00
Martin Rudalics
21e18b30e2 Truly maximize w32 frames with odd fonts and some texi fixes.
* w32fns.c (w32_wnd_proc): For WM_WINDOWPOSCHANGING don't
constrain frame size in SW_SHOWMAXIMIZED case so we can truly
maximize a frame for odd default fonts.
* frames.texi (Size and Position): In `frame-resize-pixelwise'
description drop remark about frame maximization.
* windows.texi (Display Action Functions): Add description for
`display-buffer-no-window' and explain use of `allow-no-window'
alist entries.
2014-03-21 10:23:22 +01:00
Eli Zaretskii
6d731d4183 Extend and improve w32-shell-execute on MS-Windows.
src/w32fns.c (Fw32_shell_execute) [!CYGWIN]: Use ShellExecuteEx, to
 support more "verbs".
2014-03-21 10:51:02 +02:00
Daniel Colascione
f58269c4b2 Do not allow a dumped Emacs to be dumped 2014-03-21 00:27:26 -07:00
Paul Eggert
1271626ab5 Backport doc.c fix from trunk.
* doc.c (store_function_docstring): Fix pointer signedness mismatch.
2014-03-20 17:10:29 -07:00
Paul Eggert
0df098bfd1 * doc.c (store_function_docstring): Fix pointer signedness mismatch. 2014-03-20 10:42:05 -07:00
Stefan Monnier
049fac7c94 * lisp/emacs-lisp/nadvice.el (advice--make-docstring): Try harder to find
the docstring of functions advised before dumping.
* src/doc.c (store_function_docstring): Warn when we don't know where to
put a docstring.
(Fsubstitute_command_keys): Don't advertise the fact that
text-properties are dropped, since we think it's a bug that we'll fix
in 24.5.

Fixes: debbugs:16993
2014-03-20 12:00:17 -04:00
Stefan Monnier
caecb91c58 * src/frame.h (SET_FRAME_VISIBLE): Keep frame_garbaged up to date.
* src/xterm.c (handle_one_xevent) <MapNotify>: Don't garbage the frame.
* src/frame.c (frame_garbaged): Make "docstring" more precise.
2014-03-20 10:09:37 -04:00
Glenn Morris
7b9cb54487 * src/charset.c (init_charset): When we cannot find the charsets directory,
mention if EMACSDATA is set.
2014-03-19 21:21:52 -04:00
Paul Eggert
d16ae62288 * fns.c (Frandom): Fix rare bug where the result isn't random. 2014-03-19 14:14:32 -07:00
Paul Eggert
37ca907722 Fix porting inconsistency about rounding to even.
* doc/lispref/numbers.texi (Numeric Conversions, Rounding Operations):
Document that 'round' and 'fround' round to even.
* src/floatfns.c (emacs_rint) [!HAVE_RINT]: Round to even.
This way, the unusual !HAVE_RINT case acts like the usual
HAVE_RINT case, and we can fix the documentation accordingly.
2014-03-19 14:09:08 -07:00
Eli Zaretskii
722493d794 Fix minor memory-related problems on MS-Windows revealed by Dr. Memory.
src/w32fns.c (reset_modifiers): Zero out keystate[] before using it.
 (w32_wnd_proc): Initialize the dwHoverTime member of
 TRACKMOUSEEVENT structure.
2014-03-19 19:43:18 +02:00
Ted Zlatanov
525d9a3cec gnutls.c (Fgnutls_boot): Fix case of :verify-error = t. 2014-03-17 17:29:56 -04:00
Eli Zaretskii
5f0da6cecd src/ChangeLog: Fix a typo in last commit. 2014-03-16 18:31:50 +02:00
Eli Zaretskii
2a3d9a06c9 Fix bug #16830 with slow search for newlines in forward-line.
src/search.c (find_newline): Speed up the function when using the
 newline cache, by halving the number of calls to
 region_cache_forward and region_cache_backward.
2014-03-16 18:28:34 +02:00
Juanma Barranquero
b6d8543cd5 src/buffer.c (Fset_buffer): Document return value (bug#17015). 2014-03-15 12:16:12 +01:00
Martin Rudalics
cfd5e825ae Document pixelwise frame resizing and fix related bug on Windows.
* w32term.c (x_set_window_size): When frame-resize-pixelwise is
nil, always resize character wise to avoid potential loss of the
mode line (Bug#16923 related).
* display.texi (Temporary Displays): Say that
with-temp-buffer-window makes its buffer current.
* frames.texi (Size and Position): Describe new option
`frame-resize-pixelwise'.  Rewrite descriptions of
`set-frame-size', `set-frame-height' and `set-frame-width'.
2014-03-14 11:38:46 +01:00
Martin Rudalics
8960529e6b Two adjustments in window/frame resizing.
* frame.c (x_set_frame_parameters): Always calculate new sizes
pixelwise to avoid potential loss when rounding.
* window.el (fit-frame-to-buffer): Get maximum width from
display's width instead of height.
2014-03-12 08:28:23 +01:00
Martin Rudalics
3d8bb58a99 Add comment for 2014-03-10T10:31:13Z!rudalics@gmx.at and 2014-03-10T18:53:39Z!rudalics@gmx.at. 2014-03-11 08:20:49 +01:00
Dmitry Antipov
b0b486db04 * xfns.c (x_set_mouse_color): Recolor vertical_drag_cursor.
* xterm.c (x_free_frame_resources): Free all allocated cursors.
2014-03-11 10:50:01 +04:00
Martin Rudalics
f38145ba81 Revert last change to w32_read_socket. 2014-03-10 19:53:39 +01:00
Eli Zaretskii
316d9327d7 src/w32.c (stat_worker): Fix commentary. 2014-03-10 19:31:17 +02:00
Eli Zaretskii
70db0db7bf Fix an obscure bug in fstatat on Windows 9X.
src/w32.c (fstatat): Don't add an extra slash if the argument ends
 with a slash: this fails the subsequent call to stat_worker on
 Windows 9X.  Reported by oslsachem <oslsachem@gmail.com>.
2014-03-10 19:26:45 +02:00
Martin Rudalics
d988d8a475 Unconditionally set visibility to 1 when restoring frame size (Bug#16967).
* w32term.c (w32_read_socket): In SIZE_RESTORED case
unconditionally set visibility of frame to 1.
2014-03-10 11:31:13 +01:00
Martin Rudalics
7e940b6546 Update docs for window dividers and `window-text-pixel-size'.
* xdisp.c (Fwindow_text_pixel_size): Adjust doc-string.
* elisp.texi (Top): Rename section "Width" to "Size of Displayed
Text".
* text.texi (Primitive Indent):
* strings.texi (String Basics):
* sequences.texi (Sequence Functions): Update references
accordingly.
* display.texi (Size of Displayed Text): Rename section from
"Width".  Add description for `window-text-pixel-size'.
(Window Dividers): Reword description of window dividers.
* frames.texi (Layout Parameters): Improve description of window
divider parameters.
* windows.texi (Window Sizes): Add descriptions of
`window-mode-line-height' and `window-header-line-height'.
(Coordinates and Windows): Mention window dividers.
2014-03-09 12:36:51 +01:00
Jan Djärv
e61a31bf99 * nsterm.h (MAC_OS_X_VERSION_10_9): Add.
* nsterm.m (constrainFrameRect:toScreen:): Constrain normally when frame
is only on one screen.

Fixes: debbugs:14713
2014-03-08 16:49:59 +01:00
Eli Zaretskii
281ae1808d src/xdisp.c (Fmove_point_visually): Fix previous change.
Fixes: debbugs:16961
2014-03-08 15:18:43 +02:00
Eli Zaretskii
2c65ad215a Fix more failures of visual-order cursor movement under word-wrap (bug#16961).
src/xdisp.c (move_it_in_display_line_to): If word-wrap is ON, and
 there's a valid wrap point in the display line, the last glyph
 cannot "just barely fit" on this row, because display_line doesn't
 let it.  Instead, proceed as if the last glyph didn't fit, so that
 we eventually back up the iterator to the wrap point.  This avoids
 delusional behavior of move_it_to, whereby it proceeds to the next
 display line, but sets current_x to zero for all the glyphs that
 without word-wrap would fit on the previous display line.  One
 result was that visual-order cursor movement behaved erratically
 under word-wrap.
 (Fmove_point_visually): Add code to find the x coordinate of the
 last character before wrap point, under word-wrap on a TTY.
2014-03-08 12:54:43 +02:00
Eli Zaretskii
b646ea12bd Fix bug #16961 with visual-order cursor movement and word-wrap.
src/xdisp.c (Fmove_point_visually): When under word-wrap, accept
 also return value of MOVE_POS_MATCH_OR_ZV from
 move_it_in_display_line_to, when moving from beginning of line to
 point's position.
2014-03-07 22:00:33 +02:00
Martin Rudalics
2c6053e838 Update docs for select-window and buffer-list-update-hook.
* buffer.c (Vbuffer_list_update_hook): Doc-string fix.
* window.c (Fselect_window): Explain NORECORD and
`buffer-list-update-hook' in doc-string.
* buffers.texi (The Buffer List): Rename node to Buffer List.
Describe `buffer-list-update-hook'.
* elisp.texi (Top): "The Buffer List" renamed to "Buffer List".
Add node for Window Dividers.
* hooks.texi (Standard Hooks): Add reference to
`buffer-list-update-hook'.
* windows.texi (Selecting Windows): Update description of
`select-window'.
2014-03-07 16:11:12 +01:00
Martin Rudalics
cac0a1d67e More window code related fixes and documentation changes.
* window.c (Fother_window_for_scrolling): Check that
Vother_window_scroll_buffer is a buffer.
* window.el (fit-frame-to-buffer, fit-frame-to-buffer-margins):
Fix doc-strings.
(fit-frame-to-buffer): New argument ONLY.  Remove dependency on
fit-frame-to-buffer variable.  Fix doc-string.
(fit-window-to-buffer): Set ONLY argument in call of
fit-frame-to-buffer.  Fix doc-string.
* frames.texi (Size and Position): Rewrite entries for
`fit-frame-to-buffer' and `fit-frame-to-buffer-margins'.  Add
description for `fit-frame-to-buffer-sizes'.
* windows.texi (Resizing Windows): Add descriptions for
pixelwise resizing.  Add entries for `window-resize-pixelwise'
and `fit-window-to-buffer-horizontally'.  Rewrite
`fit-window-to-buffer' entry.
2014-03-06 14:41:58 +01:00
Dmitry Antipov
12e852a208 * xterm.c (xim_initialize): Always pass a copy of resource name
to XRegisterIMInstantiateCallback and eassert whether return
value is True.  Passing copy is important because Xlib doesn't
make its own copy and resource name argument usually points to
SSDATA (Vx_resource_name), which may be changed from Lisp.
(xim_close_display): For XUnregisterIMInstantiateCallback,
always eassert return value and pass exactly the same values
as were used for XRegisterIMInstantiateCallback.  Otherwise
XUnregisterIMInstantiateCallback will always fail.  See Xlib
sources to check why if you are interested.
2014-03-06 15:18:22 +04:00
Martin Rudalics
e1a2cb1ce5 Various window code related fixes and documentation changes.
* dispnew.c (change_frame_size_1): Add new_lines instead of
new_height, the latter may be still zero if passed as such.
* window.c (Fwindow_pixel_height): Mention bottom divider in
doc-string.
* window.el (window-min-height, window-min-width): Rewrite
doc-strings.
(window-body-size): Add PIXELWISE argument to make it consistent
with its callees.
* display.texi (Window Dividers): New section.
* frames.texi (Layout Parameters): Add right-divider-width and
bottom-divider-width.
* windows.texi (Window Sizes): Redraw schematic and rewrite its
description.  Rewrite descriptions of `window-total-height',
`window-total-width', `window-total-size', `window-body-height',
`window-body-width' and `window-size-fixed'.  Add descriptions
for `window-pixel-height', `window-pixel-width',
`window-min-height' and `window-min-width'.  Remove description
of `window-size-fixed-p' moving part of it to that of
`window-size-fixed'.
(Resizing Windows): Mention dividers when talking about minimum
sizes.
2014-03-05 14:50:48 +01:00
Paul Eggert
e6e8a5eb4d Fix "resource temporarily unavailable" with xgselect.
* xgselect.c: Include <stdbool.h>.
(xg_select) [!USE_GTK]: Don't lose track of errno.

Fixes: debbugs:16925
2014-03-04 22:31:57 -08:00
Paul Eggert
d2f720acf5 Fix minor --enable-gcc-warnings issues.
* widget.c (update_various_frame_slots, EmacsFrameResize):
Avoid unused locals.  Prefer 'if' to '#if' when either will do.
2014-03-04 22:28:20 -08:00
Ken Brown
94a089b5f8 Further follow-up to last change in gmalloc.c.
* src/gmalloc.c (aligned_alloc): Clarify the code by making `adj'
represent the actual adjustment needed for alignment.
2014-03-04 14:02:49 -05:00
Eli Zaretskii
201572eca8 Follow-up improvements for last change in gmalloc.c.
src/gmalloc.c (aligned_alloc): Don't allocate more memory than
 needed, and don't reallocate if the initial allocation already
 fits the bill.  Suggested by Ken Brown <kbrown@cornell.edu>.

Fixes: debbugs:16901
2014-03-04 19:35:15 +02:00
YAMAMOTO Mitsuharu
a55130ca10 * xterm.c (x_draw_stretch_glyph_string): Reset clipping. (Bug#16932) 2014-03-04 20:02:36 +09:00
Michal Nazarewicz
5b87d0d9cd * binding.el: Add comment describing why C-d binds to `delete-char'.
* lisp/simple.el (delete-forward-char): Mark as interactive-only.
* src/cmds.c (delete-char): Update docstring pointing out that the
function ignores `delete-active-region' and `overwrite-mode'.
2014-03-03 22:14:11 -05:00
Eli Zaretskii
757c70af04 Fix bug #16930 with broken build --without-x.
src/font.c (Fframe_font_cache): Fix last change.
2014-03-03 21:58:20 +02:00
Eli Zaretskii
bd650c2420 Fix crashes in lisp_align_free in a build with GC_MCHECK.
src/gmalloc.c (aligned_alloc): Fix adjustment of size of the
 allocated buffer due to alignment.
 (freehook): If the block to be freed was allocated by
 'aligned_alloc', find its real pointer before calling 'free'.
 (mabort) [emacs]: Call 'emacs_abort', not 'abort', to provide a
 backtrace.

Fixes: debbugs:16901
2014-03-03 18:46:36 +02:00
Dmitry Antipov
19dae293f9 Avoid crashes when X fonts are erroneously freed on reused X
'Display *' connection data (Bug#16069).  Note that X font
resources still may be leaked, but currently there is no way
to completely avoid it.
* xterm.h (struct x_display_info): New member x_id.  Add comments.
* xterm.c (x_display_id): New variable.
(x_term_init): Assign identifier to each opened X connection.
* xfont.c (struct xfont): New member x_display_id.
(xfont_open): Initialize it with frame's display id.
(xfont_close): Check whether font's display id matches the one
recorded for the given display.  Adjust comment.
* xftfont.c (struct xftfont_info):
(xftfont_open, xftfont_close): Exactly as above with xfont stuff.
2014-03-03 12:27:58 +04:00
Dmitry Antipov
8c1c761122 * font.c (toplevel): Adjust comment about font cache layout.
(font_clear_cache): Fix to match real font cache layout.
Suggested by <namespace_collision@yahoo.com> in Bug#16069.
(Fframe_font_cache) [FONT_DEBUG]: New function.
(syms_of_font) [FONT_DEBUG]: Defsubr it.
2014-03-03 11:46:08 +04:00
Juanma Barranquero
35e951cd4b */ChangeLog: Trivial fixes. 2014-03-03 05:57:26 +01:00