Merge from emacs-24; up to 2014-05-08T03:34:20Z!rgm@gnu.org

diff --cc doc/lispref/ChangeLog
index 0475635,3a82523..2400c6a
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,9 +1,9 @@@
 -2014-05-07  Paul Eggert  <eggert@cs.ucla.edu>
++2014-05-08  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * internals.texi (C Dialect): New section.
+       (C Integer Types): Mention bool_bf.
+ 
 -2014-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 +2014-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * processes.texi (Filter Functions, Sentinels): Advertise add-function.
  

diff --cc doc/misc/ChangeLog
index cdaa6b4,ded2386..9908b15
--- 1/doc/misc/ChangeLog
--- 2/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,4 -1,9 +1,9 @@@
 -2014-05-06  Michael Albinus  <michael.albinus@gmx.de>
++2014-05-08  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * tramp.texi (Frequently Asked Questions): Mention HISTFILE
+       setting in ~/.ssh/environment.
+ 
 -2014-05-02  Stephen Berman  <stephen.berman@gmx.net>
 +2014-05-04  Stephen Berman  <stephen.berman@gmx.net>
  
        * todo-mode.texi: Update, improve exposition, add cross
        references, fix typos.

diff --cc doc/misc/cl.texi
Simple merge

diff --cc doc/misc/emacs-mime.texi
Simple merge

diff --cc doc/misc/gnus.texi
Simple merge

diff --cc doc/misc/message.texi
Simple merge

diff --cc lib-src/ChangeLog
Simple merge

diff --cc lisp/ChangeLog
index bdf4e46,333bc7f..4111e3d
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,21 -1,82 +1,99 @@@
 -2014-05-07  Stephen Berman  <stephen.berman@gmx.net>
