Re: executable-find moved to files.el in Emacs 22

["Arne Jørgensen" <arne@arnested.dk>]

[-- Attachment #1: Type: text/plain, Size: 603 bytes --]

Katsumi Yamaoka <yamaoka@jpl.org> writes:

>>>>>> In <8764xnk0gq.fsf@arnested.dk> Arne Jørgensen wrote:
>
>> Hi,
>
>> `executable-find' has just been moved from `executable' to `files' in
>> Emacs 22.
>
>> This patch fixes the two autoloads of `executable-find' in Gnus.
>
> [...]
>
>> -    (autoload 'executable-find "executable")
>> +    (if (>= emacs-major-version 22)
>> +	(autoload 'executable-find "files")
>> +      (autoload 'executable-find "executable"))
>
> files.el is always loaded, isn't it?

Right. So how about this patch then?

Kind regards,
-- 
Arne Jørgensen <http://arnested.dk/>


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: executable-find.patch --]
[-- Type: text/x-patch, Size: 1938 bytes --]

Index: lisp/ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/ChangeLog,v
retrieving revision 7.694
diff -u -p -r7.694 ChangeLog
--- lisp/ChangeLog	9 May 2005 19:18:02 -0000	7.694
+++ lisp/ChangeLog	13 May 2005 08:52:12 -0000
@@ -1,3 +1,10 @@
+2005-05-13  Arne J^[,Ax^[(Brgensen  <arne@arnested.dk>
+
+	* dgnushack.el: Don't autoload `executable-find' in Emacs 22 and
+	above.
+
+	* hashcash.el: Ditto.
+
 2005-05-09  Simon Josefsson  <jas@extundo.com>
 
 	* pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching,
Index: lisp/dgnushack.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/dgnushack.el,v
retrieving revision 7.16
diff -u -p -r7.16 dgnushack.el
--- lisp/dgnushack.el	26 Jan 2005 08:54:34 -0000	7.16
+++ lisp/dgnushack.el	13 May 2005 08:52:12 -0000
@@ -195,7 +195,8 @@ fixed in Emacs after 21.3."
     (autoload 'delete-annotation "annotations")
     (autoload 'dolist "cl-macs" nil nil 'macro)
     (autoload 'enriched-decode "enriched")
-    (autoload 'executable-find "executable")
+    (when (< emacs-major-version 22)
+      (autoload 'executable-find "executable"))
     (autoload 'font-lock-fontify-buffer "font-lock" nil t)
     (autoload 'info "info" nil t)
     (autoload 'mail-fetch-field "mail-utils")
Index: lisp/hashcash.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/hashcash.el,v
retrieving revision 7.11
diff -u -p -r7.11 hashcash.el
--- lisp/hashcash.el	16 Jan 2005 10:00:19 -0000	7.11
+++ lisp/hashcash.el	13 May 2005 08:52:12 -0000
@@ -50,7 +50,8 @@
 ;;; Code:
 
 (eval-and-compile
- (autoload 'executable-find "executable"))
+  (when (< emacs-major-version 22)
+    (autoload 'executable-find "executable")))
 
 (defcustom hashcash-default-payment 20
   "*The default number of bits to pay to unknown users.