[Emacs-diffs] emacs/lisp ChangeLog find-dired.el progmodes/gr...

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/11/19 17:37:25

Modified files:
        lisp           : ChangeLog find-dired.el 
        lisp/progmodes : grep.el 

Log message:
        * find-dired.el (find-name-arg): Remove autoload.  (Bug#4387)
        * progmodes/grep.el (rgrep): Require `find-dired' for `find-name-arg'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16669&r2=1.16670
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/find-dired.el?cvsroot=emacs&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/grep.el?cvsroot=emacs&r1=1.110&r2=1.111

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16669
retrieving revision 1.16670
diff -u -b -r1.16669 -r1.16670
--- ChangeLog   19 Nov 2009 16:48:30 -0000      1.16669
+++ ChangeLog   19 Nov 2009 17:37:22 -0000      1.16670
@@ -1,3 +1,9 @@
+2009-11-19  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mail/sendmail.el (mail-yank-prefix): Change default to "> ".

Index: find-dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/find-dired.el,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- find-dired.el       13 Nov 2009 22:19:52 -0000      1.69
+++ find-dired.el       19 Nov 2009 17:37:25 -0000      1.70
@@ -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"

Index: progmodes/grep.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/grep.el,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- progmodes/grep.el   11 Nov 2009 06:36:45 -0000      1.110
+++ progmodes/grep.el   19 Nov 2009 17:37:25 -0000      1.111
@@ -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