------------------------------------------------------------
revno: 107369
committer: Glenn Morris <rgm@xxxxxxx>
branch nick: trunk
timestamp: Tue 2012-02-21 16:43:51 -0500
message:
Checked emerge-xtra.texi

* doc/emacs/emerge-xtra.texi (Emerge, Submodes of Emerge, Combining in
Emerge):
Small fixes.
* admin/FOR-RELEASE: Related markup.
modified:
admin/FOR-RELEASE
doc/emacs/ChangeLog
doc/emacs/emerge-xtra.texi
=== modified file 'admin/FOR-RELEASE'
--- a/admin/FOR-RELEASE 2012-02-21 19:56:14 +0000
+++ b/admin/FOR-RELEASE 2012-02-21 21:43:51 +0000
@@ -137,7 +137,7 @@
display.texi cyd
emacs.texi rgm
emacs-xtra.texi rgm
-emerge-xtra.texi
+emerge-xtra.texi rgm
entering.texi cyd
files.texi cyd
fixit.texi cyd

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2012-02-21 19:56:14 +0000
+++ b/doc/emacs/ChangeLog 2012-02-21 21:43:51 +0000
@@ -1,5 +1,8 @@
2012-02-21 Glenn Morris <rgm@xxxxxxx>

+ * emerge-xtra.texi (Emerge, Submodes of Emerge, Combining in Emerge):
+ Small fixes.
+
* emacs-xtra.texi: Picture mode is no longer a chapter.

* picture-xtra.texi (Basic Picture): C-a does get remapped.

=== modified file 'doc/emacs/emerge-xtra.texi'
--- a/doc/emacs/emerge-xtra.texi 2012-01-19 07:21:25 +0000
+++ b/doc/emacs/emerge-xtra.texi 2012-02-21 21:43:51 +0000
@@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
-@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
+@c Copyright (C) 2004-2012 Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@c
@c This file is included either in emacs-xtra.texi (when producing the
@@ -19,7 +19,7 @@
@ifnottex
@ref{Comparing Files},
@end ifnottex
-and @ref{Top, Ediff,, ediff, The Ediff Manual}.
+and @ref{Top,, Ediff, ediff, The Ediff Manual}.

@menu
* Overview of Emerge:: How to start Emerge. Basic concepts.
@@ -155,13 +155,13 @@
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, turn it off
-with a negative or zero argument, and toggle the mode with no argument.
+@findex emerge-auto-advance
+@findex emerge-skip-prefers
+ Use the command @kbd{s a} (@code{emerge-auto-advance}) to set or clear
+Auto Advance mode. Use @kbd{s s} (@code{emerge-skip-prefers}) to set or
+clear Skip Prefers mode. 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
@subsection State of a Difference
@@ -362,9 +362,9 @@
@example
@group
#ifdef NEW
+@var{version from B buffer}
+#else /* not NEW */
@var{version from A buffer}
-#else /* not NEW */
-@var{version from B buffer}
#endif /* not NEW */
@end group
@end example
@@ -380,7 +380,7 @@

@example
@group
-"#ifdef NEW\n%a#else /* not NEW */\n%b#endif /* not NEW */\n"
+"#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n"
@end group
@end example


_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@xxxxxxx
https://lists.gnu.org/mailman/listinfo/emacs-diffs