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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d44a09a168e6f25e0e1058b08019524bc68eadb..60e1cab148df9a8f4cc13aaaf1d5f59f4b5b61e9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>

diff --git a/lisp/dired.el b/lisp/dired.el
index 56030feae8b5e896a00db24c9918308c497cc9ff..bf45c508456f41756c4ef38afa24ecd0a2fac901 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -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 @@ some of the `ls' switches are not supported; see the doc string of
   :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.")
+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)))
 
-(defvar dired-chmod-program "chmod"
-  "Name of chmod command (usually `chmod').")
+(defcustom dired-chmod-program "chmod"
+  "Name of chmod command (usually `chmod')."
+  :group 'dired
+  :type 'file)
 
-(defvar dired-touch-program "touch"
-  "Name of touch command (usually `touch').")
+(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.