[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99674: * misc.texi (Navigation): Document doc-view-continuous.

[Chong Yidong]

------------------------------------------------------------
revno: 99674
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Thu 2010-03-25 16:15:52 -0400
message:
  * misc.texi (Navigation): Document doc-view-continuous.
modified:
  doc/emacs/ChangeLog
  doc/emacs/misc.texi
  etc/NEWS

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2010-03-24 03:02:42 +0000
+++ b/doc/emacs/ChangeLog       2010-03-25 20:15:52 +0000
@@ -1,3 +1,7 @@
+2010-03-25  Chong Yidong  <address@hidden>
+
+       * misc.texi (Navigation): Document doc-view-continuous.
+
 2010-03-24  Glenn Morris  <address@hidden>
 
        * ack.texi (Acknowledgments):
@@ -30,7 +34,6 @@
        * xresources.texi (Table of Resources):
        * mule.texi (Defining Fontsets, Charsets): Update xrefs.
 
->>>>>>> MERGE-SOURCE
 2010-03-06  Chong Yidong  <address@hidden>
 
        * custom.texi (Init Examples): Add xref to Locals.

=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi       2010-01-13 08:35:10 +0000
+++ b/doc/emacs/misc.texi       2010-03-25 20:15:52 +0000
@@ -84,11 +84,20 @@
 Emacs movement keys: @kbd{C-p}, @kbd{C-n}, @kbd{C-b}, @kbd{C-f}, and
 the arrow keys.
 
address@hidden doc-view-continuous
+  By default, the line-motion keys @kbd{C-p} and @kbd{C-n} stop
+scrolling at the beginning and end of the current page, respectively.
+However, if you change the variable @code{doc-view-continuous} to a
address@hidden value, then @kbd{C-p} displays the previous page if you
+are already at the beginning of the current page, and @kbd{C-n}
+displays the next page if you are at the end of the current page.
+
 @findex doc-view-next-page
 @findex doc-view-previous-page
-  To display the next page, type @kbd{n}, @key{next} or @kbd{C-x ]}
-(@code{doc-view-next-page}).  To display the previous page, type
address@hidden, @key{prior} or @kbd{C-x [} (@code{doc-view-previous-page}).
+  You can also display the next page by typing @kbd{n}, @key{next} or
address@hidden ]} (@code{doc-view-next-page}).  To display the previous
+page, type @kbd{p}, @key{prior} or @kbd{C-x [}
+(@code{doc-view-previous-page}).
 
 @findex doc-view-scroll-up-or-next-page
 @findex doc-view-scroll-down-or-previous-page

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-03-21 22:13:26 +0000
+++ b/etc/NEWS  2010-03-25 20:15:52 +0000
@@ -148,7 +148,7 @@
 +++
 *** The new completion-style `initials' is available.
 For instance, this can complete M-x lch to list-command-history.
-
+---
 *** The new variable `completions-format' determines how completions
 are displayed in the *Completions* buffer.  If you set it to
 `vertical', completions are sorted vertically in columns.
@@ -227,7 +227,7 @@
 Dired buffers to be reverted automatically on revisiting them.
 
 ** DocView
-
++++
 *** When `doc-view-continuous' is non-nil, scrolling a line
 on the page edge advances to the next/previous page.