executable-find moved to files.el in Emacs 22

executable-find moved to files.el in Emacs 22

[Arne Jørgensen]

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

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.

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: 2039 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:05:38 -0000
@@ -1,3 +1,10 @@
+2005-05-13  Arne J^[,Ax^[(Brgensen  <arne@arnested.dk>
+
+	* dgnushack.el: Autoload `executable-find' from `files' instead of
+	`executable' in Emacs 22.	
+
+	* 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:05:39 -0000
@@ -195,7 +195,9 @@ 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")
+    (if (>= emacs-major-version 22)
+	(autoload 'executable-find "files")
+      (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:05:39 -0000
@@ -50,7 +50,9 @@
 ;;; Code:
 
 (eval-and-compile
- (autoload 'executable-find "executable"))
+  (if (>= emacs-major-version 22)
+      (autoload 'executable-find "files")
+    (autoload 'executable-find "executable")))
 
 (defcustom hashcash-default-payment 20
   "*The default number of bits to pay to unknown users.

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

[Katsumi Yamaoka]

>>>>> 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?

emacs-22.0.50 -batch -q -no-site-file -eval '(message "%s" (fboundp (quote executable-find)))'
t

And the docstring for `autoload' says:

  If function is already defined other than as an autoload,
  this does nothing and returns nil.

Regards,

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

[Norbert Koch]

* Katsumi Yamaoka <yamaoka@jpl.org>:

Hi!

> files.el is always loaded, isn't it?

Not on my "XEmacs 21.4 (patch 17) \"Jumbo Shrimp\" [Lucid]
(i686-pc-cygwin, Mule) of Wed Apr 27 2005 on pcndhdeg"

I see the same error message.

norbert.

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

[Katsumi Yamaoka]

>>>>> In <vz1x8bqzqb.fsf@arafel.viteno.net> Norbert Koch wrote:

>> files.el is always loaded, isn't it?

> Not on my "XEmacs 21.4 (patch 17) \"Jumbo Shrimp\" [Lucid]
> (i686-pc-cygwin, Mule) of Wed Apr 27 2005 on pcndhdeg"

> I see the same error message.

Oh, are all you talking about SXEmacs 22?

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

[Norbert Koch]

* Katsumi Yamaoka <yamaoka@jpl.org>:

> Oh, are all you talking about SXEmacs 22?

No, XEmacs in this case, not SXemacs.

norbert.

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

[Katsumi Yamaoka]

>>>>> In <vzwtq3pjbz.fsf@arafel.viteno.net> Norbert Koch wrote:

>> Oh, are all you talking about SXEmacs 22?

> No, XEmacs in this case, not SXemacs.

I'm confused.  I seem that sh-script/executable.el provides the
executable-find function in XEmacs.  Am I wrong?

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

[Norbert Koch]

* Katsumi Yamaoka <yamaoka@jpl.org>:

> I'm confused.  I seem that sh-script/executable.el provides the
> executable-find function in XEmacs.  Am I wrong?

This is correct, but if I start my editor I get this message.  Maybe
sh-script is not autoloaded correctly or it's a timing issue (I doubt
that).

norbert.

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

[Arne Jørgensen]

[-- 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.

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

[Katsumi Yamaoka]

>>>>> In <87oebfh5ei.fsf@arnested.dk> Arne Jørgensen wrote:

>> files.el is always loaded, isn't it?

> Right. So how about this patch then?

I don't think it is necessary to Emacs because:

emacs-21.1 -batch -q -no-site-file -eval '(message "%s" (fboundp (quote executable-find)))'
t

How about SXEmacs 22?  I don't have it installed and don't know
which module provides that function.

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

[Katsumi Yamaoka]

>>>>> In <b9yis1nv5lb.fsf@jpl.org> Katsumi Yamaoka wrote:

> I don't think it is necessary to Emacs because:

> emacs-21.1 -batch -q -no-site-file -eval '(message "%s" (fboundp (quote executable-find)))'
> t

I meant autoloads for executable-find is never needed to Emacs
that No Gnus supports.

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

[Arne Jørgensen]

Katsumi Yamaoka <yamaoka@jpl.org> writes:

>>>>>> In <b9yis1nv5lb.fsf@jpl.org> Katsumi Yamaoka wrote:
>
>> I don't think it is necessary to Emacs because:
>
>> emacs-21.1 -batch -q -no-site-file -eval '(message "%s" (fboundp (quote executable-find)))'
>> t

I just realized that I only have a problem with `executable-find' on
my mac and not on my linux box. 

There seems to be other problems with the emacs build on my mac so
I'll have to investigate that further, but it's certainly not a Gnus
problem then.

> I meant autoloads for executable-find is never needed to Emacs
> that No Gnus supports.

But there is no need to define a autoload at all for `executable-find'
in No Gnus then?

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

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

[Katsumi Yamaoka]

(The most recent changes in the v5-10 branch don't have to be
merged into the Gnus trunk.)

>>>>> In <87k6m0dzj3.fsf@arnested.dk> Arne Jørgensen wrote:

> But there is no need to define a autoload at all for `executable-find'
> in No Gnus then?

I've fixed it and others.  Thanks.

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

[Jari Aalto]

Katsumi Yamaoka <yamaoka@jpl.org> writes:

| >>>>> In <b9yis1nv5lb.fsf@jpl.org> Katsumi Yamaoka wrote:
>
| > I don't think it is necessary to Emacs because:
>
| > emacs-21.1 -batch -q -no-site-file -eval '(message "%s" (fboundp (quote executable-find)))'
| > t
>
> I meant autoloads for executable-find is never needed to Emacs
> that No Gnus supports.

The autolaod is needed. I run "No Gnus" from CVS with NT Emacs 21.2

Jari

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

[Katsumi Yamaoka]

>>>>> In <k6hiiui8.fsf@cante.net> Jari Aalto wrote:

> Katsumi Yamaoka <yamaoka@jpl.org> writes:

>|> I don't think it is necessary to Emacs because:

>|> emacs-21.1 -batch -q -no-site-file\
>|> -eval '(message "%s" (fboundp (quote executable-find)))'
>|> t

> The autolaod is needed. I run "No Gnus" from CVS with NT Emacs 21.2

In the Linux system, Emacs 21.2 is built with loaddefs.el which
contains the autoload for executable-find.  Do NT Emacsen lack
all those autoloads?

I'll add the autoload for executable-find to many files if it is
a universal problem.

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

[Jari Aalto]

Katsumi Yamaoka <yamaoka@jpl.org> writes:
| > The autolaod is needed. I run "No Gnus" from CVS with NT Emacs 21.2
| 
| In the Linux system, Emacs 21.2 is built with loaddefs.el which
| contains the autoload for executable-find.  Do NT Emacsen lack
| all those autoloads?

You're right. 21.2 includes this. It must have been older Emacs.

Jari