Mercurial > emacs
changeset 106121:f58be5f9ad87
* find-dired.el (find-name-arg): Remove autoload. (Bug#4387)
* progmodes/grep.el (rgrep): Require `find-dired' for `find-name-arg'.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Thu, 19 Nov 2009 17:37:22 +0000 |
| parents | 973f36f0716a |
| children | 4ff55285a1c0 |
| files | lisp/ChangeLog lisp/find-dired.el lisp/progmodes/grep.el |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 19 16:49:24 2009 +0000 +++ b/lisp/ChangeLog Thu Nov 19 17:37:22 2009 +0000 @@ -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 "> ".
--- a/lisp/find-dired.el Thu Nov 19 16:49:24 2009 +0000 +++ b/lisp/find-dired.el Thu Nov 19 17:37:22 2009 +0000 @@ -70,7 +70,7 @@ :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"
--- a/lisp/progmodes/grep.el Thu Nov 19 16:49:24 2009 +0000 +++ b/lisp/progmodes/grep.el Thu Nov 19 17:37:22 2009 +0000 @@ -876,7 +876,7 @@ (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 @@ (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