From: Glenn Morris Date: Sat, 12 Jul 2014 17:53:29 +0000 (-0700) Subject: Merge from emacs-24; up to 2014-06-22T05:00:14Z!dmantipov@yandex.ru X-Git-Tag: emacs-25.0.90~2636^2~28 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b39c4d7b33952e0125fbefbcb3d9f528b6570f40;p=emacs.git Merge from emacs-24; up to 2014-06-22T05:00:14Z!dmantipov@yandex.ru --- b39c4d7b33952e0125fbefbcb3d9f528b6570f40 diff --cc ChangeLog index f763607537f,cdf4152bc0a..5e6822737f1 --- a/ChangeLog +++ b/ChangeLog @@@ -1,24 -1,8 +1,28 @@@ -2014-07-11 Paul Eggert ++2014-07-12 Paul Eggert + + * Makefile.in (install-arch-indep): Avoid readdir race (Bug#17971). + -2014-06-20 Paul Eggert +2014-07-10 Dmitry Antipov + + * configure.ac: Check whether sys/sysinfo.h provides + Linux 'sysinfo' function and 'struct sysinfo' type. + +2014-06-28 Glenn Morris + + * configure.ac (lwlib_deps_frag, oldxmenu_deps_frag): New output files. + * make-dist (lwlib, oldXMenu): Distribute *.mk. + +2014-06-27 Glenn Morris + + * Makefile.in (src): No more need to pass BOOTSTRAPEMACS. + + * make-dist: Exclude test/automated/*.log. + +2014-06-26 Glenn Morris + + * Makefile.in (mostlyclean, clean): Maybe clean test/automated. + +2014-06-21 Paul Eggert * configure.ac: Warn about --enable-link-time-optimization's issues in --help message (Bug#17806). diff --cc lib-src/ChangeLog index 64a73027915,f204ab517e2..3a7d128b905 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@@ -1,45 -1,8 +1,49 @@@ + 2014-07-12 Paul Eggert + + * etags.c (Lisp_functions): Also record cl-defun etc. (Bug#17965) + -2014-05-20 Paul Eggert +2014-06-26 Glenn Morris + + * Makefile.in (blessmail): Depend on lisp/mail/blessmail.el. + Use $<, $@. + (regex.o, etags${EXEEXT}, ctags${EXEEXT}, ebrowse${EXEEXT}) + (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT}) + (pop.o, emacsclient${EXEEXT}, emacsclientw${EXEEXT}, ntlib.o) + (hexl${EXEEXT}, update-game-score${EXEEXT}, emacsclient.res): Use $<. + (ctags${EXEEXT}): Add $srcdir to dependency rather than using VPATH. + +2014-06-17 Paul Eggert + + Omit redundant extern decls. + * emacsclient.c (getenv): Remove decl. + * make-docfile.c (write_globals): Add ATTRIBUTE_CONST for + Fbyteorder, Ftool_bar_height, Fmax_char, Fidentity. + +2014-06-15 Glenn Morris + + * Makefile.in (LDFLAGS): Explicitly set via configure. + +2014-06-15 Eli Zaretskii + + * Makefile.in (CPPFLAGS): Define. + +2014-06-15 Glenn Morris + + * Makefile.in (../lib/libgnu.a): + Use `make -C' rather than `cd && make'. + + * Makefile.in (bootstrap-clean): New. + +2014-06-13 Glenn Morris + + * Makefile.in (../lib/libgnu.a): + GNU make automatically passes command-line arguments to sub-makes. + +2014-05-26 Eli Zaretskii + + * ntlib.h (lseek): Don't redirect to _lseek. + +2014-05-26 Paul Eggert Fix rcs2log problems with CVS. Problem reported by Glenn Morris in diff --cc lisp/ChangeLog index faa5a3dffff,e77058569d2..db1f0481d62 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,34 -1,43 +1,72 @@@ + 2014-07-12 Paul Eggert + + Fix bug: C-x v v discarded existing log message (Bug#17884). + * vc/vc-dispatcher.el (vc-log-edit): + Don't clobber an already-existing log message. + -2014-07-10 Glenn Morris ++2014-07-12 Glenn Morris + + * vc/log-edit.el (log-edit-changelog-entries): + Check for a visited-but-never-saved ChangeLog. + -2014-07-09 Stefan Monnier ++2014-07-12 Stefan Monnier + + * vc/log-edit.el (log-edit-changelog-entries): Don't both visiting + a non-existing file (bug#17970). + + * faces.el (face-name): Undo last change. + (x-resolve-font-name): Don't call face-name (bug#17956). + -2014-07-09 Fabián Ezequiel Gallina ++2014-07-12 Fabián Ezequiel Gallina + + Fix dedenters and electric colon handling. (Bug#15163) - + * progmodes/python.el + (python-rx-constituents): Add dedenter and block-ender. + (python-indent-dedenters, python-indent-block-enders): Delete. + (python-indent-context): Return new case for dedenter-statement. + (python-indent-calculate-indentation): Handle new case. + (python-indent-calculate-levels): Fix levels calculation for + dedenter statements. + (python-indent-post-self-insert-function): Fix colon handling. + (python-info-dedenter-opening-block-message): New function. + (python-indent-line): Use it. + (python-info-closing-block) + (python-info-closing-block-message): Remove. + (python-info-dedenter-opening-block-position) + (python-info-dedenter-opening-block-positions) + (python-info-dedenter-statement-p): New functions. + -2014-07-08 Stefan Monnier +2014-07-11 Dmitry Antipov + + * files.el (out-of-memory-warning-percentage): New defcustom. + (warn-maybe-out-of-memory): Use it. + +2014-07-11 Michael Albinus + + * subr.el (read-passwd): Use `read-hide-char' if non-nil. Bind it + when calling `read-string'. (Bug#17839) + +2014-07-10 Eli Zaretskii + + * files.el (warn-maybe-out-of-memory): Fix the wording of the + warning. + +2014-07-10 Dmitry Antipov + + * files.el (warn-maybe-out-of-memory): New function. + (find-file-noselect): Use it. + +2014-07-09 Sam Steingold + + * progmodes/cperl-mode.el (cperl-block-p): Treat the perl keyword + `constant' like `bless', `return' &c + +2014-07-09 Stefan Monnier + + * rect.el (apply-on-rectangle): Check forward-line really moved to the + next line. + +2014-07-09 Stefan Monnier * progmodes/sh-script.el (sh-smie-sh-rules): Don't align with a && in the middle of a line (bug#17896). diff --cc src/ChangeLog index 9d5dff49166,9051d37fcef..47b0927bbb7 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,114 -1,16 +1,124 @@@ 2014-07-12 Eli Zaretskii + * xdisp.c (display_line): Don't call FETCH_BYTE with argument less + than 1. (Bug#17962) + + * w32fns.c (Fx_file_dialog): Mention in the doc string the + behavior on Windows 7 and later when the function is repeatedly + invoked with the same value of DIR. (Bug#17950) + + * xfns.c (Fx_file_dialog) [USE_MOTIF, USE_GTK]: Update the doc + string to match the one in w32fns.c. + -2014-07-08 Eli Zaretskii + * minibuf.c (read_minibuf_noninteractive) [WINDOWSNT]: Switch + stdin to binary mode only if it is connected to a terminal. + +2014-07-11 Paul Eggert + + Coalesce extern decls. + * minibuf.c (emacs_get_tty, emacs_set_tty, suppress_echo_on_tty): + * sysdep.c (emacs_get_tty, emacs_set_tty): + Move duplicate extern decls from here ... + * systty.h: ... to here, so that there's just one copy. + +2014-07-11 Jan Djärv + + * nsterm.m (changeFont:): Add ifdef NS_IMPL_COCOA. + + * nsfns.m (Fns_popup_font_panel): Ditto. + +2014-07-11 Eli Zaretskii + + * minibuf.c (read_minibuf_noninteractive): Finish reading on '\r', + not only on '\n'. + [WINDOWSNT]: Switch stdin to binary mode when not echoing input. + + * sysdep.c (emacs_get_tty, emacs_set_tty, suppress_echo_on_tty) + [DOS_NT]: Implement for WINDOWSNT. + + * systty.h (struct emacs_tty) [DOS_NT]: The struct member is now + unsigned. + +2014-07-11 Michael Albinus + + * sysdep.c (suppress_echo_on_tty): New function. + * minibuf.c (read_minibuf_noninteractive): Use it. + +2014-07-11 Dmitry Antipov + + * alloc.c (Fmemory_info) [HAVE_LINUX_SYSINFO]: Return nil if + sysinfo failed. Adjust docstring. + +2014-07-11 Eli Zaretskii + + Implement memory-info for MS-DOS. + * dosfns.c (dos_memory_info): New function. + * dosfns.h (dos_memory_info): Add prototype. + * alloc.c (Fmemory_info) [MSDOS]: Call dos_memory_info. + * vm-limit.c (get_lim_data) [MSDOS]: Call dos_memory_info, instead + of doing some of its job. + + * minibuf.c (read_minibuf_noninteractive) [WINDOWSNT]: Don't + reference termios structure members. + +2014-07-11 Michael Albinus + + * sysdep.c (emacs_get_tty, emacs_set_tty): Make them externally visible. + + * minibuf.c (top): Include systty.h. Declare external + emacs_get_tty and emacs_set_tty. + (Vread_hide_char): New lisp variable. + (read_minibuf_noninteractive): Hide characters with + Vread_hide_char if it is a character. (Bug#17839) + +2014-07-10 Eli Zaretskii + + Implement memory-info for MS-Windows. + * w32.c (w32_memory_info): New function. + * w32.h (w32_memory_info): Prototype it. + * alloc.c (Fmemory_info) [WINDOWSNT]: Call it. + +2014-07-10 Dmitry Antipov + + * coding.h (struct coding_system): Remove 'error_positions' (unused) + and 'errors' (set but unused) fields. Use bitfields for 'eol_seen', + 'mode', 'common_flags' and 'result' fields, adjust layout to avoid + extra padding and shrink struct coding_system by 56 bytes (x86_64). + * coding.c (decode_coding_utf_8, decode_coding_utf_16) + (decode_coding_emacs_mule, decode_coding_iso_2022, decode_coding_sjis) + (decode_coding_big5, decode_coding_charset, decode_coding) + (encode_coding): Adjust users. + + * alloc.c (Fmemory_info): New function. + +2014-07-09 Paul Eggert + + * syntax.c (back_comment): Use more-natural location for label. + + * font.c, font.h (font_unparse_fcname): Now static. + Define only if HAVE_XFT || HAVE_FREETYPE || HAVE_NS. + +2014-07-09 Dmitry Antipov + + Next minor cleanup of font subsystem. + * font.h (enum font_property_index): Remove FONT_ENTITY_INDEX (no + users) and FONT_FORMAT_INDEX (set by a few font drivers but never + really used). + (FONT_ENTITY_NOT_LOADABLE, FONT_ENTITY_SET_NOT_LOADABLE): Remove; + unused. + * ftfont.h (ftfont_font_format): Remove prototype. + * ftfont.c (ftfont_font_format): Remove; now unused. + (ftfont_open): + * nsfont.m (nsfont_open): + * w32font.c (w32font_open_internal): + * w32uniscribe.c (uniscribe_open): + * xfont.c (xfont_open): + * xftfont.c (xftfont_open): All users changed. + + * coding.c (ALLOC_CONVERSION_WORK_AREA): Prefer ptrdiff_t to int and + so avoid integer overflow if decoded gap size exceeds INT_MAX bytes. + +2014-07-09 Eli Zaretskii * xdisp.c (move_it_to): Adjust calculation of line_start_x to what x_produce_glyphs does when it generates a stretch glyph that diff --cc test/ChangeLog index d4e7f818f1c,cf4ddc83544..6e2f89157e3 --- a/test/ChangeLog +++ b/test/ChangeLog @@@ -1,17 -1,44 +1,47 @@@ -2014-07-09 Fabián Ezequiel Gallina ++2014-07-12 Fabián Ezequiel Gallina + - * automated/python-tests.el - (python-indent-block-enders-1) ++ * automated/python-tests.el (python-indent-block-enders-1) + (python-indent-block-enders-2): Fix tests. - (python-indent-block-enders-3) - (python-indent-block-enders-4) - (python-indent-block-enders-5) - (python-indent-dedenters-1) ++ (python-indent-block-enders-3, python-indent-block-enders-4) ++ (python-indent-block-enders-5, python-indent-dedenters-1) + (python-indent-dedenters-2): Remove tests. - (python-indent-dedenters-1) - (python-indent-dedenters-2) - (python-indent-dedenters-3) - (python-indent-dedenters-4) - (python-indent-dedenters-5) - (python-indent-dedenters-6) ++ (python-indent-dedenters-1, python-indent-dedenters-2) ++ (python-indent-dedenters-3, python-indent-dedenters-4) ++ (python-indent-dedenters-5, python-indent-dedenters-6) + (python-indent-dedenters-7) + (python-info-dedenter-opening-block-position-1) + (python-info-dedenter-opening-block-position-2) + (python-info-dedenter-opening-block-position-3) + (python-info-dedenter-opening-block-positions-1) + (python-info-dedenter-opening-block-positions-2) + (python-info-dedenter-opening-block-positions-3) + (python-info-dedenter-opening-block-positions-4) + (python-info-dedenter-opening-block-positions-5) + (python-info-dedenter-opening-block-message-1) + (python-info-dedenter-opening-block-message-2) + (python-info-dedenter-opening-block-message-3) + (python-info-dedenter-opening-block-message-4) + (python-info-dedenter-opening-block-message-5) + (python-info-dedenter-statement-p-1) + (python-info-dedenter-statement-p-2) + (python-info-dedenter-statement-p-3) + (python-info-dedenter-statement-p-4) + (python-info-dedenter-statement-p-5): New tests. + +2014-07-08 Stefan Monnier -2014-07-01 Fabián Ezequiel Gallina + * indent/perl.perl: Add indentation pattern for hash-table entries. - * automated/python-tests.el - (python-tests-self-insert): New function. +2014-07-04 Michael Albinus + + * automated/dbus-tests.el (dbus-test02-register-service-session) + (dbus-test02-register-service-system): Fix docstring. + (dbus-test02-register-service-own-bus) + (dbus-test03-peer-interface): New tests. + +2014-07-03 Fabián Ezequiel Gallina + + * automated/python-tests.el (python-tests-self-insert): New function. (python-triple-quote-pairing): Use it. (python-util-forward-comment-1): New test. (Bug#17658)