[Emacs-diffs] Changes to emacs/lisp/eshell/em-ls.el

[Miles Bader]

Index: emacs/lisp/eshell/em-ls.el
diff -c emacs/lisp/eshell/em-ls.el:1.18 emacs/lisp/eshell/em-ls.el:1.19
*** emacs/lisp/eshell/em-ls.el:1.18     Mon Nov 17 00:24:06 2003
--- emacs/lisp/eshell/em-ls.el  Fri Jun 17 05:27:55 2005
***************
*** 1,6 ****
  ;;; em-ls.el --- implementation of ls in Lisp
  
! ;; Copyright (C) 1999, 2000 Free Software Foundation
  
  ;; Author: John Wiegley <address@hidden>
  
--- 1,6 ----
  ;;; em-ls.el --- implementation of ls in Lisp
  
! ;; Copyright (C) 1999, 2000, 2005 Free Software Foundation
  
  ;; Author: John Wiegley <address@hidden>
  
***************
*** 106,153 ****
    :type 'boolean
    :group 'eshell-ls)
  
! (defface eshell-ls-directory-face
    '((((class color) (background light)) (:foreground "Blue" :weight bold))
      (((class color) (background dark)) (:foreground "SkyBlue" :weight bold))
      (t (:weight bold)))
    "*The face used for highlight directories."
    :group 'eshell-ls)
  
! (defface eshell-ls-symlink-face
    '((((class color) (background light)) (:foreground "Dark Cyan" :weight 
bold))
      (((class color) (background dark)) (:foreground "Cyan" :weight bold)))
    "*The face used for highlight symbolic links."
    :group 'eshell-ls)
  
! (defface eshell-ls-executable-face
    '((((class color) (background light)) (:foreground "ForestGreen" :weight 
bold))
      (((class color) (background dark)) (:foreground "Green" :weight bold)))
    "*The face used for highlighting executables (not directories, though)."
    :group 'eshell-ls)
  
! (defface eshell-ls-readonly-face
    '((((class color) (background light)) (:foreground "Brown"))
      (((class color) (background dark)) (:foreground "Pink")))
    "*The face used for highlighting read-only files."
    :group 'eshell-ls)
  
! (defface eshell-ls-unreadable-face
    '((((class color) (background light)) (:foreground "Grey30"))
      (((class color) (background dark)) (:foreground "DarkGrey")))
    "*The face used for highlighting unreadable files."
    :group 'eshell-ls)
  
! (defface eshell-ls-special-face
    '((((class color) (background light)) (:foreground "Magenta" :weight bold))
      (((class color) (background dark)) (:foreground "Magenta" :weight bold)))
    "*The face used for highlighting non-regular files."
    :group 'eshell-ls)
  
! (defface eshell-ls-missing-face
    '((((class color) (background light)) (:foreground "Red" :weight bold))
      (((class color) (background dark)) (:foreground "Red" :weight bold)))
    "*The face used for highlighting non-existant file names."
    :group 'eshell-ls)
  
  (defcustom eshell-ls-archive-regexp
    (concat "\\.\\(t\\(a[rz]\\|gz\\)\\|arj\\|lzh\\|"
--- 106,167 ----
    :type 'boolean
    :group 'eshell-ls)
  
! (defface eshell-ls-directory
    '((((class color) (background light)) (:foreground "Blue" :weight bold))
      (((class color) (background dark)) (:foreground "SkyBlue" :weight bold))
      (t (:weight bold)))
    "*The face used for highlight directories."
    :group 'eshell-ls)
+ ;; backward-compatibility alias
+ (put 'eshell-ls-directory-face 'face-alias 'eshell-ls-directory)
  
! (defface eshell-ls-symlink
    '((((class color) (background light)) (:foreground "Dark Cyan" :weight 
bold))
      (((class color) (background dark)) (:foreground "Cyan" :weight bold)))
    "*The face used for highlight symbolic links."
    :group 'eshell-ls)
+ ;; backward-compatibility alias
+ (put 'eshell-ls-symlink-face 'face-alias 'eshell-ls-symlink)
  
! (defface eshell-ls-executable
    '((((class color) (background light)) (:foreground "ForestGreen" :weight 
bold))
      (((class color) (background dark)) (:foreground "Green" :weight bold)))
    "*The face used for highlighting executables (not directories, though)."
    :group 'eshell-ls)
