From 623da4cefef8e515e794ba6f7a5daa34d86415b2 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 16 Dec 2003 01:01:19 +0000 Subject: [PATCH] Synch to Gnus 200312160057. --- lisp/ChangeLog | 6 ++++++ lisp/sha1-el.el | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 30018b9..a96e6c9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2003-12-16 Simon Josefsson + + * sha1-el.el (autoload): Don't use ignore-errors. + (sha1-use-external): Use condition-case. Suggested by Katsumi + Yamaoka . + 2003-12-15 Katsumi Yamaoka * nnmail.el (nnmail-split-fancy): Make it customizable with Emacs diff --git a/lisp/sha1-el.el b/lisp/sha1-el.el index 6c0df3d..ab5804d 100644 --- a/lisp/sha1-el.el +++ b/lisp/sha1-el.el @@ -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 list of strings \(name and its args\)." :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 -- 1.7.10.4