X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Fflim.git;a=blobdiff_plain;f=mel-u.el;h=c5f3fe179949d3cd582f4cf5aab701d5d1f13d02;hp=e6612cdb480433123adf910871b26d335c258ad5;hb=HEAD;hpb=5155cc349be9ef07f765a5976e7b6bb495d68057

diff --git a/mel-u.el b/mel-u.el
index e6612cd..c5f3fe1 100644
--- a/mel-u.el
+++ b/mel-u.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -69,22 +69,21 @@ This function uses external uuencode decoder which is specified by
 variable `uuencode-external-decoder'."
   (interactive "*r")
   (save-excursion
-    (let ((filename (save-excursion
-		      (save-restriction
-			(narrow-to-region start end)
-			(goto-char start)
-			(if (re-search-forward "^begin [0-9]+ " nil t)
-			    (if (looking-at ".+$")
-				(buffer-substring (match-beginning 0)
-						  (match-end 0)))))))
-	  (default-directory temporary-file-directory))
-      (if filename
-	  (let ((coding-system-for-read  'binary)
-		(coding-system-for-write 'binary))
-	    (apply (function call-process-region)
-		   start end (car uuencode-external-decoder)
-		   t nil nil
-		   (cdr uuencode-external-decoder))
+    (let ((filename (make-temp-file "x-uue")))
+      (save-excursion
+	(save-restriction
+	  (set-mark end)
+	  (narrow-to-region start end)
+	  (goto-char start)
+	  (when (and (re-search-forward "^begin [0-9]+ " nil t)
+		     (looking-at ".+$"))
+	    (replace-match filename)
+	    (let ((coding-system-for-read  'binary)
+		  (coding-system-for-write 'binary))
+	      (apply (function call-process-region)
+		     start (mark) (car uuencode-external-decoder)
+		     t nil nil
+		     (cdr uuencode-external-decoder)))
 	    (insert-file-contents filename)
 	    ;; The previous line causes the buffer to be made read-only, I
 	    ;; do not pretend to understand the control flow leading to this
@@ -92,7 +91,7 @@ variable `uuencode-external-decoder'."
 	    ;;	Use `inhibit-read-only' to avoid to force
 	    ;;	buffer-read-only nil. - tomo.
 	    (let ((inhibit-read-only t))
-	      (delete-file filename)))))))
+	      (delete-file filename))))))))
 
 (mel-define-method-function (mime-encode-region start end (nil "x-uue"))
 			    'uuencode-external-encode-region)
@@ -134,9 +133,8 @@ variable `uuencode-external-encoder'."
 START and END are buffer positions."
   (interactive "*r\nFWrite decoded region to file: ")
   (save-excursion
-    (let ((the-buf (current-buffer))
-	  (clone-buf (clone-buffer " *x-uue*"))
-	  (file (make-temp-name "x-uue")))
+    (let ((clone-buf (clone-buffer " *x-uue*"))
+	  (file (make-temp-file "x-uue")))
       (save-excursion
 	(save-restriction
 	  (set-buffer clone-buf)
@@ -147,8 +145,7 @@ START and END are buffer positions."
 		   (looking-at ".+$"))
 	    (replace-match file)
 	    (let ((coding-system-for-read  'binary)
-		  (coding-system-for-write 'binary)
-		  (default-directory temporary-file-directory))
+		  (coding-system-for-write 'binary))
 	      (apply (function call-process-region)
 		     (point-min) (point-max) (car uuencode-external-decoder)
 		     nil nil nil