summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
2014-02-08 Lars Ingebrigtsen <larsi@gnus.org>
+ * fringe.el (fringe-styles): Doc fix (bug#15239).
+
* isearch.el (isearch-filter-predicate): Documentation typo fix
(bug#15474).
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."
("minimal" . (1 . 1)))
"Alist mapping fringe mode names to fringe widths.
Each list element has the form (NAME . WIDTH), where NAME is a
-mnemonic fringe mode name (a symbol) and WIDTH is one of the
-following:
+mnemonic fringe mode name and WIDTH is one of the following:
- nil, which means the default width (8 pixels).
- a cons cell (LEFT . RIGHT), where LEFT and RIGHT are
respectively the left and right fringe widths in pixels, or
- nil (meaning to disable that fringe).
+ nil (meaning the default width).
- a single integer, which specifies the pixel widths of both
fringes.")
@@ -167,7 +166,7 @@ The Lisp value should be one of the following:
- nil, which means the default width (8 pixels).
- a cons cell (LEFT . RIGHT), where LEFT and RIGHT are
respectively the left and right fringe widths in pixels, or
- nil (meaning to disable that fringe).
+ nil (meaning the default width).
- a single integer, which specifies the pixel widths of both
fringes.
Note 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:
- nil, which means the default width (8 pixels).
- a cons cell (LEFT . RIGHT), where LEFT and RIGHT are
respectively the left and right fringe widths in pixels, or
- nil (meaning to disable that fringe).
+ nil (meaning the default width).
- a single integer, which specifies the pixel widths of both
fringes.
This 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:
- nil, which means the default width (8 pixels).
- a cons cell (LEFT . RIGHT), where LEFT and RIGHT are
respectively the left and right fringe widths in pixels, or
- nil (meaning to disable that fringe).
+ nil (meaning the default width).
- a single integer, which specifies the pixel widths of both
fringes.
This command may round up the left and right width specifications