diff options
| author | Miles Bader | 2006-12-14 01:24:41 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-12-14 01:24:41 +0000 |
| commit | bcd3e063d116e9b7e3e7b082fb1e2d1e6169fdcb (patch) | |
| tree | 3b468a107eff52cd3e0ccf73e71762439b49a758 /lisp/gnus | |
| parent | 218e7ce3da31b3ff03d06da2a733088ea3a2d6a6 (diff) | |
| download | emacs-bcd3e063d116e9b7e3e7b082fb1e2d1e6169fdcb.tar.gz emacs-bcd3e063d116e9b7e3e7b082fb1e2d1e6169fdcb.zip | |
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 173-175)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
2006-12-13 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/legacy-gnus-agent.el: Add Copyright notice.
2006-12-12 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (X-Face): Clarify. Say which programs are required on
Windows.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-558
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/legacy-gnus-agent.el | 38 |
2 files changed, 39 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 439fb37c897..047bac04076 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-12-13 Reiner Steib <Reiner.Steib@gmx.de> | ||
| 2 | |||
| 3 | * legacy-gnus-agent.el: Add Copyright notice. | ||
| 4 | |||
| 1 | 2006-12-12 Chong Yidong <cyd@stupidchicken.com> | 5 | 2006-12-12 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * gnus-sum.el (gnus-make-thread-indent-array): Fix last change. | 7 | * gnus-sum.el (gnus-make-thread-indent-array): Fix last change. |
diff --git a/lisp/gnus/legacy-gnus-agent.el b/lisp/gnus/legacy-gnus-agent.el index 50675b0ba27..cc8e4e370f4 100644 --- a/lisp/gnus/legacy-gnus-agent.el +++ b/lisp/gnus/legacy-gnus-agent.el | |||
| @@ -1,10 +1,39 @@ | |||
| 1 | ;;; gnus-agent.el --- Legacy unplugged support for Gnus | ||
| 2 | |||
| 3 | ;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. | ||
| 4 | |||
| 5 | ;; Author: Kevin Greiner <kgreiner@xpediantsolutions.com> | ||
| 6 | ;; Keywords: news | ||
| 7 | |||
| 8 | ;; This file is part of GNU Emacs. | ||
| 9 | |||
| 10 | ;; GNU Emacs is free software; you can redistribute it and/or modify | ||
| 11 | ;; it under the terms of the GNU General Public License as published by | ||
| 12 | ;; the Free Software Foundation; either version 2, or (at your option) | ||
| 13 | ;; any later version. | ||
| 14 | |||
| 15 | ;; GNU Emacs is distributed in the hope that it will be useful, | ||
| 16 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 17 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 18 | ;; GNU General Public License for more details. | ||
| 19 | |||
| 20 | ;; You should have received a copy of the GNU General Public License | ||
| 21 | ;; along with GNU Emacs; see the file COPYING. If not, write to the | ||
| 22 | ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 23 | ;; Boston, MA 02110-1301, USA. | ||
| 24 | |||
| 25 | ;;; Commentary: | ||
| 26 | |||
| 27 | ;; Conversion functions for the Agent. | ||
| 28 | |||
| 29 | ;;; Code: | ||
| 1 | (require 'gnus-start) | 30 | (require 'gnus-start) |
| 2 | (require 'gnus-util) | 31 | (require 'gnus-util) |
| 3 | (require 'gnus-range) | 32 | (require 'gnus-range) |
| 4 | (require 'gnus-agent) | 33 | (require 'gnus-agent) |
| 5 | 34 | ||
| 6 | ; Oort Gnus v0.08 - This release updated agent to no longer use | 35 | ;; Oort Gnus v0.08 - This release updated agent to no longer use |
| 7 | ; history file and to support a compressed alist. | 36 | ;; history file and to support a compressed alist. |
| 8 | 37 | ||
| 9 | (defvar gnus-agent-compressed-agentview-search-only nil) | 38 | (defvar gnus-agent-compressed-agentview-search-only nil) |
| 10 | 39 | ||
| @@ -224,4 +253,7 @@ possible that the hook was persistently saved." | |||
| 224 | ;; the .newsrc.eld file. | 253 | ;; the .newsrc.eld file. |
| 225 | (gnus-convert-mark-converter-prompt 'gnus-agent-unhook-expire-days t) | 254 | (gnus-convert-mark-converter-prompt 'gnus-agent-unhook-expire-days t) |
| 226 | 255 | ||
| 227 | ;;; arch-tag: 845c7b8a-88f7-4468-b8d7-94e8fc72cf1a | 256 | (provide 'legacy-gnus-agent) |
| 257 | |||
| 258 | ;; arch-tag: 845c7b8a-88f7-4468-b8d7-94e8fc72cf1a | ||
| 259 | ;;; legacy-gnus-agent.el ends here | ||