Synch to No Gnus 200510111141.

[elisp/gnus.git-] / lisp / gnus-uu.el

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 9da4de0..64ada4e 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1,6 +1,7 @@
 ;;; gnus-uu.el --- extract (uu)encoded files in Gnus
-;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-;;        2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998,
+;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Created: 2 Oct 1993
@@ -20,8 +21,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -537,19 +538,19 @@ didn't work, and overwrite existing files.  Otherwise, ask each time."
 
 (defun gnus-message-process-mark (unmarkp new-marked)
   (let ((old (- (length gnus-newsgroup-processable) (length new-marked))))
-    (message "%d mark%s %s%s"
-            (length new-marked)
-            (if (= (length new-marked) 1) "" "s")
-            (if unmarkp "removed" "added")
-            (cond
-             ((and (zerop old)
-                   (not unmarkp))
-              "")
-             (unmarkp
-              (format ", %d remain marked"
-                      (length gnus-newsgroup-processable)))
-             (t
-              (format ", %d already marked" old))))))
+    (gnus-message 6 "%d mark%s %s%s"
+                 (length new-marked)
+                 (if (= (length new-marked) 1) "" "s")
+                 (if unmarkp "removed" "added")
+                 (cond
+                  ((and (zerop old)
+                        (not unmarkp))
+                   "")
+                  (unmarkp
+                   (format ", %d remain marked"
+                           (length gnus-newsgroup-processable)))
+                  (t
+                   (format ", %d already marked" old))))))
 
 (defun gnus-new-processable (unmarkp articles)
   (if unmarkp
@@ -577,16 +578,18 @@ When called interactively, prompt for REGEXP."
   (interactive "sUnmark (regexp): ")
   (gnus-uu-mark-by-regexp regexp t))
 
-(defun gnus-uu-mark-series ()
+(defun gnus-uu-mark-series (&optional silent)
   "Mark the current series with the process mark."
   (interactive)
   (let* ((articles (gnus-uu-find-articles-matching))
-         (l (length articles)))
+        (l (length articles)))
     (while articles
       (gnus-summary-set-process-mark (car articles))
       (setq articles (cdr articles)))
-    (message "Marked %d articles" l))
-  (gnus-summary-position-point))
+    (unless silent
+      (gnus-message 6 "Marked %d articles" l))
+    (gnus-summary-position-point)
+    l))
 
 (defun gnus-uu-mark-region (beg end &optional unmark)
   "Set the process mark on all articles between point and mark."
@@ -694,14 +697,16 @@ When called interactively, prompt for REGEXP."
   (setq gnus-newsgroup-processable nil)
   (save-excursion
     (let ((data gnus-newsgroup-data)
+         (count 0)
          number)
       (while data
        (when (and (not (memq (setq number (gnus-data-number (car data)))
                              gnus-newsgroup-processable))
                   (vectorp (gnus-data-header (car data))))
          (gnus-summary-goto-subject number)
-         (gnus-uu-mark-series))
-       (setq data (cdr data)))))
+         (setq count (+ count (gnus-uu-mark-series t))))
+       (setq data (cdr data)))
+      (gnus-message 6 "Marked %d articles" count)))
   (gnus-summary-position-point))
 
 ;; All PostScript functions written by Erik Selberg <speed@cs.washington.edu>.
@@ -844,7 +849,7 @@ When called interactively, prompt for REGEXP."
              (erase-buffer)
              (insert (format
                       "Date: %s\nFrom: %s\nSubject: %s Digest\n\n"
-                      (current-time-string) name name))
+                      (message-make-date) name name))
              (insert "Topics:\n")))
        (when (not (eq in-state 'end))
          (setq state (list 'middle))))
@@ -901,16 +906,16 @@ When called interactively, prompt for REGEXP."
        (if gnus-uu-digest-buffer
            (with-current-buffer gnus-uu-digest-buffer
              (erase-buffer)
-             (insert-buffer "*gnus-uu-pre*")
+             (insert-buffer-substring "*gnus-uu-pre*")
              (goto-char (point-max))
-             (insert-buffer "*gnus-uu-body*"))
+             (insert-buffer-substring "*gnus-uu-body*"))
          (save-excursion
            (set-buffer "*gnus-uu-pre*")
            (insert (format "\n\n%s\n\n" (make-string 70 ?-)))
            (if gnus-uu-digest-buffer
                (with-current-buffer gnus-uu-digest-buffer
                  (erase-buffer)
-                 (insert-buffer "*gnus-uu-pre*"))
+                 (insert-buffer-substring "*gnus-uu-pre*"))
              (gnus-write-buffer-as-coding-system
               nnheader-text-coding-system gnus-uu-saved-article-name)))
          (save-excursion
@@ -923,7 +928,7 @@ When called interactively, prompt for REGEXP."
            (if gnus-uu-digest-buffer
                (with-current-buffer gnus-uu-digest-buffer
                  (goto-char (point-max))
-                 (insert-buffer "*gnus-uu-body*"))
+                 (insert-buffer-substring "*gnus-uu-body*"))
              (let ((file-name-coding-system nnmail-pathname-coding-system))
                (write-region-as-coding-system
                 nnheader-text-coding-system
@@ -1170,7 +1175,7 @@ When called interactively, prompt for REGEXP."
          (ignore-errors
            (replace-match
             (format "%06d"
-                    (string-to-int (buffer-substring
+                    (string-to-number (buffer-substring
                                     (match-beginning 0) (match-end 0)))))))
        (setq string (buffer-substring 1 (point-max)))
        (setcar (car string-list) string)
@@ -1278,7 +1283,7 @@ When called interactively, prompt for REGEXP."
                       (not gnus-uu-be-dangerous)
                       (or (eq gnus-uu-be-dangerous t)
                           (gnus-y-or-n-p
-                           (format "Delete unsuccessfully decoded file %s"
+                           (format "Delete unsuccessfully decoded file %s? "
                                    result-file))))
              (delete-file result-file)))
          (when (memq 'begin process-state)
@@ -1338,7 +1343,7 @@ When called interactively, prompt for REGEXP."
              (gnus-message 2 "No begin part at the beginning")
              (sleep-for 2))
          (setq state 'middle))))
-    
+
       ;; When there are no result-files, then something must be wrong.
     (if result-files
        (message "")