Merge from mainline.

2 files changed, 16 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 862ce24d29a..cbe46d3a53e 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,13 @@
+2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Document warning about _emacs.
+
+2011-03-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: `shell' prompts for the shell path name, when the default
+        directory is a remote file name and neither environment variable
+        $ESHELL nor variable `explicit-shell-file-name' is set.
+
 2011-03-08  Kristoffer Grönlund  <krig@koru.se>
 
         * themes/wombat-theme.el: New file.
diff --git a/etc/NEWS b/etc/NEWS
index 330a3b6ee51..bb59e0e2a24 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -62,6 +62,8 @@ longer have any effect.  (They were declared obsolete in Emacs 23.)
 ** New command line option `--no-site-lisp' removes site-lisp directories
 from load-path.  -Q now implies this.
 
+** On Windows, Emacs now warns when the obsolete _emacs init file is used.
+
 
 * Changes in Emacs 24.1
 
@@ -335,6 +337,10 @@ between applications.
 the lines in the current rectangle.  With an prefix argument, this
 prompts for a number to count from and for a format string.
 
+** The command shell prompts for the shell path name, when the default
+directory is a remote file name and neither environment variable
+$ESHELL nor variable `explicit-shell-file-name' is set.
+
 
 * Changes in Specialized Modes and Packages in Emacs 24.1