X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fbinhex.el;h=5141a742ce280ac51de025aa601c1c5d3bc585f2;hb=70df8dffbb57036113fb6b34e46d17eb1c57d1d1;hp=dba9190ea74f61317d51f1c646d0f3bab955c7d5;hpb=f0c713cd83bedba22da4cc4a58409f0b01a6988c;p=gnus

diff --git a/lisp/binhex.el b/lisp/binhex.el
index dba9190ea..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 <zsh@cs.rochester.edu>
 ;; Keywords: binhex news
@@ -25,8 +26,6 @@
 
 ;;; Code:
 
-(autoload 'executable-find "executable")
-
 (eval-when-compile (require 'cl))
 
 (eval-and-compile
@@ -36,7 +35,7 @@
       'identity)))
 
 (defcustom binhex-decoder-program "hexbin"
-  "*Non-nil value should be a string that names a uu decoder.
+  "*Non-nil value should be a string that names a binhex decoder.
 The program should expect to read binhex data on its standard
 input and write the converted data to its standard output."
   :type 'string
@@ -81,13 +80,16 @@ input and write the converted data to its standard output."
 	((boundp 'temporary-file-directory) temporary-file-directory)
 	("/tmp/")))
 
-(if (featurep 'xemacs)
-    (defalias 'binhex-insert-char 'insert-char)
-  (defun binhex-insert-char (char &optional count ignored buffer)
-    (if (or (null buffer) (eq buffer (current-buffer)))
-	(insert-char char count)
-      (with-current-buffer buffer
-	(insert-char char count)))))
+(eval-and-compile
+  (defalias 'binhex-insert-char
+    (if (featurep 'xemacs)
+	'insert-char
+      (lambda (char &optional count ignored buffer)
+	"Insert COUNT copies of CHARACTER into BUFFER."
+	(if (or (null buffer) (eq buffer (current-buffer)))
+	    (insert-char char count)
+	  (with-current-buffer buffer
+	    (insert-char char count)))))))
 
 (defvar binhex-crc-table
   [0  4129  8258  12387  16516  20645  24774  28903
@@ -240,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)