aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-13 23:27:13 +0200
committerLars Magne Ingebrigtsen2011-07-13 23:27:13 +0200
commit5827450416985ed689cfa0ca1843a2ec2b0cd31d (patch)
tree59e4a376801f13a5dc54c89ada479fbbefb0b669
parentac389d0c75f29a4c5bdf05c7180cabd96a7ae7e6 (diff)
downloademacs-5827450416985ed689cfa0ca1843a2ec2b0cd31d.tar.gz
emacs-5827450416985ed689cfa0ca1843a2ec2b0cd31d.zip
* dired.el (dired-flagged): Clarify doc string.
Fixes: debbugs:6117
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/dired.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47f6b6c9aa6..41a7f0b1d2e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * dired.el (dired-flagged): Clarify doc string (bug#6117).
4
12011-07-13 Juanma Barranquero <lekktu@gmail.com> 52011-07-13 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * tabify.el (untabify): Preserve the current column so that point 7 * tabify.el (untabify): Preserve the current column so that point
diff --git a/lisp/dired.el b/lisp/dired.el
index 3606e3df335..01d41bba27d 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -351,11 +351,11 @@ Subexpression 2 must end right before the \\n or \\r.")
351 351
352(defface dired-flagged 352(defface dired-flagged
353 '((t (:inherit font-lock-warning-face))) 353 '((t (:inherit font-lock-warning-face)))
354 "Face used for flagged files." 354 "Face used for files flagged for deletion."
355 :group 'dired-faces 355 :group 'dired-faces
356 :version "22.1") 356 :version "22.1")
357(defvar dired-flagged-face 'dired-flagged 357(defvar dired-flagged-face 'dired-flagged
358 "Face name used for flagged files.") 358 "Face name used for files flagged for deletion.")
359 359
360(defface dired-warning 360(defface dired-warning
361 ;; Inherit from font-lock-warning-face since with min-colors 8 361 ;; Inherit from font-lock-warning-face since with min-colors 8