master updated (3054e70d76 -> 142478c095)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  3054e70d76 Restore hl-line--buffer tracking
       new  1327593ce2 Make eshell link faces more distinctive on 8-color 
displays
       new  142478c095 Add user option for controlling dired-do-shell-command 
prompt


Summary of changes:
 doc/emacs/dired.texi |  4 +++-
 lisp/dired-aux.el    | 15 ++++++++++++++-
 lisp/eshell/em-ls.el | 13 ++++++-------
 3 files changed, 23 insertions(+), 9 deletions(-)