diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/find-dired.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/grep.el | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ee53e709a1e..9249454f5bd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-11-19 Juri Linkov <juri@jurta.org> + + * find-dired.el (find-name-arg): Remove autoload. (Bug#4387) + + * progmodes/grep.el (rgrep): Require `find-dired' for `find-name-arg'. + 2009-11-19 Chong Yidong <cyd@stupidchicken.com> * mail/sendmail.el (mail-yank-prefix): Change default to "> ". diff --git a/lisp/find-dired.el b/lisp/find-dired.el index 98643f71777..aa68286d3a4 100644 --- a/lisp/find-dired.el +++ b/lisp/find-dired.el @@ -70,7 +70,7 @@ On other systems, the closest you can come is to use `-l'." :type 'string :group 'find-dired) -;;;###autoload +;; This used to be autoloaded (see bug#4387). (defcustom find-name-arg (purecopy (if read-file-name-completion-ignore-case "-iname" diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 7d01777d441..c1d19c37bc8 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -876,7 +876,7 @@ This command shares argument histories with \\[rgrep] and \\[grep]." (setq default-directory dir)))))) -(defvar find-name-arg) ; autoloaded +(defvar find-name-arg) ; not autoloaded but defined in find-dired ;;;###autoload (defun rgrep (regexp &optional files dir confirm) @@ -917,6 +917,7 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]." (if (not (string= regexp grep-find-command)) (compilation-start regexp 'grep-mode)) (setq dir (file-name-as-directory (expand-file-name dir))) + (require 'find-dired) ; for `find-name-arg' (let ((command (grep-expand-template grep-find-template regexp |