Re: [COMMIT PATCH PACKAGES(ecrypto)] Sync with Gnus

Re: [COMMIT PATCH PACKAGES(ecrypto)] Sync with Gnus

[Katsumi Yamaoka]

Hi,

>>>>> In <iluznduual9.fsf@latte.josefsson.org>
>>>>>	Simon Josefsson <jas@extundo.com> wrote:

> 2003-12-15  Simon Josefsson  <jas@extundo.com>

> 	* sha1-el.el (autoload): Ignore errors for
> 	executable-find. (XEmacs ecrypto does not require sh-script where
> 	executable.el is located.)
> 	(sha1-use-external): Likewise.

[...]

> -(defcustom sha1-use-external (executable-find (car sha1-program))
> +(defcustom sha1-use-external (ignore-errors
> +			       (executable-find (car sha1-program)))

I noticed that change requires cl at the run-time (in FSFmacs).
It is because arguments in defcustom forms aren't expanded or
byte-compiled.  It is better to replace ignore-errors with
condition-case.

I'm using the following hook in order to put the CanLock header
even to mails:

(add-hook 'message-header-hook 'canlock-insert-header t)

When I send a mail, it causes an error as follows:

Debugger entered--Lisp error: (void-function ignore-errors)
  (ignore-errors (executable-find (car sha1-program)))
  eval((ignore-errors (executable-find (car sha1-program))))
  custom-initialize-reset(sha1-use-external (ignore-errors (executable-find (car sha1-program))))
  custom-declare-variable(sha1-use-external (ignore-errors (executable-find (car sha1-program))) ("/usr/local/share/emacs/21.3.50/site-lisp/gnus/sha1-el.elc" . -1394) :type boolean :group sha1)
  sha1-binary("...")
  canlock-sha1("...")
  canlock-make-cancel-key("<Message-ID>" "Turtle Power!")
  canlock-insert-header()
  run-hooks(message-header-hook)
  message-send-mail(nil)
-- 
Katsumi Yamaoka <yamaoka@jpl.org>

Re: [COMMIT PATCH PACKAGES(ecrypto)] Sync with Gnus

[Simon Josefsson]

Katsumi Yamaoka <yamaoka@jpl.org> writes:

> I noticed that change requires cl at the run-time (in FSFmacs).
> It is because arguments in defcustom forms aren't expanded or
> byte-compiled.  It is better to replace ignore-errors with
> condition-case.

Yup.  I have installed this, please verify that it works.  Sorry for
the trouble.

2003-12-16  Simon Josefsson  <jas@extundo.com>

	* sha1-el.el (autoload): Don't use ignore-errors.
	(sha1-use-external): Use condition-case.  Suggested by Katsumi
	Yamaoka <yamaoka@jpl.org>.

Index: sha1-el.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecrypto/sha1-el.el,v
retrieving revision 1.3
diff -u -p -r1.3 sha1-el.el
--- sha1-el.el  15 Dec 2003 01:36:40 -0000      1.3
+++ sha1-el.el  16 Dec 2003 00:58:30 -0000
@@ -54,7 +54,7 @@
  
 (require 'hex-util)
  
-(ignore-errors (autoload 'executable-find "executable"))
+(autoload 'executable-find "executable")
  
 ;;;
 ;;; external SHA1 function.
@@ -79,8 +79,9 @@ It must be a string \(program name\) or
   :type '(repeat string)
   :group 'sha1)
  
-(defcustom sha1-use-external (ignore-errors
-                              (executable-find (car sha1-program)))
+(defcustom sha1-use-external (condition-case ()
+                                (executable-find (car sha1-program))
+                              (error))
   "*Use external SHA1 program.
 If this variable is set to nil, use internal function only."
   :type 'boolean