diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
| commit | 9a70f03d70e44db2ec9c6d2952cb8a1deae15000 (patch) | |
| tree | c0efd5c0a208640c0a883f4566df1b40caa3aaad /lisp/dired.el | |
| parent | 29c8a348c5c9f326af54a3d30f69cde98fe300bb (diff) | |
| download | emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.gz emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.bz2 emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/dired.el')
| -rw-r--r-- | lisp/dired.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 01d41bba27d..746c16ff148 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -350,7 +350,7 @@ Subexpression 2 must end right before the \\n or \\r.") "Face name used for marked files.") (defface dired-flagged - '((t (:inherit font-lock-warning-face))) + '((t (:inherit font-lock-variable-name-face))) "Face used for files flagged for deletion." :group 'dired-faces :version "22.1") @@ -3663,7 +3663,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "ab62f310329f404f96a29e4f0ab8df73") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "bbb53a5b6bf56c413fe0f898559bef8d") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ |