From aae4b48c36b85f4af4fceaeb9091cf567065649e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 13 Dec 2010 20:35:33 -0800 Subject: [PATCH] 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. --- lisp/ChangeLog | 4 ++++ lisp/dired.el | 3 --- lisp/mail/sendmail.el | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 60e1cab148d..19cd1963cff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2010-12-14 Glenn Morris + * 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 bf45c508456..cec4ffa2f1c 100644 --- 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 7a9ab601bcc..fb193544533 100644 --- 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) -- 2.39.5