Remove some dired.el autoload cookies on defcustoms.

* lisp/dired.el (dired-trivial-filenames, dired-chown-program)
(dired-auto-revert-buffer): Remove autoload cookies.
* lisp/mail/sendmail.el (mail-recover-1): Require 'dired.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60e1cab..19cd196 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-12-14  Glenn Morris  <rgm@gnu.org>
 
+       * dired.el (dired-trivial-filenames, dired-chown-program)
+       (dired-auto-revert-buffer): Remove autoload cookies.
+       * mail/sendmail.el (mail-recover-1): Require 'dired.
+
        * dired.el (dired-subdir-switches, dired-chown-program)
        (dired-use-ls-dired, dired-chmod-program, dired-touch-program):
        Make into defcustoms.

diff --git a/lisp/dired.el b/lisp/dired.el
index bf45c50..cec4ffa 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -69,7 +69,6 @@ If nil, `dired-listing-switches' is used."
    :type '(choice (const :tag "Use dired-listing-switches" nil)
                   (string :tag "Switches")))
 
-;;;###autoload
 (defcustom dired-chown-program
   (purecopy (cond ((executable-find "chown") "chown")
                   ((file-executable-p "/usr/sbin/chown") "/usr/sbin/chown")
@@ -115,7 +114,6 @@ always set this variable to t."
   :type 'boolean
   :group 'dired-mark)
 
-;;;###autoload
 (defcustom dired-trivial-filenames (purecopy "^\\.\\.?$\\|^#")
   "Regexp of files to skip when finding first file of a directory.
 A value of nil means move to the subdir line.
@@ -763,7 +761,6 @@ for a remote directory.  This feature is used by Auto Revert Mode."
         buffer-read-only
         (dired-directory-changed-p dirname))))
 
-;;;###autoload
 (defcustom dired-auto-revert-buffer nil
   "Automatically revert dired buffer on revisiting.
 If t, revisiting an existing dired buffer automatically reverts it.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 7a9ab60..fb19354 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1817,6 +1817,9 @@ The seventh argument ACTIONS is a list of actions to take
       ;; names are normally ``trivial'', so Dired will set point after
       ;; all the files, at buffer bottom.  We want it on the first
       ;; file instead.
+      ;; Require dired so that dired-trivial-filenames does not get
+      ;; unbound on exit from the let.
+      (require 'dired)
       (let ((dired-trivial-filenames t))
        (dired-other-window wildcard (concat dired-listing-switches "t")))
       (rename-buffer "*Auto-saved Drafts*" t)