martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from gnus--rel--5.10

Browse Source 
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
This commit is contained in:
Miles Bader
2006-12-14 01:24:41 +00:00
parent 218e7ce3da
commit bcd3e063d1
4 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/gnus/ChangeLog
View File

@@ -1,3 +1,7 @@
2006-12-13 Reiner Steib <Reiner.Steib@gmx.de>
* legacy-gnus-agent.el: Add Copyright notice.
2006-12-12 Chong Yidong <cyd@stupidchicken.com>
* gnus-sum.el (gnus-make-thread-indent-array): Fix last change.

38
lisp/gnus/legacy-gnus-agent.el
View File

@@ -1,10 +1,39 @@
;;; gnus-agent.el --- Legacy unplugged support for Gnus
;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
;; Author: Kevin Greiner <kgreiner@xpediantsolutions.com>
;; Keywords: news
;; This file is part of GNU Emacs.
;; 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.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; 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.
;;; Commentary:
;; Conversion functions for the Agent.
;;; Code:
(require 'gnus-start)
(require 'gnus-util)
(require 'gnus-range)
(require 'gnus-agent)
; Oort Gnus v0.08 - This release updated agent to no longer use
; history file and to support a compressed alist.
;; Oort Gnus v0.08 - This release updated agent to no longer use
;; history file and to support a compressed alist.
(defvar gnus-agent-compressed-agentview-search-only nil)
@@ -224,4 +253,7 @@ possible that the hook was persistently saved."
;; the .newsrc.eld file.
(gnus-convert-mark-converter-prompt 'gnus-agent-unhook-expire-days t)
;;; arch-tag: 845c7b8a-88f7-4468-b8d7-94e8fc72cf1a
(provide 'legacy-gnus-agent)
;; arch-tag: 845c7b8a-88f7-4468-b8d7-94e8fc72cf1a
;;; legacy-gnus-agent.el ends here

5
man/ChangeLog
View File

@@ -1,3 +1,8 @@
2006-12-12 Reiner Steib <Reiner.Steib@gmx.de>
* gnus.texi (X-Face): Clarify. Say which programs are required on
Windows.
2006-12-09 Richard Stallman <rms@gnu.org>
* misc.texi (Invoking emacsclient): Simplify TCP file text.

23
man/gnus.texi
View File

@@ -22175,21 +22175,26 @@ have suitable conversion or display programs installed. If your Emacs
has image support the default action is to display the face before the
@code{From} header. If there's no native @code{X-Face} support, Gnus
will try to convert the @code{X-Face} header using external programs
from the @code{pbmplus} package and friends. For XEmacs it's faster if
XEmacs has been compiled with @code{X-Face} support. The default action
under Emacs without image support is to fork off the @code{display}
program.
from the @code{pbmplus} package and friends, see below. For XEmacs it's
faster if XEmacs has been compiled with @code{X-Face} support. The
default action under Emacs without image support is to fork off the
@code{display} program.
On a GNU/Linux system, the @code{display} program is from the
On a GNU/Linux system, the @code{display} program is included in the
ImageMagick package. For external conversion programs look for packages
with names like @code{netpbm}, @code{libgr-progs} and @code{compface}.
On Windows, you may use the packages @code{netpbm} and @code{compface}
from @url{http://gnuwin32.sourceforge.net}. You need to add the
@code{bin} directory to your @code{PATH} environment variable.
@c In fact only the following DLLs and binaries seem to be required:
@c compface1.dll uncompface.exe libnetpbm10.dll icontopbm.exe
The variable that controls this is the
@code{gnus-article-x-face-command} variable. If this variable is a
The variable @code{gnus-article-x-face-command} controls which programs
are used to display the @code{X-Face} header. If this variable is a
string, this string will be executed in a sub-shell. If it is a
function, this function will be called with the face as the argument.
If @code{gnus-article-x-face-too-ugly} (which is a regexp) matches
the @code{From} header, the face will not be shown.
If @code{gnus-article-x-face-too-ugly} (which is a regexp) matches the
@code{From} header, the face will not be shown.
(Note: @code{x-face} is used in the variable/function names, not
@code{xface}).