Merge from emacs-24; up to 2014-04-25T10:35:01Z!michael.albinus@gmx.de

diff --cc doc/lispref/ChangeLog
index e9ea1f7,c2907cc..04b2e91
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,10 +1,10 @@@
 -2014-04-24  Eli Zaretskii  <eliz@gnu.org>
++2014-04-25  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * strings.texi (Text Comparison): Mention
+       equal-including-properties for when text properties of the strings
+       matter for comparison.
+ 
 -2014-04-21  Eli Zaretskii  <eliz@gnu.org>
 +2014-04-22  Eli Zaretskii  <eliz@gnu.org>
  
        * text.texi (Registers): Document register-read-with-preview.
  

diff --cc lisp/ChangeLog
index f1128b0,60543c6..4568c88
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,36 -1,39 +1,70 @@@
 -2014-04-24  Eli Zaretskii  <eliz@gnu.org>
++2014-04-25  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * tooltip.el (tooltip-show-help-non-mode, tooltip-show-help): Use
+       equal-including-properties to compare help-echo strings.  (Bug#17331)
+ 
 -2014-04-24  Leo Liu  <sdl.web@gmail.com>
++2014-04-25  Leo Liu  <sdl.web@gmail.com>
+ 
+       * emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table):
+       Fix syntax for @.  (Bug#17325)
+ 
 -2014-04-24  Daniel Colascione  <dancol@dancol.org>
++2014-04-25  Daniel Colascione  <dancol@dancol.org>
+ 
+       * emacs-lisp/cl.el (gv): Require gv early to break eager
+       macro-expansion cycles.
+ 
 -2014-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
++2014-04-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * simple.el (region-active-p): Check there's a mark (bug#17324).
+ 
+       * simple.el (completion-list-mode-map): Use choose-completion for the
+       mouse binding as well (bug#17302).
+       (completion-list-mode, completion-setup-function): Adjust docstring and
+       echo area message accordingly.
+       * progmodes/idlwave.el (idlwave-choose-completion): Adjust to new
+       calling convention of choose-completion.
+       * comint.el (comint-dynamic-list-completions):
+       * term.el (term-dynamic-list-completions): Accept choose-completion.
+ 
+       * progmodes/perl-mode.el (perl-syntax-propertize-function): Slash after
+       &, |, +, - and * can't be a division (bug#17317).
+ 
 -2014-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 -
+       * term/xterm.el (xterm--version-handler): Don't use modern xterm
+       features on gnome-terminal (bug#16988).
+ 
 +2014-04-25  Thien-Thi Nguyen  <ttn@gnu.org>
 +
 +      Improve Scheme font-locking for (define ((foo ...) ...) ...).
 +
 +      * progmodes/scheme.el (scheme-font-lock-keywords-1): To find
 +      the declared object, ignore zero or more parens, not zero or one.
 +
 +2014-04-24  Leo Liu  <sdl.web@gmail.com>
 +
 +      * progmodes/xscheme.el (xscheme-expressions-ring)
 +      (xscheme-expressions-ring-yank-pointer, xscheme-running-p)
 +      (xscheme-control-g-disabled-p, xscheme-process-filter-state)
 +      (xscheme-allow-output-p, xscheme-prompt)
 +      (xscheme-string-accumulator, xscheme-mode-string): Use defvar-local.
 +
 +      * progmodes/scheme.el (would-be-symbol, next-sexp-as-string):
 +      Comment out unused functions.
 +
 +2014-04-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * info.el: Use lexical-binding and cl-lib.
 +      Use defvar-local and setq-local instead of make-local-variable.
 +      (Info-apropos-matches): Avoid add-to-list.
 +      (Info-edit-mode-map): Fix obsolescence call to Info-edit-map.
 +
 +2014-04-24  Daniel Colascione  <dancol@dancol.org>
 +
 +      * progmodes/sh-script.el (sh-builtins): Add coproc to list of bash builtins.
 +
 +2014-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * emacs-lisp/cl-macs.el (cl--loop-let): Fix last merge.
 +
  2014-04-22  Michael Heerdegen  <michael_heerdegen@web.de>
  
        * dired.el (dired-insert-set-properties): Do not consider

diff --cc lisp/comint.el
Simple merge

diff --cc lisp/emacs-lisp/lisp-mode.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/term/xterm.el
Simple merge

diff --cc src/ChangeLog
index 654b942,0c8fa7b..9d4fd2d
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,20 -1,9 +1,26 @@@
 -2014-04-23  Eli Zaretskii  <eliz@gnu.org>
++2014-04-25  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * 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-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * window.c (Fset_window_configuration): Deactivate the mark before
 +      unsetting the mark.
 +      (set_window_buffer): Ignore window_initialized.
 +      (window_initialized): Remove.
 +      * keyboard.c (Qdeactivate_mark): Not static any more.
 +      * buffer.c (buffer_local_value): Rename from buffer_local_value_1.
 +      Update all callers.
 +
 +2014-04-23  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * 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-22  Paul Eggert  <eggert@cs.ucla.edu>
  
        Port to GCC 4.9.0 with --enable-gcc-warnings.

diff --cc src/search.c
Simple merge

diff --cc test/ChangeLog
index 7652e71,7d4e9d5..afc05d3
--- 1/test/ChangeLog
--- 2/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,3 -1,19 +1,17 @@@
 -2014-04-24  Michael Albinus  <michael.albinus@gmx.de>
 -
+ 2014-04-25  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * automated/tramp-tests.el (top):
+       * automated/file-notify-tests.el (top): Do not disable interactive
+       passwords in batch mode.
+       (password-cache-expiry): Set to nil.
+ 
+       * automated/file-notify-tests.el
+       (file-notify-test-remote-temporary-file-directory):
+       * automated/tramp-tests.el (tramp-test-temporary-file-directory):
+       Use a mock-up method as default.
+       (tramp-test00-availability): Print the used directory name.
+       (tramp-test33-recursive-load): Fix typo.
+ 
  2014-04-22  Michael Albinus  <michael.albinus@gmx.de>
  
        * automated/tramp-tests.el (tramp--test-check-files): Remove traces.