+ 2014-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * xt-mouse.el: Drop spurious/oddly shaped events (bug#17378).
+       (xterm-mouse--read-event-sequence-1000): Return nil if something
+       looks fishy.
+       (xterm-mouse-event): Propagate it.
+       (xterm-mouse-translate-1): Handle it.
+ 
 -2014-05-06  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-05-08  Stephen Berman  <stephen.berman@gmx.net>
+ 
+       * calendar/todo-mode.el (todo-insert-item--apply-args): When all
+       four slots of the parameter list are filled, make sure to pass it
+       to the argument list of todo-insert-item--basic.
+ 
 -2014-05-06  Eli Zaretskii  <eliz@gnu.org>
++2014-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * emacs-lisp/package.el (package-compute-transaction): Topological sort.
+       Add optional `seen' argument to detect and break infinite loops.
+ 
 -2014-05-06  Michael Albinus  <michael.albinus@gmx.de>
++2014-05-08  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * emacs-lisp/find-gc.el (find-gc-unsafe, find-unsafe-funcs)
+       (trace-unsafe, trace-use-tree): Make parentheses style be
+       according to Emacs style.
+ 
 -2014-05-06  Glenn Morris  <rgm@gnu.org>
++2014-05-08  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * net/tramp-sh.el (tramp-remote-process-environment):
+       Remove HISTFILE and HISTSIZE; it's too late to set them here.
+       Add :version entry.
+       (tramp-open-shell): Do not let-bind `tramp-end-of-output'.
+       Add "HISTSIZE=/dev/null" to the shell's env arguments.  Do not send
+       extra "PSx=..." commands.
+       (tramp-maybe-open-connection): Setenv HISTFILE to /dev/null.
+       (Bug#17295)
+ 
+       (tramp-uudecode): Replace the hard-coded temporary file name by a
+       format specifier.
+       (tramp-remote-coding-commands): Enhance docstring.
+       (tramp-find-inline-encoding): Replace "%t" by a temporary file
+       name.  (Bug#17415)
+ 
 -2014-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-05-08  Glenn Morris  <rgm@gnu.org>
+ 
+       * emacs-lisp/find-gc.el (find-gc-source-directory): Give it a value.
+       (find-gc-source-files): Update some names.
+       (trace-call-tree): Simplify and update.
+       Avoid predictable temp-file names.  (http://bugs.debian.org/747100)
+ 
 -2014-05-05  Dmitry Gutov  <dgutov@yandex.ru>
++2014-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * minibuffer.el (completion--try-word-completion): Revert fix for
+       Bug#15980 (bug#17375).
+ 
+       * xt-mouse.el (xterm-mouse--read-event-sequence-1000): (bug#17378)
+       Always store button numbers in the same way in xterm-mouse-last;
+       Don't burp is xterm-mouse-last is not set as expected.
+       Never return negative indices.
+ 
 -2014-05-05  Glenn Morris  <rgm@gnu.org>
++2014-05-08  Dmitry Gutov  <dgutov@yandex.ru>
+ 
+       * progmodes/ruby-mode.el (ruby-syntax-propertize-function):
+       Backtrack one char if the global/char-literal var matcher hits
+       inside a string.  The next char could be the beginning of an
+       expression expansion.
+ 
 -2014-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-05-08  Glenn Morris  <rgm@gnu.org>
+ 
+       * help-fns.el (describe-function-1): Test for an autoload before a
+       macro, since `macrop' works on autoloads.  (Bug#17410)
+ 
 -2014-05-03  Eli Zaretskii  <eliz@gnu.org>
++2014-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * electric.el (electric-indent-functions-without-reindent): Add yaml.
+ 
+       * minibuffer.el (completion-table-with-quoting) <completion--unquote>:
+       Make sure the new point we return is within the new string (bug#17239).
+ 
 +2014-05-05  Daniel Colascione  <dancol@dancol.org>
 +
 +      * progmodes/compile.el (compilation-error-regexp-alist-alist):
 +      Port `gnu' pattern to rx.
 +
 +2014-05-05  Jarek Czekalski  <jarekczek@poczta.onet.pl>
 +
 +      Remove unneeded prompt when closing a buffer with active
 +      emacsclient ("Buffer ... still has clients"), #16548.
 +      * server.el (server-start): Remove the only call to:
 +      (server-kill-buffer-query-function): Remove.
 +
 +2014-05-04  Leo Liu  <sdl.web@gmail.com>
 +
 +      * calendar/diary-lib.el (calendar-chinese-month-name-array):
 +      Defvar to pacify compiler.
 +
 +2014-05-04  Eli Zaretskii  <eliz@gnu.org>
  
        * mail/rmailsum.el (rmail-new-summary-1): Fix a typo in a comment.
  
@@@ -84,10 -145,10 +162,10 @@@
        (todo-edit-done-item--param-key-alist): New defconsts.
        (todo-edit-item--prompt): New variable.
        (todo-edit-item--next-key): New function.
-       (todo-key-bindings-t): Bind "e" to todo-edit-item.  Remove
-       bindings of deleted commands.
+       (todo-key-bindings-t): Bind "e" to todo-edit-item.
+       Remove bindings of deleted commands.
  
 -2014-05-02  Leo Liu  <sdl.web@gmail.com>
 +2014-05-04  Leo Liu  <sdl.web@gmail.com>
  
        * emacs-lisp/cl-macs.el (cl-deftype): Fix indentation.
  

diff --cc lisp/gnus/ChangeLog
index 759a49a,5c490c4..8cc7397
--- 1/lisp/gnus/ChangeLog
--- 2/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@@ -1,4 -1,9 +1,9 @@@
 -2014-05-06  Glenn Morris  <rgm@gnu.org>
++2014-05-08  Glenn Morris  <rgm@gnu.org>
+ 
+       * gnus-fun.el (gnus-grab-cam-face):
+       Do not use predictable temp-file name.  (http://bugs.debian.org/747100)
+ 
 -2014-05-01  Glenn Morris  <rgm@gnu.org>
 +2014-05-04  Glenn Morris  <rgm@gnu.org>
  
        * gnus-registry.el (gnus-registry-install-p): Doc fix.
  

diff --cc lisp/gnus/gnus-fun.el
Simple merge

diff --cc lisp/help-fns.el
Simple merge

diff --cc lisp/minibuffer.el
Simple merge

diff --cc lisp/xt-mouse.el
Simple merge

diff --cc src/ChangeLog
index 3aef0c7,3d58769..72e7872
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,22 -1,34 +1,48 @@@
 -2014-05-07  Paul Eggert  <eggert@cs.ucla.edu>
++2014-05-08  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * minibuf.c (read_minibuf): Avoid C99ism in previous patch (Bug#17430).
+ 
 -2014-05-07  Jarek Czekalski  <jarekczek@poczta.onet.pl>
++2014-05-08  Jarek Czekalski  <jarekczek@poczta.onet.pl>
+ 
+       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-06  Samuel Bronson  <naesten@gmail.com>
++2014-05-08  Samuel Bronson  <naesten@gmail.com>
+ 
+       * keyboard.c (Frecursive_edit): Ensure inc&dec of command_loop_level
+       are matched (bug#17413).
+ 
 -2014-05-06  Jarek Czekalski  <jarekczek@poczta.onet.pl>
++2014-05-08  Jarek Czekalski  <jarekczek@poczta.onet.pl>
+ 
+       Stop tooltips pulling Emacs window to front (Bug#17408).
+       * w32fns.c (Fx_show_tip): Add SWP_NOOWNERZORDER flag to
+       SetWindowPos invocations.
+ 
 -2014-05-05  Jan Djärv  <jan.h.d@swipnet.se>
++2014-05-08  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * nsselect.m (Fx_selection_exists_p): Just return Qnil if window system
+       not initialized (Bug#17398).
+ 
 +2014-05-07  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * image.c: Include <png.h> before <setjmp.h> (Bug#17429).
 +
 +2014-05-06  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * 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-04  Paul Eggert  <eggert@cs.ucla.edu>
  
 -      Revert recent libpng changes (Bug#17339).
 -      * Makefile.in (PNG_CFLAGS): Remove; all uses removed.
 -      * image.c [HAVE_LIBPNG_PNG_H]: Include <libpng/png.h>, not <png.h>.
 +      Consult libpng-config more consistently (Bug#17339).
 +      * Makefile.in (PNG_CFLAGS): New var.
 +      (ALL_CFLAGS): Use it.
 +      * image.c [HAVE_PNG]: Don't worry about <libpng/png.h>, as
 +      CFLAGS now handles this.
  
  2014-05-03  Paul Eggert  <eggert@cs.ucla.edu>
  

diff --cc src/keyboard.c
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc test/ChangeLog
index 29e299e,d19a04e..5cb8aae
--- 1/test/ChangeLog
--- 2/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,10 -1,17 +1,24 @@@
 -2014-05-05  Dmitry Gutov  <dgutov@yandex.ru>
+ 2014-05-08  Glenn Morris  <rgm@gnu.org>
+ 
+       * automated/vc-bzr.el (vc-bzr-test-bug9726, vc-bzr-test-bug9781)
+       (vc-bzr-test-faulty-bzr-autoloads): Disable bzr logging.
+ 
 -      * automated/ruby-mode-tests.el
 -      (ruby-interpolation-after-dollar-sign): New test.
++2014-05-08  Dmitry Gutov  <dgutov@yandex.ru>
+ 
 -2014-05-05  Glenn Morris  <rgm@gnu.org>
++      * automated/ruby-mode-tests.el (ruby-interpolation-after-dollar-sign):
++      New test.
+ 
++2014-05-08  Glenn Morris  <rgm@gnu.org>
+ 
+       * automated/help-fns.el: New file.
+ 
 +2014-05-01  Barry O'Reilly  <gundaetiapo@gmail.com>
 +
 +      * automated/undo-tests.el (undo-test-region-deletion): New test to
 +      demonstrate bug#17235.
 +      (undo-test-region-example): New test to verify example given in
 +      comments for undo-make-selective-list.
 +
  2014-04-25  Michael Albinus  <michael.albinus@gmx.de>
  
        * automated/tramp-tests.el (top):