Merge from emacs-23

3 files changed, 19 insertions, 2 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 5c0ff3da206..fe9cd8a73b4 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdog.texi (Windows HOME): Add information regarding startup
+        directory when invoking Emacs from a desktop shortcut.  (bug#7300)
+
 2010-10-11  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (MAKEINFO): Add explicit -I$srcdir.
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index a44438bf81f..3e8d5ef57c1 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -31,7 +31,8 @@ here.
 * Text and Binary::     Text files use CRLF to terminate lines.
 * Windows Files::       File-name conventions on Windows.
 * ls in Lisp::          Emulation of @code{ls} for Dired.
-* Windows HOME::        Where Emacs looks for your @file{.emacs}.
+* Windows HOME::        Where Emacs looks for your @file{.emacs} and
+                          where it starts up.
 * Windows Keyboard::    Windows-specific keyboard features.
 * Windows Mouse::       Windows-specific mouse features.
 * Windows Processes::   Running subprocesses on Windows.
@@ -329,7 +330,7 @@ names, which might cause misalignment of columns in Dired display.
 @end ifnottex
 
 @node Windows HOME
-@section HOME Directory on MS-Windows
+@section HOME and Startup Directories on MS-Windows
 @cindex @code{HOME} directory on MS-Windows
 
   The Windows equivalent of the @code{HOME} directory is the
@@ -371,6 +372,13 @@ names, the Windows port of Emacs supports an alternative name
 @file{_emacs} as a fallback, if such a file exists in the home
 directory, whereas @file{.emacs} does not.
 
+@cindex start directory, MS-Windows
+@cindex directory where Emacs starts on MS-Windows
+  If you use a Windows desktop shortcut to start Emacs, it starts in
+the directory specified by the shortcut.  To control where that is,
+right-click on the shortcut, select ``Properties'', and in the
+``Shortcut'' tab modify the ``Start in'' field to your liking.
+
 @node Windows Keyboard
 @section Keyboard Usage on MS-Windows
 @cindex keyboard, MS-Windows
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 9761e599d8f..e255b44f189 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-09  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc.texi: Use emacsver.texi to determine Emacs version.
+
 2010-11-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Customizing the IMAP Connection): Remove nnir mention,