diff man/display.texi @ 83428:d0eee3282e6b

Merged from [e-mail]--gnu-2005 (patch 678-680) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-678 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-679 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-680 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-468

--- a/man/display.texi	Thu Dec 29 04:31:04 2005 +0000
+++ b/man/display.texi	Thu Dec 29 04:41:02 2005 +0000
@@ -412,25 +412,25 @@
 @findex highlight-regexp
 Highlight text that matches @var{regexp} using face @var{face}
 (@code{highlight-regexp}).  By using this command more than once, you
-can highlight various parts of the text in different ways. The
+can highlight various parts of the text in different ways.  The
 highlighting will remain as long as the buffer is loaded.  For
 example, to highlight all occurrences of the word ``whim'' using the
 default face (a yellow background) @kbd{C-x w h whim @key{RET}
 @key{RET}}.  Any face can be used for highlighting, Hi Lock provides
-several of its own and these are pre-loaded into a history list. While
-being prompted for a face use @kbd{C-p} and @kbd{C-n} to cycle through
+several of its own and these are pre-loaded into a history list.  While
+being prompted for a face use @kbd{M-p} and @kbd{M-n} to cycle through
 them.
 
 @item C-x w r @var{regexp} @key{RET}
 @kindex C-x w r
 @findex unhighlight-regexp
-Unhighlight @var{regexp} (@code{unhighlight-regexp}).  
+Unhighlight @var{regexp} (@code{unhighlight-regexp}).
 When activated from the menu select the expression to unhighlight from
 a list.  When activated from the keyboard the most recently added
-expression will be shown. Use @kbd{C-p} to show the next older
-expression and @kbd{C-n} to select the next newer expression. When
+expression will be shown.  Use @kbd{M-p} to show the next older
+expression and @kbd{M-n} to select the next newer expression.  When
 the expression to unhighlight appears press @kbd{@key{RET}} to unhighlight
-it. The expression can also be typed and completion is available. 
+it.  The expression can also be typed and completion is available.
 
 @item C-x w l @var{regexp} @key{RET} @var{face} @key{RET}
 @kindex C-x w l
@@ -457,7 +457,7 @@
 @findex hi-lock-find-patterns
 @vindex hi-lock-exclude-modes
 Re-read regexp/face pairs in the current buffer
-(@code{hi-lock-write-interactive-patterns}). Users familiar with Font
+(@code{hi-lock-write-interactive-patterns}).  Users familiar with Font
 Lock keywords might interactively enter patterns
 (@code{highlight-regexp}), write them into the file
 (@code{hi-lock-write-interactive-patterns}), edit them, perhaps