changeset 111958:707b726cfaed

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.
author Glenn Morris <rgm@gnu.org>
date Mon, 13 Dec 2010 20:35:33 -0800
parents e0dabb89175d
children 4db798bcd48b
files lisp/ChangeLog lisp/dired.el lisp/mail/sendmail.el
diffstat 3 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Dec 13 20:32:14 2010 -0800
+++ b/lisp/ChangeLog	Mon Dec 13 20:35:33 2010 -0800
@@ -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.
--- a/lisp/dired.el	Mon Dec 13 20:32:14 2010 -0800
+++ b/lisp/dired.el	Mon Dec 13 20:35:33 2010 -0800
@@ -69,7 +69,6 @@
    :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 @@
   :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 @@
 	 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.
--- a/lisp/mail/sendmail.el	Mon Dec 13 20:32:14 2010 -0800
+++ b/lisp/mail/sendmail.el	Mon Dec 13 20:35:33 2010 -0800
@@ -1817,6 +1817,9 @@
       ;; 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)