X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fuudecode.el;h=7b709e201649c685e7cc526a69184ada8eedf92c;hb=027a90912122f2cb3e36d82310f32962e3ce2f71;hp=06252d06930b9895bac64b97e90132f23df0d090;hpb=daea6bb7f5bda46077dabaf7a2ab4450df400fa7;p=elisp%2Fgnus.git-

diff --git a/lisp/uudecode.el b/lisp/uudecode.el
index 06252d0..7b709e2 100644
--- a/lisp/uudecode.el
+++ b/lisp/uudecode.el
@@ -1,12 +1,10 @@
 ;;; uudecode.el -- elisp native uudecode
-;; Copyright (c) 1998 by Shenghuo Zhu <zsh@cs.rochester.edu>
+;; Copyright (c) 1998,99 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
-;; $Revision: 5.4 $
-;; Keywords: uudecode
+;; Keywords: uudecode news
 
-;; This file is not part of GNU Emacs, but the same permissions
-;; apply.
+;; This file is a part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -55,7 +53,7 @@ input and write the converted data to its standard output.")
 (defvar uudecode-temporary-file-directory
   (cond ((fboundp 'temp-directory) (temp-directory))
 	((boundp 'temporary-file-directory) temporary-file-directory)
-	("/tmp/")))
+	("/tmp")))
 
 ;;;###autoload
 (defun uudecode-decode-region-external (start end &optional file-name)
@@ -75,9 +73,12 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
 	       (setq file-name (read-file-name "File to Name:"
 					       nil nil nil
 					       (match-string 1)))))
-	(setq tempfile (expand-file-name
-			(or file-name (concat uudecode-temporary-file-directory
-					      (make-temp-name "uu")))))
+	(setq tempfile (if file-name
+			   (expand-file-name file-name)
+			 (make-temp-name
+			  ;; /tmp/uu...
+			  (expand-file-name
+			   "uu" uudecode-temporary-file-directory))))
 	(let ((cdir default-directory) default-process-coding-system)
 	  (unwind-protect
 	      (progn
@@ -104,10 +105,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
 		(insert-file-contents-literally tempfile)))
 	  (message "Can not uudecode")))
       (and work-buffer (kill-buffer work-buffer))
-      (condition-case ()
-	  (or file-name (delete-file tempfile))
-	(error))
-      )))
+      (ignore-errors (or file-name (delete-file tempfile))))))
 
 (if (string-match "XEmacs" emacs-version)
     (defalias 'uudecode-insert-char 'insert-char)
@@ -169,25 +167,25 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
 			 (uudecode-insert-char
 			  (logand (lsh bits -8) 255) 1 nil work-buffer)
 			 (uudecode-insert-char (logand bits 255) 1 nil
-					 work-buffer)
+					       work-buffer)
 			 (setq bits 0 counter 0))
 			(t (setq bits (lsh bits 6)))))))
 	      (cond
-		 (done)
-		 ((> 0 remain)
-		  (error "uucode line ends unexpectly")
-		  (setq done t))
-		 ((and (= (point) end) (not done))
-		  ;(error "uucode ends unexpectly")
-		  (setq done t))
-		 ((= counter 3)
-		  (uudecode-insert-char (logand (lsh bits -16) 255) 1 nil
-				  work-buffer)
-		  (uudecode-insert-char (logand (lsh bits -8) 255) 1 nil
-				  work-buffer))
-		 ((= counter 2)
-		  (uudecode-insert-char (logand (lsh bits -10) 255) 1 nil
-				  work-buffer)))
+	       (done)
+	       ((> 0 remain)
+		(error "uucode line ends unexpectly")
+		(setq done t))
+	       ((and (= (point) end) (not done))
+		;;(error "uucode ends unexpectly")
+		(setq done t))
+	       ((= counter 3)
+		(uudecode-insert-char (logand (lsh bits -16) 255) 1 nil
+				      work-buffer)
+		(uudecode-insert-char (logand (lsh bits -8) 255) 1 nil
+				      work-buffer))
+	       ((= counter 2)
+		(uudecode-insert-char (logand (lsh bits -10) 255) 1 nil
+				      work-buffer)))
 	      (skip-chars-forward non-data-chars end))
 	    (if file-name
 		(save-excursion