mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-26 07:33:47 +00:00
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-189
Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 73) - Update from CVS
This commit is contained in:
parent
6612301488
commit
5af68e282f
@ -1,43 +1,71 @@
|
||||
All of the following icons are not part of Emacs, but distributed and
|
||||
used by Emacs.
|
||||
The following icons are from GNOME 2.6:
|
||||
|
||||
* The following icons are from GTK+ 2.x:
|
||||
attach.xpm (stock_attach)
|
||||
connect.xpm (stock_connect)
|
||||
contact.xpm (stock_contact)
|
||||
delete.xpm (stock_delete)
|
||||
describe.xpm (stock_properties)
|
||||
disconnect.xpm (stock_disconnect)
|
||||
exit.xpm (stock_exit)
|
||||
lock-broken.xpm (stock_lock_broken)
|
||||
lock-ok.xpm (stock_lock_ok)
|
||||
lock.xpm (stock_lock)
|
||||
next-page.xpm (stock_next-page)
|
||||
refresh.xpm (stock_refresh)
|
||||
sort-ascending.xpm (stock_sort-ascending)
|
||||
sort-column-ascending.xpm (stock_sort-column-ascending)
|
||||
sort-criteria.xpm (stock_sort-criteria)
|
||||
sort-descending.xpm (stock_sort-descending)
|
||||
sort-row-ascending.xpm (stock_sort-row-ascending)
|
||||
|
||||
close.xpm copy.xpm cut.xpm find-replace.xpm help.xpm home.xpm
|
||||
index.xpm jump-to.xpm left-arrow.xpm new.xpm open.xpm paste.xpm
|
||||
preferences.xpm print.xpm refresh.xpm right-arrow.xpm save.xpm
|
||||
saveas.xpm search.xpm sort-ascending.xpm sort-descending.xpm
|
||||
spell.xpm undo.xpm up-arrow.xpm
|
||||
gnus/toggle-subscription.xpm (stock_task-recurring)
|
||||
|
||||
back-arrow.xpm and fwd-arrow.xpm are slightly modified undo and redo.
|
||||
mail/compose.xpm (stock_mail-compose)
|
||||
mail/copy.xpm (stock_mail-copy)
|
||||
mail/forward.xpm (stock_mail-forward)
|
||||
mail/inbox.xpm (stock_inbox)
|
||||
mail/move.xpm (stock_mail-move)
|
||||
mail/not-spam.xpm (stock_not-spam)
|
||||
mail/outbox.xpm (stock_outbox)
|
||||
mail/reply-all.xpm (stock_mail-reply-to-all)
|
||||
mail/reply.xpm (stock_mail-reply)
|
||||
mail/save-draft.xpm (stock_mail-handling)
|
||||
mail/send.xpm (stock_mail-send)
|
||||
mail/spam.xpm (stock_spam)
|
||||
|
||||
diropen.xpm is file-manager.png from Gnome hicolor theme.
|
||||
|
||||
* The following icons are from GNOME 2.x:
|
||||
The following icons were contributed by Adam Sjøgren <asjo@koldfront.dk>:
|
||||
|
||||
attach.xpm connect.xpm contact.xpm data-save.xpm delete.xpm
|
||||
describe.xpm disconnect.xpm exit.xpm gnus/toggle-subscription.xpm
|
||||
lock-broken.xpm lock-ok.xpm lock.xpm mail/compose.xpm
|
||||
mail/copy.xpm mail/flag-for-followup.xpm mail/forward.xpm
|
||||
mail/inbox.xpm mail/move.xpm mail/not-spam.xpm mail/outbox.xpm
|
||||
mail/preview.xpm mail/reply-all.xpm mail/reply.xpm
|
||||
mail/save-draft.xpm mail/save.xpm mail/send.xpm mail/spam.xpm
|
||||
next-page.xpm refresh.xpm separator.xpm sort-ascending.xpm
|
||||
sort-column-ascending.xpm sort-criteria.xpm sort-descending.xpm
|
||||
sort-row-ascending.xpm zoom-in.xpm zoom-out.xpm
|
||||
mail/preview.xpm (combining stock_mail and stock_zoom)
|
||||
mail/save.xpm (combining stock_mail, stock_save and stock_convert)
|
||||
|
||||
* Note that the default GTK icons were not overridden by the GNOME theme
|
||||
due to a bug which was fixed in GNOME 2.15. Once GNOME 2.16 is in wide
|
||||
circulation, then the GTK icons should be replaced with the equivalent
|
||||
GNOME icons.
|
||||
|
||||
* Recipe for Creating PBM Versions
|
||||
The folling icon are duplicated from Emacs 22. They are either not present in
|
||||
Emacs 21 or look different there.
|
||||
|
||||
1. Edit .xpm image in GIMP.
|
||||
2. Image > Mode > Indexed. Check Use Black/White Palette and No
|
||||
Color Dithering.
|
||||
3. File > Save As file.xbm.
|
||||
4. Run xbmtopbm < file.xbm > file.pbm.
|
||||
cancel.xpm
|
||||
copy.xpm
|
||||
diropen.xpm
|
||||
help.xpm
|
||||
left-arrow.xpm
|
||||
paste.xpm
|
||||
print.xpm
|
||||
redo.xpm
|
||||
right-arrow.xpm
|
||||
save.xpm
|
||||
search.xpm
|
||||
separator.xpm
|
||||
|
||||
Thanks to jan.h.d@swipnet.se for the help.
|
||||
The GNOME's stock_*.png files were converted to XPM using the following GIMP
|
||||
script:
|
||||
|
||||
;; -*- scheme -*-
|
||||
;; Put this file in ~/.gimp-*/scripts/
|
||||
;; gimp -i -b '(rs-save-as-xpm "foo.png" "foo.xpm" 127)' '(gimp-quit 0)'
|
||||
(define (rs-save-as-xpm filename filename2 threshold)
|
||||
(let* ((image (car (gimp-file-load RUN-NONINTERACTIVE filename filename)))
|
||||
(drawable (car (gimp-image-get-active-layer image))))
|
||||
(file-xpm-save RUN-NONINTERACTIVE image drawable
|
||||
filename2 filename2 threshold)
|
||||
(gimp-image-delete image)))
|
||||
;; end
|
||||
|
69
etc/images/redo.xpm
Normal file
69
etc/images/redo.xpm
Normal file
@ -0,0 +1,69 @@
|
||||
/* XPM */
|
||||
static char * stock_redo_xpm[] = {
|
||||
"24 24 42 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
"+ c #939A8D",
|
||||
"@ c #BAD09D",
|
||||
"# c #92998C",
|
||||
"$ c #818F71",
|
||||
"% c #ADBDA0",
|
||||
"& c #C2D5AA",
|
||||
"* c #D1DFBE",
|
||||
"= c #BED2A3",
|
||||
"- c #99A28F",
|
||||
"; c #A8BCA6",
|
||||
"> c #D5E1C6",
|
||||
", c #CDDCBC",
|
||||
"' c #D2E0BF",
|
||||
") c #C5D7AE",
|
||||
"! c #919889",
|
||||
"~ c #8C9A7F",
|
||||
"{ c #D4E0C5",
|
||||
"] c #D3E0C1",
|
||||
"^ c #BFD3A6",
|
||||
"/ c #9BAA87",
|
||||
"( c #B5C3A9",
|
||||
"_ c #92AD62",
|
||||
": c #7C9B40",
|
||||
"< c #59702D",
|
||||
"[ c #7F8E6B",
|
||||
"} c #C8D9B2",
|
||||
"| c #85A24D",
|
||||
"1 c #53692A",
|
||||
"2 c #A4B690",
|
||||
"3 c #9BB572",
|
||||
"4 c #6D8839",
|
||||
"5 c #95A77E",
|
||||
"6 c #8BA859",
|
||||
"7 c #657255",
|
||||
"8 c #98AF74",
|
||||
"9 c #AFC394",
|
||||
"0 c #6D7A5B",
|
||||
"a c #9CAF84",
|
||||
"b c #748261",
|
||||
"c c #879772",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" .. ",
|
||||
" .+. ",
|
||||
" ....@#. ",
|
||||
" .$%&*=@-. ",
|
||||
" .;>,')@@@!. ",
|
||||
" .~{]*^@@@@@/. ",
|
||||
" .(>_::::::<. ",
|
||||
" .[}|::::::1. ",
|
||||
" .23:<...:1. ",
|
||||
" .@:4. .<. ",
|
||||
" .@:.. .. ",
|
||||
" .56. . ",
|
||||
" .78. ",
|
||||
" .9. ",
|
||||
" .0a. ",
|
||||
" .bc. ",
|
||||
" ... ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
@ -1,3 +1,8 @@
|
||||
2006-03-31 Reiner Steib <Reiner.Steib@gmx.de>
|
||||
|
||||
* gnus-group.el (gnus-group-update-tool-bar): Add :initialize and
|
||||
:set.
|
||||
|
||||
2006-03-23 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||
|
||||
* mml.el (mml-insert-mime): Ignore cached contents of
|
||||
|
@ -1389,6 +1389,13 @@ if it is a string, only list groups matching REGEXP."
|
||||
"Force updating the group buffer tool bar."
|
||||
:group 'gnus-group
|
||||
:version "22.1"
|
||||
:initialize 'custom-initialize-default
|
||||
:set (lambda (symbol value)
|
||||
(set-default symbol value)
|
||||
(when (gnus-alive-p)
|
||||
(with-current-buffer gnus-group-buffer
|
||||
;; FIXME: Is there a better way to redraw the group buffer?
|
||||
(gnus-group-get-new-news 0))))
|
||||
:type 'boolean)
|
||||
|
||||
(defun gnus-group-insert-group-line (gnus-tmp-group gnus-tmp-level
|
||||
|
@ -1,3 +1,8 @@
|
||||
2006-03-31 Romain Francoise <romain@orebokech.com>
|
||||
|
||||
* gnus.texi (Virtual Groups): `nnvirtual-always-rescan' defaults
|
||||
to t, not nil (and has for the past eight years).
|
||||
|
||||
2006-03-31 Richard Stallman <rms@gnu.org>
|
||||
|
||||
* emacs.texi (Top): Update subnode menu.
|
||||
|
@ -17540,16 +17540,16 @@ group have to be alive (i.e., subscribed or unsubscribed). Killed or
|
||||
zombie groups can't be component groups for @code{nnvirtual} groups.
|
||||
|
||||
@vindex nnvirtual-always-rescan
|
||||
If the @code{nnvirtual-always-rescan} is non-@code{nil},
|
||||
@code{nnvirtual} will always scan groups for unread articles when
|
||||
entering a virtual group. If this variable is @code{nil} (which is the
|
||||
default) and you read articles in a component group after the virtual
|
||||
group has been activated, the read articles from the component group
|
||||
will show up when you enter the virtual group. You'll also see this
|
||||
effect if you have two virtual groups that have a component group in
|
||||
common. If that's the case, you should set this variable to @code{t}.
|
||||
Or you can just tap @code{M-g} on the virtual group every time before
|
||||
you enter it---it'll have much the same effect.
|
||||
If the @code{nnvirtual-always-rescan} variable is non-@code{nil} (which
|
||||
is the default), @code{nnvirtual} will always scan groups for unread
|
||||
articles when entering a virtual group. If this variable is @code{nil}
|
||||
and you read articles in a component group after the virtual group has
|
||||
been activated, the read articles from the component group will show up
|
||||
when you enter the virtual group. You'll also see this effect if you
|
||||
have two virtual groups that have a component group in common. If
|
||||
that's the case, you should set this variable to @code{t}. Or you can
|
||||
just tap @code{M-g} on the virtual group every time before you enter
|
||||
it---it'll have much the same effect.
|
||||
|
||||
@code{nnvirtual} can have both mail and news groups as component groups.
|
||||
When responding to articles in @code{nnvirtual} groups, @code{nnvirtual}
|
||||
|
Loading…
Reference in New Issue
Block a user