+ ;; backward-compatibility alias
+ (put 'eshell-ls-executable-face 'face-alias 'eshell-ls-executable)
  
! (defface eshell-ls-readonly
    '((((class color) (background light)) (:foreground "Brown"))
      (((class color) (background dark)) (:foreground "Pink")))
    "*The face used for highlighting read-only files."
    :group 'eshell-ls)
+ ;; backward-compatibility alias
+ (put 'eshell-ls-readonly-face 'face-alias 'eshell-ls-readonly)
  
! (defface eshell-ls-unreadable
    '((((class color) (background light)) (:foreground "Grey30"))
      (((class color) (background dark)) (:foreground "DarkGrey")))
    "*The face used for highlighting unreadable files."
    :group 'eshell-ls)
+ ;; backward-compatibility alias
+ (put 'eshell-ls-unreadable-face 'face-alias 'eshell-ls-unreadable)
  
! (defface eshell-ls-special
    '((((class color) (background light)) (:foreground "Magenta" :weight bold))
      (((class color) (background dark)) (:foreground "Magenta" :weight bold)))
    "*The face used for highlighting non-regular files."
    :group 'eshell-ls)
+ ;; backward-compatibility alias
+ (put 'eshell-ls-special-face 'face-alias 'eshell-ls-special)
  
! (defface eshell-ls-missing
    '((((class color) (background light)) (:foreground "Red" :weight bold))
      (((class color) (background dark)) (:foreground "Red" :weight bold)))
    "*The face used for highlighting non-existant file names."
    :group 'eshell-ls)
+ ;; backward-compatibility alias
+ (put 'eshell-ls-missing-face 'face-alias 'eshell-ls-missing)
  
  (defcustom eshell-ls-archive-regexp
    (concat "\\.\\(t\\(a[rz]\\|gz\\)\\|arj\\|lzh\\|"
***************
*** 158,168 ****
    :type 'regexp
    :group 'eshell-ls)
  
! (defface eshell-ls-archive-face
    '((((class color) (background light)) (:foreground "Orchid" :weight bold))
      (((class color) (background dark)) (:foreground "Orchid" :weight bold)))
    "*The face used for highlighting archived and compressed file names."
    :group 'eshell-ls)
  
  (defcustom eshell-ls-backup-regexp
    "\\(\\`\\.?#\\|\\(\\.bak\\|~\\)\\'\\)"
--- 172,184 ----
    :type 'regexp
    :group 'eshell-ls)
  
! (defface eshell-ls-archive
    '((((class color) (background light)) (:foreground "Orchid" :weight bold))
      (((class color) (background dark)) (:foreground "Orchid" :weight bold)))
    "*The face used for highlighting archived and compressed file names."
    :group 'eshell-ls)
+ ;; backward-compatibility alias
+ (put 'eshell-ls-archive-face 'face-alias 'eshell-ls-archive)
  
  (defcustom eshell-ls-backup-regexp
    "\\(\\`\\.?#\\|\\(\\.bak\\|~\\)\\'\\)"
***************
*** 170,180 ****
    :type 'regexp
    :group 'eshell-ls)
  
! (defface eshell-ls-backup-face
    '((((class color) (background light)) (:foreground "OrangeRed"))
      (((class color) (background dark)) (:foreground "LightSalmon")))
    "*The face used for highlighting backup file names."
    :group 'eshell-ls)
  
  (defcustom eshell-ls-product-regexp
    "\\.\\(elc\\|o\\(bj\\)?\\|a\\|lib\\|res\\)\\'"
--- 186,198 ----
    :type 'regexp
    :group 'eshell-ls)
  
! (defface eshell-ls-backup
    '((((class color) (background light)) (:foreground "OrangeRed"))
      (((class color) (background dark)) (:foreground "LightSalmon")))
    "*The face used for highlighting backup file names."
    :group 'eshell-ls)
+ ;; backward-compatibility alias
+ (put 'eshell-ls-backup-face 'face-alias 'eshell-ls-backup)
  
  (defcustom eshell-ls-product-regexp
    "\\.\\(elc\\|o\\(bj\\)?\\|a\\|lib\\|res\\)\\'"
***************
*** 184,194 ****
    :type 'regexp
    :group 'eshell-ls)
  
! (defface eshell-ls-product-face
    '((((class color) (background light)) (:foreground "OrangeRed"))
      (((class color) (background dark)) (:foreground "LightSalmon")))
    "*The face used for highlighting files that are build products."
    :group 'eshell-ls)
  
  (defcustom eshell-ls-clutter-regexp
    "\\(^texput\\.log\\|^core\\)\\'"
--- 202,214 ----
    :type 'regexp
    :group 'eshell-ls)
  
! (defface eshell-ls-product
    '((((class color) (background light)) (:foreground "OrangeRed"))
      (((class color) (background dark)) (:foreground "LightSalmon")))
    "*The face used for highlighting files that are build products."
    :group 'eshell-ls)
+ ;; backward-compatibility alias
+ (put 'eshell-ls-product-face 'face-alias 'eshell-ls-product)
  
  (defcustom eshell-ls-clutter-regexp
    "\\(^texput\\.log\\|^core\\)\\'"
***************
*** 198,208 ****
    :type 'regexp
    :group 'eshell-ls)
  
! (defface eshell-ls-clutter-face
    '((((class color) (background light)) (:foreground "OrangeRed" :weight 
bold))
      (((class color) (background dark)) (:foreground "OrangeRed" :weight 
bold)))
    "*The face used for highlighting junk file names."
    :group 'eshell-ls)
  
  (defsubst eshell-ls-filetype-p (attrs type)
    "Test whether ATTRS specifies a directory."
--- 218,230 ----
    :type 'regexp
    :group 'eshell-ls)
  
! (defface eshell-ls-clutter
    '((((class color) (background light)) (:foreground "OrangeRed" :weight 
bold))
      (((class color) (background dark)) (:foreground "OrangeRed" :weight 
bold)))
    "*The face used for highlighting junk file names."
    :group 'eshell-ls)
+ ;; backward-compatibility alias
+ (put 'eshell-ls-clutter-face 'face-alias 'eshell-ls-clutter)
  
  (defsubst eshell-ls-filetype-p (attrs type)
    "Test whether ATTRS specifies a directory."
***************
*** 847,887 ****
        (let ((face
             (cond
              ((not (cdr file))
!              'eshell-ls-missing-face)
  
              ((stringp (cadr file))
!              'eshell-ls-symlink-face)
  
              ((eq (cadr file) t)
!              'eshell-ls-directory-face)
  
              ((not (eshell-ls-filetype-p (cdr file) ?-))
!              'eshell-ls-special-face)
  
              ((and (/= (user-uid) 0) ; root can execute anything
                    (eshell-ls-applicable (cdr file) 3
                                          'file-executable-p (car file)))
!              'eshell-ls-executable-face)
  
              ((not (eshell-ls-applicable (cdr file) 1
                                          'file-readable-p (car file)))
!              'eshell-ls-unreadable-face)
  
              ((string-match eshell-ls-archive-regexp (car file))
!              'eshell-ls-archive-face)
  
              ((string-match eshell-ls-backup-regexp (car file))
!              'eshell-ls-backup-face)
  
              ((string-match eshell-ls-product-regexp (car file))
!              'eshell-ls-product-face)
  
              ((string-match eshell-ls-clutter-regexp (car file))
!              'eshell-ls-clutter-face)
  
              ((not (eshell-ls-applicable (cdr file) 2
                                          'file-writable-p (car file)))
!              'eshell-ls-readonly-face)
              (eshell-ls-highlight-alist
               (let ((tests eshell-ls-highlight-alist)
                     value)
--- 869,909 ----
        (let ((face
             (cond
              ((not (cdr file))
!              'eshell-ls-missing)
  
              ((stringp (cadr file))
!              'eshell-ls-symlink)
  
              ((eq (cadr file) t)
!              'eshell-ls-directory)
  
              ((not (eshell-ls-filetype-p (cdr file) ?-))
!              'eshell-ls-special)
  
              ((and (/= (user-uid) 0) ; root can execute anything
                    (eshell-ls-applicable (cdr file) 3
                                          'file-executable-p (car file)))
!              'eshell-ls-executable)
  
              ((not (eshell-ls-applicable (cdr file) 1
                                          'file-readable-p (car file)))
!              'eshell-ls-unreadable)
  
              ((string-match eshell-ls-archive-regexp (car file))
!              'eshell-ls-archive)
  
              ((string-match eshell-ls-backup-regexp (car file))
!              'eshell-ls-backup)
  
              ((string-match eshell-ls-product-regexp (car file))
!              'eshell-ls-product)
  
              ((string-match eshell-ls-clutter-regexp (car file))
!              'eshell-ls-clutter)
  
              ((not (eshell-ls-applicable (cdr file) 2
                                          'file-writable-p (car file)))
!              'eshell-ls-readonly)
              (eshell-ls-highlight-alist
               (let ((tests eshell-ls-highlight-alist)
                     value)