aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorEli Zaretskii2010-11-06 12:08:33 +0200
committerEli Zaretskii2010-11-06 12:08:33 +0200
commit169759a0d412e5f1eb9aea1663bbffb59002452c (patch)
tree26e7e48ff5053a8d5bb95c31a36f4e55cd8313e6 /lisp/ChangeLog
parent21620882d7956ac84de26371f9fb504b6c558192 (diff)
downloademacs-169759a0d412e5f1eb9aea1663bbffb59002452c.tar.gz
emacs-169759a0d412e5f1eb9aea1663bbffb59002452c.zip
Back-port from trunk the fix for bug #6294.
ls-lisp.el (ls-lisp-classify-file): New function. (ls-lisp-insert-directory): Call it if switches include -F. (ls-lisp-classify): Call ls-lisp-classify-file. (insert-directory): Remove blanks from switches.
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83915ca448d..135e1ea750f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,10 @@
12010-11-06 Eli Zaretskii <eliz@gnu.org> 12010-11-06 Eli Zaretskii <eliz@gnu.org>
2 2
3 * ls-lisp.el (insert-directory): Doc fix. (bug#7285) 3 * ls-lisp.el (insert-directory): Doc fix. (bug#7285)
4 (ls-lisp-classify-file): New function.
5 (ls-lisp-insert-directory): Call it if switches include -F (bug#6294).
6 (ls-lisp-classify): Call ls-lisp-classify-file.
7 (insert-directory): Remove blanks from switches.
4 8
52010-11-07 Wilson Snyder <wsnyder@wsnyder.org> 92010-11-07 Wilson Snyder <wsnyder@wsnyder.org>
6 10