Changeset 4098 for trunk/lisp/gnus/gnus-art.el

Timestamp:

07/01/06 08:27:06 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/gnus/gnus-art.el (modified) (15 diffs)

trunk/lisp/gnus/gnus-art.el

@@ -493 +493 @@
-
-(defcustom gnus-save-all-headers t
-
+
+
+
+
-  :group 'gnus-article-saving
-  :type 'boolean)
@@ -514 +517 @@
-If `gnus-save-all-headers' is non-nil, this variable will be ignored.
-If that variable is nil, however, all headers that match this regexp
-
+
+
+
+
-  :group 'gnus-article-saving
-  :type 'regexp)
@@ -520 +526 @@
-(defcustom gnus-default-article-saver 'gnus-summary-save-in-rmail
-  "A function to save articles in your favourite format.
-must be interactively callable (in other words, it must
-be an Emacs command)
+will be called by way of the `gnus-summary-save-article'
+command, and friends such as `gnus-summary-save-article-rmail'
-
-Gnus provides the following functions:
@@ -531 +537 @@
-* gnus-summary-save-body-in-file (article body)
-* gnus-summary-save-in-vm (use VM's folder format)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  :group 'gnus-article-saving
-  :type '(radio (function-item gnus-summary-save-in-rmail)
@@ -540 +567 @@
-                (function-item gnus-summary-save-in-vm)
-                (function-item gnus-summary-write-to-file)
+                (function-item gnus-summary-write-body-to-file)
-                (function)))
+
+(defcustom gnus-article-save-coding-system
+  (or (and (mm-coding-system-p 'utf-8) 'utf-8)
+      (and (mm-coding-system-p 'iso-2022-7bit) 'iso-2022-7bit)
+      (and (mm-coding-system-p 'emacs-mule) 'emacs-mule)
+      (and (mm-coding-system-p 'escape-quoted) 'escape-quoted))
+  "Coding system used to save decoded articles to a file.
+
+The recommended coding systems are `utf-8', `iso-2022-7bit' and so on,
+which can safely encode any characters in text.  This is used by the
+commands including:
+
+* gnus-summary-save-article-file
+* gnus-summary-save-article-body-file
+* gnus-summary-write-article-file
+* gnus-summary-write-article-body-file
+
+and the functions to which you may set `gnus-default-article-saver':
+
+* gnus-summary-save-in-file
+* gnus-summary-save-body-in-file
+* gnus-summary-write-to-file
+* gnus-summary-write-body-to-file
+
+Those commands and functions save just text displayed in the article
+buffer to a file if the value of this variable is non-nil.  Note that
+buttonized MIME parts will be lost in a saved file in that case.
+Otherwise, raw articles will be saved."
+  :group 'gnus-article-saving
+  :type `(choice
+          :format "%{%t%}:\n %[Value Menu%] %v"
+          (const :tag "Save raw articles" nil)
+          ,@(delq nil
+                  (mapcar
+                   (lambda (arg) (if (mm-coding-system-p (nth 3 arg)) arg))
+                   '((const :tag "UTF-8" utf-8)
+                     (const :tag "iso-2022-7bit" iso-2022-7bit)
+                     (const :tag "Emacs internal" emacs-mule)
+                     (const :tag "escape-quoted" escape-quoted))))
+          (symbol :tag "Coding system")))
-
-(defcustom gnus-rmail-save-name 'gnus-plain-save-name
@@ -3250 +3318 @@
-(defun gnus-article-save (save-buffer file &optional num)
-  "Save the currently selected article."
-
-
+
+
+
+
-    (let ((gnus-visible-headers
-
+
+
-          (gnus-article-buffer save-buffer))
-      (save-excursion
@@ -3278 +3349 @@
-
-(defun gnus-read-save-file-name (prompt &optional filename
-
+
+
-  (let ((default-name
-          (funcall function group headers (symbol-value variable)))
@@ -3291 +3363 @@
-            (filename filename)
-            (t
+             (when (symbol-value dir-var)
+               (setq default-name (expand-file-name
+                                   (file-name-nondirectory default-name)
+                                   (symbol-value dir-var))))
-             (let* ((split-name (gnus-get-split-value gnus-split-methods))
-                    (prompt
@@ -3355 +3431 @@
-               (nnheader-translate-file-chars file))))))
-    (gnus-make-directory (file-name-directory result))
-
+
+
+
+
+
-
-(defun gnus-article-archive-name (group)
@@ -3403 +3483 @@
-  filename)
-
+(put 'gnus-summary-save-in-file :decode t)
+(put 'gnus-summary-save-in-file :headers 'gnus-saved-headers)
-(defun gnus-summary-save-in-file (&optional filename overwrite)
-  "Append this article to file.
@@ -3421 +3503 @@
-  filename)
-
+(put 'gnus-summary-write-to-file :decode t)
+(put 'gnus-summary-write-to-file :function 'gnus-summary-save-in-file)
+(put 'gnus-summary-write-to-file :headers 'gnus-saved-headers)
-(defun gnus-summary-write-to-file (&optional filename)
-  "Write this article to a file, overwriting it if the file exists.
-Optional argument FILENAME specifies file name.
-The directory to save in defaults to `gnus-article-save-directory'."
-
-
-
+
+
+
+
+
+
+
+
-  "Append this article body to a file.
-Optional argument FILENAME specifies file name.
@@ -3441 +3531 @@
-        (when (article-goto-body)
-          (narrow-to-region (point) (point-max)))
+        (when (and overwrite
+                   (file-exists-p filename))
+          (delete-file filename))
-        (gnus-output-to-file filename))))
-  filename)
+
+(put 'gnus-summary-write-body-to-file :decode t)
+(put 'gnus-summary-write-body-to-file
+     :function 'gnus-summary-save-body-in-file)
+(defun gnus-summary-write-body-to-file (&optional filename)
+  "Write this article body to a file, overwriting it if the file exists.
+Optional argument FILENAME specifies file name.
+The directory to save in defaults to `gnus-article-save-directory'."
+  (setq filename (gnus-read-save-file-name
+                  "Save %s body in file" filename
+                  gnus-file-save-name gnus-newsgroup-name
+                  gnus-current-headers nil 'gnus-newsgroup-last-directory))
+  (gnus-summary-save-body-in-file filename t))
-
-(defun gnus-summary-save-in-pipe (&optional command)
@@ -4822 +4928 @@
-              (narrow-to-region (point-min) (point))
-              (gnus-article-save-original-date
-
+
+
+
+
+
-
-(defcustom gnus-mime-display-multipart-as-mixed nil
@@ -5183 +5293 @@
-
-(defun gnus-output-to-file (file-name)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    (with-temp-buffer
+      (when exists
+        (insert-file-contents file-name)
+        (goto-char (point-min))
+        ;; Remove the existing coding cookie.
+        (when (looking-at "X-Gnus-Coding-System: .+\n\n")
+          (delete-region (match-beginning 0) (match-end 0))))
+      (goto-char (point-max))
-      (insert-buffer-substring artbuf)
-      ;; Append newline at end of the buffer as separator, and then
@@ -5191 +5321 @@
-      (goto-char (point-max))
-      (insert "\n")
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defun gnus-narrow-to-page (&optional arg)