aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/simple.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2efe3a5e7fe..36944aaa1b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-09-07 Juri Linkov <juri@jurta.org>
2
3 * simple.el (next-error-highlight, next-error-highlight-no-select):
4 Doc fix (bug#9432).
5
12011-09-07 OKAZAKI Tetsurou <okazaki.tetsurou@gmail.com> (tiny change) 62011-09-07 OKAZAKI Tetsurou <okazaki.tetsurou@gmail.com> (tiny change)
2 7
3 * progmodes/cc-fonts.el (c-font-lock-enclosing-decls): 8 * progmodes/cc-fonts.el (c-font-lock-enclosing-decls):
diff --git a/lisp/simple.el b/lisp/simple.el
index fe46e36fdac..2d4f883f1ed 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -73,7 +73,8 @@ in seconds, or until the next command is executed.
73If t, highlight the locus until the next command is executed, or until 73If t, highlight the locus until the next command is executed, or until
74some other locus replaces it. 74some other locus replaces it.
75If nil, don't highlight the locus in the source buffer. 75If nil, don't highlight the locus in the source buffer.
76If `fringe-arrow', indicate the locus by the fringe arrow." 76If `fringe-arrow', indicate the locus by the fringe arrow
77indefinitely until some other locus replaces it."
77 :type '(choice (number :tag "Highlight for specified time") 78 :type '(choice (number :tag "Highlight for specified time")
78 (const :tag "Semipermanent highlighting" t) 79 (const :tag "Semipermanent highlighting" t)
79 (const :tag "No highlighting" nil) 80 (const :tag "No highlighting" nil)
@@ -86,7 +87,8 @@ If `fringe-arrow', indicate the locus by the fringe arrow."
86If number, highlight the locus in `next-error' face for given time in seconds. 87If number, highlight the locus in `next-error' face for given time in seconds.
87If t, highlight the locus indefinitely until some other locus replaces it. 88If t, highlight the locus indefinitely until some other locus replaces it.
88If nil, don't highlight the locus in the source buffer. 89If nil, don't highlight the locus in the source buffer.
89If `fringe-arrow', indicate the locus by the fringe arrow." 90If `fringe-arrow', indicate the locus by the fringe arrow
91indefinitely until some other locus replaces it."
90 :type '(choice (number :tag "Highlight for specified time") 92 :type '(choice (number :tag "Highlight for specified time")
91 (const :tag "Semipermanent highlighting" t) 93 (const :tag "Semipermanent highlighting" t)
92 (const :tag "No highlighting" nil) 94 (const :tag "No highlighting" nil)