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

4 files changed, 41 insertions, 22 deletions

diff --git a/INSTALL b/INSTALL
index 4bda46cfbc0..eb8857f9dfd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,5 @@
 GNU Emacs Installation Guide
-Copyright (C) 1992, 1994, 1996-1997, 2000-2014 Free Software Foundation,
-Inc.
+Copyright (C) 1992, 1994, 1996-1997, 2000-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -34,9 +33,9 @@ some of the steps manually.  The more detailed description in the other
 sections of this guide will help you do that, so please refer to those
 sections if you need to.
 
-  1. Unpacking the Emacs 24.1 release requires about 180 MB of free
-  disk space.  Building Emacs uses about another 70 MB of space.
-  The final installed Emacs uses about 110 MB of disk space.
+  1. Unpacking the Emacs 24 release requires about 200 MB of free
+  disk space.  Building Emacs uses about another 200 MB of space.
+  The final installed Emacs uses about 150 MB of disk space.
   This includes the space-saving that comes from automatically
   compressing the Lisp source files on installation.
 
@@ -212,20 +211,7 @@ DETAILED BUILDING AND INSTALLATION:
 see msdos/INSTALL.  For later versions of MS Windows, see the file
 nt/INSTALL.  For GNUstep and Mac OS X, see nextstep/INSTALL.)
 
-1) Make sure your system has enough swapping space allocated to handle
-a program whose pure code is 1.5 MB and whose data area is at
-least 2.8 MB and can reach 100 MB or more.  If the swapping space is
-insufficient, you will get an error in the command `temacs -batch -l
-loadup dump', found in `./src/Makefile.in', or possibly when
-running the final dumped Emacs.  (This should not be an issue
-on any recent system.)
-
-Building Emacs requires about 230 MB of disk space (including the
-Emacs sources).  Once installed, Emacs occupies about 120 MB in the file
-system where it is installed; this includes the executable files, Lisp
-libraries, miscellaneous data files, and on-line documentation.  If
-the building and installation take place in different directories,
-then the installation procedure momentarily requires 230+120 MB.
+1) See the basic installation summary above for the disk space requirements.
 
 2) In the unlikely event that `configure' does not detect your system
 type correctly, consult `./etc/MACHINES' to see what --host, --build
@@ -264,8 +250,7 @@ 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 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 --git a/etc/NXML-NEWS b/etc/NXML-NEWS
index ab0d351096d..8a284e2617b 100644
--- a/etc/NXML-NEWS
+++ b/etc/NXML-NEWS
@@ -1,3 +1,10 @@
+Copyright (C) 2007-2014 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+
+For more recent changes, see the main Emacs NEWS file.
+
+
 20041004
 --------
 
@@ -197,3 +204,20 @@ Bug fixes.
 --------
 
 Initial release.
+
+
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f092ec6b539..80157c67704 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+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
+        buffer-menu display when the first buffer happens to start with
+        R2L letter.
+
 2014-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/elisp-mode.el (elisp--local-variables-1):
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index 3ee261aa06b..1e613c7fd4e 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -519,7 +519,10 @@ as the ewoc pretty-printer."
   (setq-local buffer-read-only t)
   (setq-local buffer-undo-list t)
   (setq-local revert-buffer-function #'tabulated-list-revert)
-  (setq-local glyphless-char-display tabulated-list-glyphless-char-display))
+  (setq-local glyphless-char-display tabulated-list-glyphless-char-display)
+  ;; Avoid messing up the entries' display just because the first
+  ;; column of the first entry happens to begin with a R2L letter.
+  (setq bidi-paragraph-direction 'left-to-right))
 
 (put 'tabulated-list-mode 'mode-class 'special)