From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/60297 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?Arne_J=C3=B8rgensen?= Newsgroups: gmane.emacs.gnus.general Subject: Re: executable-find moved to files.el in Emacs 22 Date: Fri, 13 May 2005 10:55:01 +0200 Organization: Arne Joergensen -- http://arnested.dk/ Message-ID: <87oebfh5ei.fsf@arnested.dk> References: <8764xnk0gq.fsf@arnested.dk> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: sea.gmane.org 1115974212 30177 80.91.229.2 (13 May 2005 08:50:12 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 13 May 2005 08:50:12 +0000 (UTC) Original-X-From: ding-owner+M8825@lists.math.uh.edu Fri May 13 10:50:11 2005 Return-path: Original-Received: from malifon.math.uh.edu ([129.7.128.13]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DWVrN-0003xp-Ag for ding-account@gmane.org; Fri, 13 May 2005 10:49:29 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu ident=lists) by malifon.math.uh.edu with smtp (Exim 3.20 #1) id 1DWVyB-0007bK-00; Fri, 13 May 2005 03:56:31 -0500 Original-Received: from util2.math.uh.edu ([129.7.128.23]) by malifon.math.uh.edu with esmtp (Exim 3.20 #1) id 1DWVy6-0007bF-00 for ding@lists.math.uh.edu; Fri, 13 May 2005 03:56:26 -0500 Original-Received: from quimby.gnus.org ([80.91.224.244]) by util2.math.uh.edu with esmtp (Exim 4.30) id 1DWVy3-0006qs-VV for ding@lists.math.uh.edu; Fri, 13 May 2005 03:56:24 -0500 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1DWVy2-0001ND-00 for ; Fri, 13 May 2005 10:56:22 +0200 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1DWVpS-0003kt-Fe for ding@gnus.org; Fri, 13 May 2005 10:47:30 +0200 Original-Received: from 213.237.94.152 ([213.237.94.152]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 13 May 2005 10:47:30 +0200 Original-Received: from arne by 213.237.94.152 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 13 May 2005 10:47:30 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-To: ding@gnus.org Original-Lines: 90 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: 213.237.94.152 X-Face: 5t,7/Y$&<1A_t.$vC2{pWZ{m@3_06;kcm]no{hgEL/}Uz(>XV6cl4}xO\v?-h3%>znNaZtq `~rf,GY1T%r=a.zH`hOb(-]'x)nI088Z&|e;V^h;/TShou User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) Cancel-Lock: sha1:SQSI4VnbI/zLt6cy14ICACZ/gOg= X-Spam-Score: -4.9 (----) Precedence: bulk Original-Sender: ding-owner@lists.math.uh.edu Xref: news.gmane.org gmane.emacs.gnus.general:60297 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:60297 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Katsumi Yamaoka 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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=executable-find.patch Content-Transfer-Encoding: 8bit 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 + + * dgnushack.el: Don't autoload `executable-find' in Emacs 22 and + above. + + * hashcash.el: Ditto. + 2005-05-09 Simon Josefsson * 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. --=-=-=--