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

35822 commits

Author SHA1 Message Date
Glenn Morris
bbbabffe06 Merge from emacs-24; up to 2014-05-12T06:15:47Z!rgm@gnu.org 2014-05-11 23:59:30 -07:00
Glenn Morris
970fd40117 * src/fileio.c (Ffile_executable_p): Doc tweak. 2014-05-10 19:30:57 -07:00
Jan Djärv
4a5c71d7c2 * xsettings.c (init_gsettings): Use g_settings_schema_source_lookup
instead of deprecated g_settings_list_schemas if possible.

Fixes: debbugs:17434
2014-05-10 12:42:08 +02:00
Glenn Morris
fb3f83f5fd Merge from emacs-24; up to 2014-05-08T03:34:20Z!rgm@gnu.org 2014-05-07 20:41:21 -07:00
Paul Eggert
d1ff9ee403 * minibuf.c (read_minibuf): Avoid C99ism in previous patch.
Fixes: debbugs:17430
2014-05-07 12:28:09 -07:00
Paul Eggert
1ba38c429f * image.c: Include <png.h> before <setjmp.h>.
Fixes: debbugs:17429
2014-05-07 11:20:18 -07:00
Jarek Czekalski
73b60c4af9 Fix initialization of minibuffer history variable, bug #17430.
* minibuf.c (read_minibuf): Initialize histval to Qnil if unbound.
	Move the initialization up to prevent any "value void" message.
2014-05-07 17:03:47 +02:00
Paul Eggert
f62bc934f0 * image.c: Do not use libpng if HAVE_NS, as NS does its own thing.
[HAVE_NS]: Do not include png.h.
(x_query_frame_background_color): New function.
(png_load_body, imagemagick_load_image, svg_load_image): Use it.
(png_load_body): Coalesce duplicate code.
2014-05-06 14:13:37 -07:00
Samuel Bronson
8e102bcc97 * src/keyboard.c (Frecursive_edit): Ensure inc&dec of command_loop_level
are matched.

Fixes: debbugs:17413
2014-05-06 12:16:57 -04:00
Jarek Czekalski
863f07dea0 Fix tooltips pulling Emacs window to front on windows-nt, bug #17408.
* w32fns.c (Fx_show_tip): Add SWP_NOOWNERZORDER flag to
  SetWindowPos invocations.
2014-05-06 18:00:30 +02:00
Jan Djärv
879e36286d * nsselect.m (Fx_selection_exists_p): Just return Qnil if window system
not initialized.

Fixes: debbugs:17398
2014-05-05 19:37:43 +02:00
Paul Eggert
f8c2cef5e6 Consult libpng-config more consistently.
This is mainly for simplicity, but it should also avoid
some future problems like the ones we recently had with NetBSD.
* configure.ac (LIBPNG): Configure after LIBZ.  Use libpng-config
for cflags, too.  Append -lz if we're not already doing that with
LIBZ.  Do not bother appending -lm, since we always append that.
Coalesce some duplicate code.
* src/Makefile.in (PNG_CFLAGS): New var.
(ALL_CFLAGS): Use it.
* src/image.c [HAVE_PNG]: Don't worry about <libpng/png.h>, as
CFLAGS now handles this.

Fixes: debbugs:17339
2014-05-04 14:28:08 -07:00
Paul Eggert
3e9fa60a5c Merge from emacs-24; up to 2014-05-04T21:18:30Z!eggert@cs.ucla.edu 2014-05-04 12:37:56 -07:00
Paul Eggert
61febcb6e3 Revert recent libpng changes.
They fix only bugs that aren't being reported, so it may be better
to do them on the trunk.
* configure.ac (PNG_CFLAGS): Remove.  All uses removed.
(LIBPNG): Don't be consistent about -lpng16 versus -lpng.
Ignore libpng-config's exit status.  Always append -lz -lm.
* src/Makefile.in (PNG_CFLAGS): Remove; all uses removed.
* src/image.c [HAVE_LIBPNG_PNG_H]: Include <libpng/png.h>, not <png.h>.

Fixes: debbugs:17339
2014-05-04 11:51:32 -07:00
Paul Eggert
d355cad6b7 Handle systems without WCONTINUED consistently.
* lib-src/emacsclient.c (WCONTINUED): Move to ../src/syswait.h.
* src/process.c (handle_child_signal): Remove WCONTINUED ifdef,
because WCONTINUED is always defined now.
* src/syswait.h (WCONTINUED): Move here from ../lib-src/emacsclient.c.

Fixes: debbugs:15110 debbugs:17339
2014-05-03 13:13:10 -07:00
Eli Zaretskii
74a9022aba Minor fixes for comments.
src/buffer.c (overlay_strings): Fix the wording of the commentary.

 lisp/mail/rmailsum.el (rmail-new-summary-1): Fix a typo in a comment.
