aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-03 04:37:52 +0200
committerLars Magne Ingebrigtsen2011-07-03 04:37:52 +0200
commitfc00f69c3775883d90faa955dff956652f260c3d (patch)
tree7ce4bf3c37873c772ba80dd3ad9e196b1175ff8b
parent28fd8759b38d18235e268709d27dd0d2c4ae45cc (diff)
downloademacs-fc00f69c3775883d90faa955dff956652f260c3d.tar.gz
emacs-fc00f69c3775883d90faa955dff956652f260c3d.zip
* fringe.el (fringe-query-style): Remove redundant text " (type ?
for list)" (bug#6475).
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/fringe.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62458723ac9..169793ebc40 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * fringe.el (fringe-query-style): Remove redundant text " (type ?
4 for list)" (bug#6475).
5
3 * files.el (file-expand-wildcards): Ignore non-readable 6 * files.el (file-expand-wildcards): Ignore non-readable
4 sub-directories while trying to find matches instead of signalling 7 sub-directories while trying to find matches instead of signalling
5 an error (bug#6297). 8 an error (bug#6297).
diff --git a/lisp/fringe.el b/lisp/fringe.el
index ce24bb60100..fa5ebb6f0c6 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -192,7 +192,7 @@ frame parameter is used."
192 (concat 192 (concat
193 "Select fringe mode for " 193 "Select fringe mode for "
194 (if all-frames "all frames" "selected frame") 194 (if all-frames "all frames" "selected frame")
195 " (type ? for list): ") 195 ": ")
196 fringe-styles nil t)) 196 fringe-styles nil t))
197 (style (assoc (downcase mode) fringe-styles))) 197 (style (assoc (downcase mode) fringe-styles)))
198 (if style (cdr style) 198 (if style (cdr style)