aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2014-02-06 23:18:02 -0800
committerGlenn Morris2014-02-06 23:18:02 -0800
commit99cf38598cd4ac71407b542ba0054fa0df018eb1 (patch)
tree20a2135ebc933ece0c87cef64a66b99fa51c3005 /doc
parente4eaacacc664e5469558350521add4f0b4163818 (diff)
downloademacs-99cf38598cd4ac71407b542ba0054fa0df018eb1.tar.gz
emacs-99cf38598cd4ac71407b542ba0054fa0df018eb1.zip
Some hi-lock doc
* doc/emacs/display.texi (Highlight Interactively): Mention hi-lock-auto-select-face. * lisp/hi-lock.el (hi-lock-auto-select-face, hi-lock-line-face-buffer) (hi-lock-face-buffer, hi-lock-face-phrase-buffer) (hi-lock-face-symbol-at-point, hi-lock-read-face-name): Doc tweaks. * etc/NEWS: Related edits.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog3
-rw-r--r--doc/emacs/display.texi10
2 files changed, 11 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2ee669e7da5..1a884452dbe 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,8 @@
12014-02-07 Glenn Morris <rgm@gnu.org> 12014-02-07 Glenn Morris <rgm@gnu.org>
2 2
3 * display.texi (Highlight Interactively):
4 Mention hi-lock-auto-select-face.
5
3 * anti.texi (Antinews): Fix typo. 6 * anti.texi (Antinews): Fix typo.
4 7
5 * ack.texi (Acknowledgments): No longer mention obsolete files. 8 * ack.texi (Acknowledgments): No longer mention obsolete files.
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index d9fd819c219..d53c80acafd 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -928,6 +928,12 @@ highlighting, Hi Lock provides several of its own and these are
928pre-loaded into a list of default values. While being prompted 928pre-loaded into a list of default values. While being prompted
929for a face use @kbd{M-n} and @kbd{M-p} to cycle through them. 929for a face use @kbd{M-n} and @kbd{M-p} to cycle through them.
930 930
931@vindex hi-lock-auto-select-face
932Setting the option @code{hi-lock-auto-select-face} to a non-@code{nil}
933value causes this command (and other Hi Lock commands that read faces)
934to automatically choose the next face from the default list without
935prompting.
936
931You can use this command multiple times, specifying various regular 937You can use this command multiple times, specifying various regular
932expressions to highlight in different ways. 938expressions to highlight in different ways.
933 939
@@ -976,8 +982,8 @@ initial lower-case letters will become case insensitive.
976@findex highlight-symbol-at-point 982@findex highlight-symbol-at-point
977@cindex symbol, highlighting 983@cindex symbol, highlighting
978@cindex highlighting symbol at point 984@cindex highlighting symbol at point
979Highlight the symbol found near point without prompting, using the next 985Highlight the symbol found near point, using the next available face
980available face automatically (@code{highlight-symbol-at-point}). 986(@code{highlight-symbol-at-point}).
981 987
982@item M-s h w 988@item M-s h w
983@itemx C-x w b 989@itemx C-x w b