2014-05-03 11:47:50 +03:00
Paul Eggert
6f074205d3 Consult libpng-config more consistently.
* configure.ac (edit_cflags): Move this up and to the top level,
so that PNG_CFLAGS can use it too.
(PNG_CFLAGS): New var.
(png_longjmp): Use PNG_CFLAGS when checking.
(LIBPNG): Be consistent about -lpng16 etc; e.g., don't use -lpng16
in some places and -lpng in others.  Test libpng-config's exit
status.  If it succeeds, use its output rather than appending -lz -lm.
* src/Makefile.in (PNG_CFLAGS): New var.
(ALL_CFLAGS): Use it.
* src/image.c [HAVE_PNG]: Don't worry about <libpng/png.h>, as
CFLAGS now handles this.

Fixes: debbugs:17339
2014-05-02 12:34:03 -07:00
Glenn Morris
d136f18462 Doc fixes
* doc/misc/autotype.texi (Skeleton Language):
* doc/misc/message.texi (Header Commands):
* lisp/allout-widgets.el (allout-widgets-tally)
(allout-decorate-item-guides):
* lisp/menu-bar.el (menu-bar-positive-p):
* lisp/minibuffer.el (completion-pcm-complete-word-inserts-delimiters):
* lisp/cedet/ede.el (ede-project-directories, ede-check-project-directory):
* lisp/cedet/semantic/ia-sb.el (semantic-ia-sb-show-doc):
* lisp/cedet/semantic/tag.el (semantic-tag-in-buffer-p):
* lisp/cedet/semantic/bovine/c.el (semantic-tag-abstract-p):
* lisp/gnus/gnus-registry.el (gnus-registry-install-p): Doc fix.
* lisp/progmodes/gdb-mi.el (gdbmi-same-start, gdbmi-is-number):
* lisp/progmodes/js.el (js--inside-param-list-p)
(js--inside-dojo-class-list-p, js--forward-destructuring-spec):
* lisp/progmodes/prolog.el (region-exists-p):
* lisp/progmodes/verilog-mode.el (verilog-scan-cache-ok-p):
* lisp/textmodes/reftex-parse.el (reftex-using-biblatex-p):
* lisp/url/url-parse.el (url-generic-parse-url):
* src/floatfns.c (Fisnan):
* src/profiler.c (Fprofiler_cpu_running_p):
Doc fixes (replace `iff').

Fixes: debbugs:17309
2014-05-01 19:55:25 -04:00
Eli Zaretskii
28c05b699f src/term.c (tty_menu_activate): A better initialization for cursor coordinates. 2014-05-01 18:59:42 +03:00
Stefan Monnier
23c931aa24 * src/intervals.c: Tighten assertions.
(create_root_interval): Make sure the interval is not empty.
(intervals_equal): Use booleans.
(rotate_right, rotate_left): Check LENGTHs rather than TOTAL_LENGTH.
(balance_an_interval): Sanity check LENGTHs and TOTAL_LENGTHs.
(balance_possible_root_interval): Simplify and use booleans.
(split_interval_right, split_interval_left): Check LENGTH, and remove
now redundant assertion.
(adjust_intervals_for_insertion): Remove now redundant assertions.
(delete_node, interval_deletion_adjustment)
(adjust_intervals_for_deletion, merge_interval_right)
(merge_interval_left): Check LENGTH rather than TOTAL_LENGTH.
(reproduce_interval): Make sure the interval is not empty.
2014-05-01 11:15:46 -04:00
Juanma Barranquero
09b911adf4 Merge from emacs-24; up to 2014-05-01T10:21:17Z!rgm@gnu.org 2014-04-30 21:54:52 +02:00
Paul Eggert
bc6cb3efd0 * term.c (tty_menu_activate): Don't assume row and col are initialized.
GCC 4.9.0 warned about this, and I couldn't easily prove to my own
satisfaction that they would always be initialized.
2014-04-30 10:54:27 -07:00
Eli Zaretskii
a55ea27f60 Place hardware TTY cursor at the active menu item when displaying a menu.
src/term.c (tty_menu_display): Move the cursor to the active menu
 item.
 (tty_menu_activate): Return the cursor to the active menu item
 after displaying the menu and after displaying help-echo.  See
 http://lists.gnu.org/archive/html/emacs-devel/2014-04/msg00402.html
 for the details of why this is needed by screen readers and
 Braille displays.
2014-04-29 18:33:37 +03:00
Stefan Monnier
4d89ee379a * src/window.c (struct saved_window): Remove mark.
(Fset_window_configuration, save_window_save)
(compare_window_configurations): Don't touch marks any more.
* doc/lispref/windows.texi (Window Configurations, Window Configurations):
Window configs don't store marks any more.
2014-04-29 11:16:07 -04:00
Glenn Morris
4a25c1cb1e * src/process.c (handle_child_signal): Handle systems without WCONTINUED
Fixes: debbugs:15110
2014-04-29 08:12:36 -07:00
Paul Eggert
9c23779a9d Use bits_word for gcmarkbits.
* alloc.c (struct cons_block, struct float_block): On 64-bit hosts,
bits_word is typically a tad more efficient for mark bits than
unsigned is, so use bits_word.  All uses changed.
* lisp.h (BITS_PER_INT): Remove; no longer used.
2014-04-28 09:59:41 -07:00
Paul Eggert
6ab1b16c54 Avoid undefined behavior in signed left shift.
This ports to GCC 4.9.0 with -fsanitize=undefined.
* alloc.c (bool_vector_fill, SETMARKBIT, UNSETMARKBIT):
* data.c (Fash):
* regex.c (extract_number):
* lisp.h (make_number, XINT):
Do not shift a 1 bit left into a sign bit.
* alloc.c (struct cons_block, struct float_block): Use unsigned,
not int, for gcmarkbits.  All uses changed.
2014-04-27 18:29:44 -07:00
Juanma Barranquero
dff4a9f6a4 Merge from emacs-24; up to 2014-04-25T10:35:01Z!michael.albinus@gmx.de 2014-04-25 18:11:07 +02:00
Stefan Monnier
8917710efd * src/window.c (Fset_window_configuration): Deactivate the mark before
unsetting the mark.
(set_window_buffer): Ignore window_initialized.
(window_initialized): Remove.
* src/keyboard.c (Qdeactivate_mark): Not static any more.
* src/buffer.c (buffer_local_value): Rename from buffer_local_value_1.
Update all callers.
2014-04-23 23:59:19 -04:00
Paul Eggert
417c9bcba1 * conf_post.h (ADDRESS_SANITIZER_WORKAROUND): Port to GCC 4.9.0
and to clang 3.4, which have fixed the bug.  This should let us
run a bit faster on these platforms when address sanitization is
in effect.
2014-04-23 11:23:28 -07:00
Eli Zaretskii
80d982d7ad Fix debugging code for checking the newline cache.
src/search.c (Fnewline_cache_check): Don't try to count newlines
 outside the buffer's restriction, as find_newline doesn't support
 that.
2014-04-23 18:21:25 +03:00
Paul Eggert
42e910349d Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu 2014-04-22 14:32:51 -07:00
Paul Eggert
34e856d5ac Port to GCC 4.9.0 with --enable-gcc-warnings.
* image.c (struct my_jpeg_error_mgr) [lint]: Remove member fp.
All uses removed.
(jpeg_load_body) [lint]: Add a 'volatile' to pacify a buggy GCC in
a way that also works with GCC 4.9.0.
2014-04-22 13:19:17 -07:00
Paul Eggert
0fae5004bc * search.c (Fnewline_cache_check): Remove unused locals. 2014-04-22 13:13:59 -07:00
Eli Zaretskii
2f999d5275 Add debugging facility for the newline cache.
See the discussion in
http://lists.gnu.org/archive/html/emacs-devel/2014-04/msg00295.html
for more detail.

 src/search.c (find_newline1): New subroutine.
 (Fnewline_cache_check): New function.
 (syms_of_search): Defsubr it.
2014-04-22 20:37:35 +03:00
Daniel Colascione
12b1389c90 Correctly macroexpand top-level forms during eager macroexpand
* lisp/emacs-lisp/byte-run.el (eval-when-compile, eval-and-compile):
Improve docstrings.

* lisp/emacs-lisp/macroexp.el (internal-macroexpand-for-load): Add
`full-p' parameter; when nil, call `macroexpand' instead of
`macroexpand-all'.

* src/lread.c (readevalloop_eager_expand_eval): New function
that can recurse into toplevel forms.
(readevalloop): Call it.
* src/lisp.h: Declare Qprogn.
* src/callint.c (Qprogn): No longer static.

* test/automated/bytecomp-tests.el (test-byte-comp-compile-and-load):
Add compile flag.
(test-byte-comp-macro-expansion)
(test-byte-comp-macro-expansion-eval-and-compile)
(test-byte-comp-macro-expansion-eval-when-compile)
(test-byte-comp-macro-expand-lexical-override): Use it.
(test-eager-load-macro-expansion)
(test-eager-load-macro-expansion-eval-and-compile)
(test-eager-load-macro-expansion-eval-when-compile)
(test-eager-load-macro-expand-lexical-override): New tests.
2014-04-22 00:04:34 -07:00
Jarek Czekalski
6709d4dab9 Fix freezing with scroll bars of GTK3 Toolkit.
* src/keyboard.c (unblock_input): Add comment.
* src/xgselect.c (xg_select): Prevent Glib main loop recursion.

Fixes: debbugs:15801
2014-04-21 11:55:28 -04:00
Paul Eggert
4fa20d8f8d Spelling fixes. 2014-04-20 17:31:59 -07:00
Daniel Colascione
6dfa19c50f Merge from emacs-24; up to 2014-04-17T02:05:48Z!eggert@cs.ucla.edu 2014-04-19 13:32:05 -07:00
Stefan Monnier
d7b659bb06 * src/intervals.c (rotate_right, rotate_left): Fix up length computation.
Also change identifiers to match the comments, and add more assertions.

Fixes: debbugs:16234
2014-04-19 14:13:26 -04:00
Juanma Barranquero
bba633792b Merge from emacs-24; up to 2014-04-16T15:28:06Z!eggert@cs.ucla.edu 2014-04-19 01:36:51 +02:00
Eli Zaretskii
ea0ca0f458 Fix bug #17288 with inserting left truncation glyph under linum-mode.
src/xdisp.c (insert_left_trunc_glyphs): Ensure the left truncation
 glyph is written to TEXT_AREA of the temporary glyph_row.
2014-04-18 11:35:09 +03:00
Eli Zaretskii
ad62a11591 src/ChangeLog: Add header line to recent MSDOS-related entries. 2014-04-18 10:52:18 +03:00
Paul Eggert
3155951737 * emacs.c (close_output_streams): Don't clear and restore errno. 2014-04-17 23:40:15 -07:00
Paul Eggert
f0496348d1 * term.c (tty_send_additional_strings): No need to fflush here,
as callers fflush.
(tty_set_terminal_modes): fflush after sending additional strings,
not before.
2014-04-17 07:59:22 -07:00
Jan Djärv
53e46f3ad6 Prevent endless loop in x_make_frame_visible.
* xterm.c (x_make_frame_visible): Prevent endless loop when frame
never becomes visible, i.e. using XMonad .

Fixes: debbugs:17237
2014-04-17 11:07:58 +02:00
Eli Zaretskii
8915b84286 Fix bug #17281 with infloop in line-pixel-height.
src/xdisp.c (Fline_pixel_height): Don't assume that the current
 buffer and the selected window's buffer are one and the same.
2014-04-17 11:58:59 +03:00
Daniel Colascione
bfc3079068 2014-04-17 Daniel Colascione <dancol@dancol.org>
Add support for bracketed paste mode; add infrastructure for
	managing terminal mode enabling and disabling automatically.

	* xt-mouse.el:
	(xterm-mouse-mode): Simplify.
	(xterm-mouse-tracking-enable-sequence)
	(xterm-mouse-tracking-disable-sequence): New constants.
	(turn-on-xterm-mouse-tracking-on-terminal)
	(turn-off-xterm-mouse-tracking-on-terminal): Use
	tty-mode-set-strings and tty-mode-reset-strings terminal
	parameters instead of random hooks.
	(turn-on-xterm-mouse-tracking)
	(turn-off-xterm-mouse-tracking): Delete.

	* term/xterm.el (xterm-extra-capabilities): Fix bitrotted comment.
	(xterm-paste-ending-sequence): New constant.
	(xterm-paste): New command used for bracketed paste support.

	(xterm-modify-other-keys-terminal-list): Delete obsolete variable.
	(terminal-init-xterm-bracketed-paste-mode): New function.
	(terminal-init-xterm): Call it.
	(terminal-init-xterm-modify-other-keys): Use tty-mode-set-strings
	and tty-mode-reset-strings instead of random hooks.
	(xterm-turn-on-modify-other-keys)
	(xterm-turn-off-modify-other-keys)
	(xterm-remove-modify-other-keys): Delete obsolete functions.

	* term/screen.el: Rewrite to just use the xterm code.  Add
	copyright notice.  Mention tmux.
2014-04-17 00:54:23 -07:00
Eli Zaretskii
f76da67d40 Fix bug #17269 with corruption of the newline cache.
src/insdel.c (invalidate_buffer_caches): Invalidate the bidi
 paragraph-start cache before the newline cache.
2014-04-17 10:24:40 +03:00
Paul Eggert
290d7ac277 Merge from emacs-24; up to 2014-04-16T15:28:26Z!monnier@iro.umontreal.ca 2014-04-16 12:43:46 -07:00