X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fbinhex.el;h=5141a742ce280ac51de025aa601c1c5d3bc585f2;hb=dee3b415bd86cf0c59063b95edfa0c3f909138af;hp=07bc075e62a6c653bf2526dc6038b63f1431d76a;hpb=ebd34ccb8fd727349aa83754348ce664c9700aaf;p=gnus diff --git a/lisp/binhex.el b/lisp/binhex.el index 07bc075e6..5141a742c 100644 --- a/lisp/binhex.el +++ b/lisp/binhex.el @@ -1,5 +1,6 @@ ;;; binhex.el --- elisp native binhex decode -;; Copyright (c) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (c) 1998, 1999, 2000, 2001, 2002, 2004 +;; Free Software Foundation, Inc. ;; Author: Shenghuo Zhu ;; Keywords: binhex news @@ -25,8 +26,6 @@ ;;; Code: -(autoload 'executable-find "executable") - (eval-when-compile (require 'cl)) (eval-and-compile @@ -243,14 +242,13 @@ If HEADER-ONLY is non-nil only decode header and return filename." (setq file-name-length (char-after (point-min)) data-fork-start (+ (point-min) file-name-length 22)))) - (if (and (null header) - (with-current-buffer work-buffer - (>= (buffer-size) data-fork-start))) - (progn - (binhex-verify-crc work-buffer - (point-min) data-fork-start) - (setq header (binhex-header work-buffer)) - (if header-only (setq tmp nil counter 0)))) + (when (and (null header) + (with-current-buffer work-buffer + (>= (buffer-size) data-fork-start))) + (binhex-verify-crc work-buffer + (point-min) data-fork-start) + (setq header (binhex-header work-buffer)) + (when header-only (setq tmp nil counter 0))) (setq tmp (and tmp (not (eq inputpos end))))) (cond ((= counter 3)