X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/d3e4babdd1267fb5690a17949196640a47c6f159..19998f14b67de66754081cacdbca5668680c41ba:/lisp/gnus/gnus-soup.el diff --git a/lisp/gnus/gnus-soup.el b/lisp/gnus/gnus-soup.el index 98cc0ea285..b63892019d 100644 --- a/lisp/gnus/gnus-soup.el +++ b/lisp/gnus/gnus-soup.el @@ -1,7 +1,7 @@ ;;; gnus-soup.el --- SOUP packet writing support for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; Author: Per Abrahamsen ;; Lars Magne Ingebrigtsen @@ -9,10 +9,10 @@ ;; 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 2, 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 @@ -20,9 +20,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 . ;;; Commentary: @@ -36,36 +34,64 @@ (require 'gnus-start) (require 'gnus-range) +(defgroup gnus-soup nil + "SOUP packet writing support for Gnus." + :group 'gnus) + ;;; User Variables: -(defvar gnus-soup-directory (nnheader-concat gnus-home-directory "SoupBrew/") - "*Directory containing an unpacked SOUP packet.") +(defcustom gnus-soup-directory (nnheader-concat gnus-home-directory "SoupBrew/") + "Directory containing an unpacked SOUP packet." + :version "22.1" ;; Gnus 5.10.9 + :type 'directory + :group 'gnus-soup) -(defvar gnus-soup-replies-directory +(defcustom gnus-soup-replies-directory (nnheader-concat gnus-soup-directory "SoupReplies/") - "*Directory where Gnus will do processing of replies.") - -(defvar gnus-soup-prefix-file "gnus-prefix" - "*Name of the file where Gnus stores the last used prefix.") - -(defvar gnus-soup-packer "tar cf - %s | gzip > $HOME/Soupout%d.tgz" + "Directory where Gnus will do processing of replies." + :version "22.1" ;; Gnus 5.10.9 + :type 'directory + :group 'gnus-soup) + +(defcustom gnus-soup-prefix-file "gnus-prefix" + "Name of the file where Gnus stores the last used prefix." + :version "22.1" ;; Gnus 5.10.9 + :type 'file + :group 'gnus-soup) + +(defcustom gnus-soup-packer "tar cf - %s | gzip > $HOME/Soupout%d.tgz" "Format string command for packing a SOUP packet. The SOUP files will be inserted where the %s is in the string. This string MUST contain both %s and %d. The file number will be -inserted where %d appears.") - -(defvar gnus-soup-unpacker "gunzip -c %s | tar xvf -" - "*Format string command for unpacking a SOUP packet. -The SOUP packet file name will be inserted at the %s.") - -(defvar gnus-soup-packet-directory gnus-home-directory - "*Where gnus-soup will look for REPLIES packets.") - -(defvar gnus-soup-packet-regexp "Soupin" - "*Regular expression matching SOUP REPLIES packets in `gnus-soup-packet-directory'.") - -(defvar gnus-soup-ignored-headers "^Xref:" - "*Regexp to match headers to be removed when brewing SOUP packets.") +inserted where %d appears." + :version "22.1" ;; Gnus 5.10.9 + :type 'string + :group 'gnus-soup) + +(defcustom gnus-soup-unpacker "gunzip -c %s | tar xvf -" + "Format string command for unpacking a SOUP packet. +The SOUP packet file name will be inserted at the %s." + :version "22.1" ;; Gnus 5.10.9 + :type 'string + :group 'gnus-soup) + +(defcustom gnus-soup-packet-directory gnus-home-directory + "Where gnus-soup will look for REPLIES packets." + :version "22.1" ;; Gnus 5.10.9 + :type 'directory + :group 'gnus-soup) + +(defcustom gnus-soup-packet-regexp "Soupin" + "Regular expression matching SOUP REPLIES packets in `gnus-soup-packet-directory'." + :version "22.1" ;; Gnus 5.10.9 + :type 'regexp + :group 'gnus-soup) + +(defcustom gnus-soup-ignored-headers "^Xref:" + "Regexp to match headers to be removed when brewing SOUP packets." + :version "22.1" ;; Gnus 5.10.9 + :type 'regexp + :group 'gnus-soup) ;;; Internal Variables: @@ -278,7 +304,7 @@ Note -- this function hasn't been implemented yet." If NOT-ALL, don't pack ticked articles." (let ((gnus-expert-user t) (gnus-large-newsgroup nil) - (entry (gnus-gethash group gnus-newsrc-hashtb))) + (entry (gnus-group-entry group))) (when (or (null entry) (eq (car entry) t) (and (car entry) @@ -566,9 +592,8 @@ Return whether the unpacking was successful." (mail-fetch-field "to")) (sit-for 1) (let ((mail-header-separator "")) - (mm-with-unibyte-current-buffer - (funcall (or message-send-mail-real-function - message-send-mail-function))))) + (funcall (or message-send-mail-real-function + message-send-mail-function)))) (t (error "Unknown reply kind"))) (set-buffer msg-buf) @@ -582,5 +607,5 @@ Return whether the unpacking was successful." (provide 'gnus-soup) -;;; arch-tag: eddfa69d-13e8-4aea-84ef-62a526ef185c +;; arch-tag: eddfa69d-13e8-4aea-84ef-62a526ef185c ;;; gnus-soup.el ends here