X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fuudecode.el;h=c1e3439a5dedfa66fbd62ad4bb899ac15e49af56;hp=9dc430e825d150c9480e420c8326ceb6615dfea9;hb=91bfdfbc3e77a244efc8af47a47b30b10f48ec87;hpb=b58d62328adf02b341b460a98819a54a0d629b60

diff --git a/lisp/uudecode.el b/lisp/uudecode.el
index 9dc430e82..c1e3439a5 100644
--- a/lisp/uudecode.el
+++ b/lisp/uudecode.el
@@ -1,17 +1,16 @@
 ;;; uudecode.el -- elisp native uudecode
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: uudecode news
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -41,20 +38,20 @@
   :group 'news)
 
 (defcustom uudecode-decoder-program "uudecode"
-  "*Non-nil value should be a string that names a uu decoder.
+  "Non-nil value should be a string that names a uu decoder.
 The program should expect to read uu data on its standard
 input and write the converted data to its standard output."
   :type 'string
   :group 'uudecode)
 
 (defcustom uudecode-decoder-switches nil
-  "*List of command line flags passed to `uudecode-decoder-program'."
+  "List of command line flags passed to `uudecode-decoder-program'."
   :group 'uudecode
   :type '(repeat string))
 
 (defcustom uudecode-use-external
   (executable-find uudecode-decoder-program)
-  "*Use external uudecode program."
+  "Use external uudecode program."
   :version "22.1"
   :group 'uudecode
   :type 'boolean)
@@ -105,7 +102,7 @@ used is specified by `uudecode-decoder-program'."
 	(let ((cdir default-directory)
 	      (default-process-coding-system
 		(if (featurep 'xemacs)
-		    ;; In XEmacs, `nil' is not a valid coding system.
+		    ;; In XEmacs, nil is not a valid coding system.
 		    '(binary . binary)
 		  nil)))
 	  (unwind-protect
@@ -200,10 +197,10 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
 	  (cond
 	   (done)
 	   ((> 0 remain)
-	    (error "uucode line ends unexpectly")
+	    (error "uucode line ends unexpectedly")
 	    (setq done t))
 	   ((and (= (point) end) (not done))
-	    ;;(error "uucode ends unexpectly")
+	    ;;(error "uucode ends unexpectedly")
 	    (setq done t))
 	   ((= counter 3)
 	    (setq result (cons
@@ -217,14 +214,14 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
 			  result))))
 	  (skip-chars-forward non-data-chars end))
 	(if file-name
-	    (let (default-enable-multibyte-characters)
-	      (with-temp-file file-name
-		(insert (apply 'concat (nreverse result)))))
+            (with-temp-file file-name
+              (unless (featurep 'xemacs) (set-buffer-multibyte nil))
+              (insert (apply 'concat (nreverse result))))
 	  (or (markerp end) (setq end (set-marker (make-marker) end)))
 	  (goto-char start)
 	  (if enable-multibyte-characters
-	      (mapc #'(lambda (x) (insert (uudecode-string-to-multibyte x)))
-		    (nreverse result))
+	      (dolist (x (nreverse result))
+                (insert (uudecode-string-to-multibyte x)))
 	    (insert (apply 'concat (nreverse result))))
 	  (delete-region (point) end))))))
 
@@ -238,5 +235,4 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
 
 (provide 'uudecode)
 
-;;; arch-tag: e1f09ed5-62b4-4677-9f13-4e81c4fe8ce3
 ;;; uudecode.el ends here