aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-07 20:40:26 -0800
committerLars Ingebrigtsen2014-02-07 20:40:26 -0800
commit9788effd3bf8b4b0b9cfe383c4f58d18507c3ebf (patch)
tree2f78500ac0c1f6268039a49c74c3dae7072ec5c7
parentaa60235ad4820ed32259552769b4ec3f60cda97e (diff)
downloademacs-9788effd3bf8b4b0b9cfe383c4f58d18507c3ebf.tar.gz
emacs-9788effd3bf8b4b0b9cfe383c4f58d18507c3ebf.zip
* fringe.el (fringe-styles): Doc fix.
Fixes: debbugs:15239
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/fringe.el11
2 files changed, 7 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b479af93472..9f8ff6a064d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12014-02-08 Lars Ingebrigtsen <larsi@gnus.org> 12014-02-08 Lars Ingebrigtsen <larsi@gnus.org>
2 2
3 * fringe.el (fringe-styles): Doc fix (bug#15239).
4
3 * isearch.el (isearch-filter-predicate): Documentation typo fix 5 * isearch.el (isearch-filter-predicate): Documentation typo fix
4 (bug#15474). 6 (bug#15474).
5 7
diff --git a/lisp/fringe.el b/lisp/fringe.el
index a24587f89e8..b8bf659620e 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -152,12 +152,11 @@ See `fringe-mode' for possible values and their effect."
152 ("minimal" . (1 . 1))) 152 ("minimal" . (1 . 1)))
153 "Alist mapping fringe mode names to fringe widths. 153 "Alist mapping fringe mode names to fringe widths.
154Each list element has the form (NAME . WIDTH), where NAME is a 154Each list element has the form (NAME . WIDTH), where NAME is a
155mnemonic fringe mode name (a symbol) and WIDTH is one of the 155mnemonic fringe mode name and WIDTH is one of the following:
156following:
157- nil, which means the default width (8 pixels). 156- nil, which means the default width (8 pixels).
158- a cons cell (LEFT . RIGHT), where LEFT and RIGHT are 157- a cons cell (LEFT . RIGHT), where LEFT and RIGHT are
159 respectively the left and right fringe widths in pixels, or 158 respectively the left and right fringe widths in pixels, or
160 nil (meaning to disable that fringe). 159 nil (meaning the default width).
161- a single integer, which specifies the pixel widths of both 160- a single integer, which specifies the pixel widths of both
162 fringes.") 161 fringes.")
163 162
@@ -167,7 +166,7 @@ The Lisp value should be one of the following:
167- nil, which means the default width (8 pixels). 166- nil, which means the default width (8 pixels).
168- a cons cell (LEFT . RIGHT), where LEFT and RIGHT are 167- a cons cell (LEFT . RIGHT), where LEFT and RIGHT are
169 respectively the left and right fringe widths in pixels, or 168 respectively the left and right fringe widths in pixels, or
170 nil (meaning to disable that fringe). 169 nil (meaning the default width).
171- a single integer, which specifies the pixel widths of both 170- a single integer, which specifies the pixel widths of both
172 fringes. 171 fringes.
173Note that the actual width may be rounded up to ensure that the 172Note that the actual width may be rounded up to ensure that the
@@ -238,7 +237,7 @@ When used in a Lisp program, MODE should be one of these:
238- nil, which means the default width (8 pixels). 237- nil, which means the default width (8 pixels).
239- a cons cell (LEFT . RIGHT), where LEFT and RIGHT are 238- a cons cell (LEFT . RIGHT), where LEFT and RIGHT are
240 respectively the left and right fringe widths in pixels, or 239 respectively the left and right fringe widths in pixels, or
241 nil (meaning to disable that fringe). 240 nil (meaning the default width).
242- a single integer, which specifies the pixel widths of both 241- a single integer, which specifies the pixel widths of both
243 fringes. 242 fringes.
244This command may round up the left and right width specifications 243This command may round up the left and right width specifications
@@ -263,7 +262,7 @@ When used in a Lisp program, MODE should be one of these:
263- nil, which means the default width (8 pixels). 262- nil, which means the default width (8 pixels).
264- a cons cell (LEFT . RIGHT), where LEFT and RIGHT are 263- a cons cell (LEFT . RIGHT), where LEFT and RIGHT are
265 respectively the left and right fringe widths in pixels, or 264 respectively the left and right fringe widths in pixels, or
266 nil (meaning to disable that fringe). 265 nil (meaning the default width).
267- a single integer, which specifies the pixel widths of both 266- a single integer, which specifies the pixel widths of both
268 fringes. 267 fringes.
269This command may round up the left and right width specifications 268This command may round up the left and right width specifications