Mercurial > emacs

--- a/doc/emacs/ChangeLog	Fri Jul 03 01:35:56 2009 +0000
+++ b/doc/emacs/ChangeLog	Fri Jul 03 01:36:12 2009 +0000
@@ -1,3 +1,24 @@
+2009-07-03  Glenn Morris  <rgm@gnu.org>
+
+	* emerge-xtra.texi (Emerge): Tweak Misc menu description.
+	(Submodes of Emerge): Skip Prefers is only relevant with an ancestor.
+	(Merge Commands): `.' does not seem to work in A or B buffer.
+	`l' can recreate the 3-window display.
+
+	* glossary.texi (Glossary): Minor phrasing changes throughout.
+	Add more internal cross-references.
+	<Autoloading>: You can't really autoload a variable.
+	<C-M->: Move details here from `M-C-' item.
+	<Continuation Line>: Refer to `Truncation.'
+	<Daemon, Free Software, Free Software Foundation, FSF, GNU>:
+	<Home Directory, Unix>: New entries.
+	<Deletion of Files>: Mention recycle bins.
+	<Directory>: Mention ``folders.''
+	<Error>: Don't mention ``type-ahead.''
+	<Fringe>: Refer to the manual node.
+	<Minor Mode>: Can be global or local.
+	<Spell Checking>: There are other checkers besides Ispell.
+
 2009-07-02  Glenn Morris  <rgm@gnu.org>

 	* anti.texi (Antinews): Minor changes in phrasing.
--- a/doc/emacs/emerge-xtra.texi	Fri Jul 03 01:35:56 2009 +0000
+++ b/doc/emacs/emerge-xtra.texi	Fri Jul 03 01:36:12 2009 +0000
@@ -31,7 +31,7 @@
 			  changing states of differences, etc.
 * Exiting Emerge::	What to do when you've finished the merge.
 * Combining in Emerge::	    How to keep both alternatives for a difference.
-* Fine Points of Emerge::   Misc.
+* Fine Points of Emerge::   Miscellaneous issues.
 @end menu

 @node Overview of Emerge
@@ -149,17 +149,18 @@
 input.  The mode line indicates Auto Advance mode with @samp{A}.

   If Skip Prefers mode is in effect, the @kbd{n} and @kbd{p} commands
-skip over differences in states prefer-A and prefer-B (@pxref{State of
-Difference}).  Thus you see only differences for which neither version
-is presumed ``correct.''  The mode line indicates Skip Prefers mode with
-@samp{S}.
+skip over differences in states ``prefer-A'' and ``prefer-B''
+(@pxref{State of Difference}).  Thus you see only differences for
+which neither version is presumed ``correct.''  The mode line
+indicates Skip Prefers mode with @samp{S}.  This mode is only relevant
+when there is an ancestor.

 @findex emerge-auto-advance-mode
 @findex emerge-skip-prefers-mode
   Use the command @kbd{s a} (@code{emerge-auto-advance-mode}) to set or
 clear Auto Advance mode.  Use @kbd{s s}
 (@code{emerge-skip-prefers-mode}) to set or clear Skip Prefers mode.
-These commands turn on the mode with a positive argument, turns it off
+These commands turn on the mode with a positive argument, turn it off
 with a negative or zero argument, and toggle the mode with no argument.

 @node State of Difference
@@ -191,7 +192,7 @@

 The command @kbd{d a} chooses default-A as the default state, and @kbd{d
 b} chooses default-B.  This chosen default applies to all differences
-which you haven't ever selected and for which no alternative is preferred.
+that you have never selected and for which no alternative is preferred.
 If you are moving through the merge sequentially, the differences you
 haven't selected are those following the selected one.  Thus, while
 moving sequentially, you can effectively make the A version the default
@@ -242,8 +243,9 @@
 Select difference number @var{n}.

 @item .
-Select the difference containing point.  You can use this command in the
-merge buffer or in the A or B buffer.
+Select the difference containing point.
+@c [Does not work in the A or B buffer?]
+@c You can use this command in the merge buffer or in the A or B buffer.

 @item q
 Quit---finish the merge.
@@ -258,7 +260,8 @@
 Go into Edit mode.

 @item l
-Recenter (like @kbd{C-l}) all three windows.
+Recenter (like @kbd{C-l}) all three windows.  With an argument,
+reestablish the default three-window display.

 @item -
 Specify part of a prefix numeric argument.