diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 3 | ||||
-rw-r--r-- | lisp/fringe.el | 2 |
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 @@ 2011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org> + * fringe.el (fringe-query-style): Remove redundant text " (type ? + for list)" (bug#6475). + * files.el (file-expand-wildcards): Ignore non-readable sub-directories while trying to find matches instead of signalling 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." (concat "Select fringe mode for " (if all-frames "all frames" "selected frame") - " (type ? for list): ") + ": ") fringe-styles nil t)) (style (assoc (downcase mode) fringe-styles))) (if style (cdr style) |