Merge from emacs-24; up to 2014-07-27T09:41:59Z!ttn@gnu.org

diff --cc INSTALL
index 4bda46cfbc0e6053801ad1cfc4a343d9ed091877,2f4f41773c1a532ed9ca61715665d6a641084d59..eb8857f9dfd870fbda94c6a99d4908906975955e
--- 1/INSTALL
--- 2/INSTALL
+++ b/INSTALL
@@@ -263,9 -246,9 +249,8 @@@ with the mouse.  You can get fancy 3D-s
  Gtk or Motif, if you have the Xaw3d library installed (see
  "Image support libraries" above for Xaw3d availability).
  
 -You can tell configure where to search for GTK by specifying
 -`--with-pkg-config-prog=PATH' where PATH is the pathname to
 -pkg-config.
 +You can tell configure where to search for GTK by giving it the
- argument PKG_CONFIG='/full/name/of/pkg-config'.  GTK version 2.6 or
- newer is required for Emacs.
++argument PKG_CONFIG='/full/name/of/pkg-config'.
  
  Emacs will autolaunch a D-Bus session bus, when the environment
  variable DISPLAY is set, but no session bus is running.  This might be

diff --cc lisp/ChangeLog
index f092ec6b5396c4fcfbdeb0502f4fb526d37c88ef,7e09336183c9712c85d19230cf9d5d3d37c80ca4..80157c67704f9821c747a3e73b966f00adcb7d6b
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,13 -1,22 +1,20 @@@
 -2014-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 -
 -      * emacs-lisp/lisp.el (lisp--local-variables-1): Handle `quote'.
 -      Backported (bug#18688).
 -
 -2014-10-14  Eli Zaretskii  <eliz@gnu.org>
++2014-10-15  Eli Zaretskii  <eliz@gnu.org>
+ 
 -      * emacs-lisp/tabulated-list.el (tabulated-list-mode):
 -      Force bidi-paragraph-direction to 'left-to-right'.  This fixes
++      * emacs-lisp/tabulated-list.el (tabulated-list-mode): Force
++      bidi-paragraph-direction to 'left-to-right'.  This fixes
+       buffer-menu display when the first buffer happens to start with
+       R2L letter.
+ 
 -2014-10-13  Glenn Morris  <rgm@gnu.org>
 +2014-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * progmodes/elisp-mode.el (elisp--local-variables-1):
 +      Handle quoted expressions (bug#18688).
  
 -      * emacs-lisp/authors.el (authors-aliases, authors-fixed-case)
 -      (authors-obsolete-files-regexps): Additions.
 -      (authors-no-scan-regexps): New constant.
 -      (authors-no-scan-file-p): New function.
 -      (authors): Respect authors-no-scan-file-p.
 +2014-10-14  Jérémy Compostella  <jeremy.compostella@intel.com>
 +          Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
 +      Reduce the amount of set environment variable commands.
  
  2014-10-12  Fabián Ezequiel Gallina  <fgallina@gnu.org>
  

diff --cc lisp/emacs-lisp/tabulated-list.el
Simple merge