Mercurial > emacs
comparison lisp/dired.el @ 85311:591c29778a30
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 116-121)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-889
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 15 Oct 2007 02:07:53 +0000 |
parents | 5039706521c9 6b97f0761688 |
children | 25e29d02bb55 a0e466c4d599 |
comparison
equal
deleted
inserted
replaced
85310:22c169d62199 | 85311:591c29778a30 |
---|---|
341 "Face used to highlight a part of a buffer that needs user attention." | 341 "Face used to highlight a part of a buffer that needs user attention." |
342 :group 'dired-faces | 342 :group 'dired-faces |
343 :version "22.1") | 343 :version "22.1") |
344 (defvar dired-warning-face 'dired-warning | 344 (defvar dired-warning-face 'dired-warning |
345 "Face name used for a part of a buffer that needs user attention.") | 345 "Face name used for a part of a buffer that needs user attention.") |
346 | |
347 (defface dired-warn-writable | |
348 '((((type w32 pc)) :inherit default) ;; These default to rw-rw-rw. | |
349 (t (:inherit font-lock-warning-face))) | |
350 "Face used to highlight permissions of group- and world-writable files." | |
351 :group 'dired-faces | |
352 :version "22.2") | |
353 (defvar dired-warn-writable-face 'dired-warn-writable | |
354 "Face name used for permissions of group- and world-writable files.") | |
346 | 355 |
347 (defface dired-directory | 356 (defface dired-directory |
348 '((t (:inherit font-lock-function-name-face))) | 357 '((t (:inherit font-lock-function-name-face))) |
349 "Face used for subdirectories." | 358 "Face used for subdirectories." |
350 :group 'dired-faces | 359 :group 'dired-faces |
403 ;; permissions, to win generally. -- fx. | 412 ;; permissions, to win generally. -- fx. |
404 ;; Fixme: we could also put text properties on the permission | 413 ;; Fixme: we could also put text properties on the permission |
405 ;; fields with keymaps to frob the permissions, somewhat a la XEmacs. | 414 ;; fields with keymaps to frob the permissions, somewhat a la XEmacs. |
406 (list (concat dired-re-maybe-mark dired-re-inode-size | 415 (list (concat dired-re-maybe-mark dired-re-inode-size |
407 "[-d]....\\(w\\)....") ; group writable | 416 "[-d]....\\(w\\)....") ; group writable |
408 '(1 dired-warning-face)) | 417 '(1 dired-warn-writable-face)) |
409 (list (concat dired-re-maybe-mark dired-re-inode-size | 418 (list (concat dired-re-maybe-mark dired-re-inode-size |
410 "[-d].......\\(w\\).") ; world writable | 419 "[-d].......\\(w\\).") ; world writable |
411 '(1 dired-warning-face)) | 420 '(1 dired-warn-writable-face)) |
412 ;; | 421 ;; |
413 ;; Subdirectories. | 422 ;; Subdirectories. |
414 (list dired-re-dir | 423 (list dired-re-dir |
415 '(".+" (dired-move-to-filename) nil (0 dired-directory-face))) | 424 '(".+" (dired-move-to-filename) nil (0 dired-directory-face))) |
416 ;; | 425 ;; |