Mercurial > emacs
changeset 111957:e0dabb89175d
Make some dired defvars into defcustoms.
* lisp/dired.el (dired-subdir-switches, dired-chown-program)
(dired-use-ls-dired, dired-chmod-program, dired-touch-program):
Make into defcustoms.
(dired-chown-program): Simplify initialization.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Mon, 13 Dec 2010 20:32:14 -0800 |
| parents | e3c25cc05c38 |
| children | 707b726cfaed |
| files | lisp/ChangeLog lisp/dired.el |
| diffstat | 2 files changed, 37 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Dec 13 20:26:01 2010 -0800 +++ b/lisp/ChangeLog Mon Dec 13 20:32:14 2010 -0800 @@ -1,5 +1,10 @@ 2010-12-14 Glenn Morris <rgm@gnu.org> + * dired.el (dired-subdir-switches, dired-chown-program) + (dired-use-ls-dired, dired-chmod-program, dired-touch-program): + Make into defcustoms. + (dired-chown-program): Simplify initialization. + * mail/mail-utils.el: No need to require lisp-mode, it's in loadup. 2010-12-13 Romain Francoise <romain@orebokech.com>
--- a/lisp/dired.el Mon Dec 13 20:26:01 2010 -0800 +++ b/lisp/dired.el Mon Dec 13 20:32:14 2010 -0800 @@ -26,8 +26,8 @@ ;;; Commentary: -;; This is a major mode for directory browsing and editing. It is -;; documented in the Emacs manual. +;; This is a major mode for directory browsing and editing. +;; It is documented in the Emacs manual. ;; Rewritten in 1990/1991 to add tree features, file marking and ;; sorting by Sebastian Kremer <sk@thp.uni-koeln.de>. @@ -62,35 +62,42 @@ :type 'string :group 'dired) -(defvar dired-subdir-switches nil +(defcustom dired-subdir-switches nil "If non-nil, switches passed to `ls' for inserting subdirectories. -If nil, `dired-listing-switches' is used.") - -; Don't use absolute file names as /bin should be in any PATH and people -; may prefer /usr/local/gnu/bin or whatever. However, chown is -; usually not in PATH. +If nil, `dired-listing-switches' is used." + :group 'dired + :type '(choice (const :tag "Use dired-listing-switches" nil) + (string :tag "Switches"))) ;;;###autoload -(defvar dired-chown-program - (purecopy - (if (memq system-type '(hpux usg-unix-v irix gnu/linux cygwin)) - "chown" - (if (file-exists-p "/usr/sbin/chown") - "/usr/sbin/chown" - "/etc/chown"))) - "Name of chown command (usually `chown' or `/etc/chown').") - -(defvar dired-use-ls-dired 'unspecified +(defcustom dired-chown-program + (purecopy (cond ((executable-find "chown") "chown") + ((file-executable-p "/usr/sbin/chown") "/usr/sbin/chown") + ((file-executable-p "/etc/chown") "/etc/chown") + (t "chown"))) + "Name of chown command (usually `chown')." + :group 'dired + :type 'file) + +(defcustom dired-use-ls-dired 'unspecified "Non-nil means Dired should use \"ls --dired\". The special value of `unspecified' means to check explicitly, and save the result in this variable. This is performed the first -time `dired-insert-directory' is called.") - -(defvar dired-chmod-program "chmod" - "Name of chmod command (usually `chmod').") - -(defvar dired-touch-program "touch" - "Name of touch command (usually `touch').") +time `dired-insert-directory' is called." + :group 'dired + :type '(choice (const :tag "Check for --dired support" unspecified) + (const :tag "Do not use --dired" nil) + (other :tag "Use --dired" t))) + +(defcustom dired-chmod-program "chmod" + "Name of chmod command (usually `chmod')." + :group 'dired + :type 'file) + +(defcustom dired-touch-program "touch" + "Name of touch command (usually `touch')." + :group 'dired + :type 'file) (defcustom dired-ls-F-marks-symlinks nil "Informs Dired about how `ls -lF' marks symbolic links.