* Re: etc/ChangeLog, etc/**/*README, COPYING, gnus-*.ps, [not found] <v9d4urv0id.fsf@marauder.physik.uni-ulm.de> @ 2007-11-08 23:20 ` Miles Bader 2007-11-08 23:53 ` Reiner Steib 0 siblings, 1 reply; 9+ messages in thread From: Miles Bader @ 2007-11-08 23:20 UTC (permalink / raw) To: Reiner Steib; +Cc: ding, Emacs-Devel Hi Reiner, From etc/images/README in the gnus-5.10 branch: > The files splash.xpm, splash8.xpm contain copyright and license > information, but it is reproduced here for convenience. > > Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm However none of these files seem to exist in gnus (any version) or emacs-22, only on the Emacs trunk. I dunno if it's better to keep the text the same in all versions (and thus add the above text to the existing etc/images/README in emacs-22) for simplicity (even if slightly inaccurate), or remove it in Gnus.... Any opinion? -Miles -- Do not taunt Happy Fun Ball. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: etc/ChangeLog, etc/**/*README, COPYING, gnus-*.ps, 2007-11-08 23:20 ` etc/ChangeLog, etc/**/*README, COPYING, gnus-*.ps, Miles Bader @ 2007-11-08 23:53 ` Reiner Steib 2007-11-09 0:35 ` Miles Bader 2007-11-09 1:12 ` Glenn Morris 0 siblings, 2 replies; 9+ messages in thread From: Reiner Steib @ 2007-11-08 23:53 UTC (permalink / raw) To: Miles Bader, Glenn Morris; +Cc: ding, Emacs-Devel On Fri, Nov 09 2007, Miles Bader wrote: > From etc/images/README in the gnus-5.10 branch: > >> The files splash.xpm, splash8.xpm contain copyright and license >> information, but it is reproduced here for convenience. >> >> Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm > > However none of these files seem to exist in gnus (any version) or > emacs-22, only on the Emacs trunk. The files exist in Emacs/trunk and Emacs/22 here. > I dunno if it's better to keep the text the same in all versions > (and thus add the above text to the existing etc/images/README in > emacs-22) for simplicity (even if slightly inaccurate), or remove it > in Gnus.... > > Any opinion? I think two pairs (v5-10/emacs-22 and gnus-trunk/emacs-trunk) of theses files are sufficient. GNUS-README should make it clear that the README files refer to Emacs so a slight inaccuracy it okay for me. As for the difference in Emacs (trunk vs. 22), it might just be an oversight. Glenn? --8<---------------cut here---------------start------------->8--- $ cvs diff -r EMACS_22_BASE -r HEAD images/README Index: images/README =================================================================== RCS file: /cvsroot/emacs/emacs/etc/images/README,v retrieving revision 1.17.2.1 retrieving revision 1.19 diff -u -r1.17.2.1 -r1.19 --- images/README 25 Jul 2007 06:43:56 -0000 1.17.2.1 +++ images/README 22 Aug 2007 08:07:23 -0000 1.19 @@ -23,8 +23,17 @@ Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) +The files splash.xpm, splash8.xpm contain copyright and license +information, but it is reproduced here for convenience. -The following icons are from GTK+ 2.x and GNOME 2.x. They are not +Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm + Author: Luis Fernandes <elf@ee.ryerson.ca> + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Free Software Foundation, Inc. + License: GNU General Public License version 3 or later (see COPYING) + + +* The following icons are from GTK+ 2.x and GNOME 2.x. They are not part of Emacs, but distributed and used by Emacs. Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 --8<---------------cut here---------------end--------------->8--- Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/ ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: etc/ChangeLog, etc/**/*README, COPYING, gnus-*.ps, 2007-11-08 23:53 ` Reiner Steib @ 2007-11-09 0:35 ` Miles Bader 2007-11-09 1:14 ` Glenn Morris 2007-11-09 1:12 ` Glenn Morris 1 sibling, 1 reply; 9+ messages in thread From: Miles Bader @ 2007-11-09 0:35 UTC (permalink / raw) To: ding; +Cc: Emacs-Devel Reiner Steib <reinersteib+gmane@imap.cc> writes: >>> Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm >> >> However none of these files seem to exist in gnus (any version) or >> emacs-22, only on the Emacs trunk. > > The files exist in Emacs/trunk and Emacs/22 here. How odd... This is what I see (these are updated from CVS within the last few hours; key: "devo" => emacs trunk, "rel-22" => emacs release branch, "gnus" => gnus trunk, "gnus-5.10" => gnus release branch): $ find rel-22/etc/images \( -name 'gnus.pbm' -o -name '*splash*' \) -print $ find gnus/etc/images \( -name 'gnus.pbm' -o -name '*splash*' \) -print gnus/etc/images/gnus/x-splash $ find gnus-5.10/etc/images \( -name 'gnus.pbm' -o -name '*splash*' \) -print gnus-5.10/etc/images/gnus/x-splash $ find devo/etc/images \( -name 'gnus.pbm' -o -name '*splash*' \) -print devo/etc/images/splash.pbm devo/etc/images/gnus.pbm devo/etc/images/splash8.xpm devo/etc/images/splash.xpm -Miles -- `Cars give people wonderful freedom and increase their opportunities. But they also destroy the environment, to an extent so drastic that they kill all social life' (from _A Pattern Language_) ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: etc/ChangeLog, etc/**/*README, COPYING, gnus-*.ps, 2007-11-09 0:35 ` Miles Bader @ 2007-11-09 1:14 ` Glenn Morris 0 siblings, 0 replies; 9+ messages in thread From: Glenn Morris @ 2007-11-09 1:14 UTC (permalink / raw) To: Miles Bader; +Cc: ding, Emacs-Devel Miles Bader wrote: > $ find rel-22/etc/images \( -name 'gnus.pbm' -o -name '*splash*' \) -print <sallah> You're digging in the wrong place. </sallah> They are in etc/ in 22, not etc/images/. It makes no sense, that's why I moved them in the trunk... ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: etc/ChangeLog, etc/**/*README, COPYING, gnus-*.ps, 2007-11-08 23:53 ` Reiner Steib 2007-11-09 0:35 ` Miles Bader @ 2007-11-09 1:12 ` Glenn Morris 2007-11-20 21:54 ` Reiner Steib 1 sibling, 1 reply; 9+ messages in thread From: Glenn Morris @ 2007-11-09 1:12 UTC (permalink / raw) To: Miles Bader; +Cc: ding, Emacs-Devel Reiner Steib wrote: > As for the difference in Emacs (trunk vs. 22), it might just be an > oversight. Glenn? On the Emacs trunk, the last change to etc/README should be reverted (ie revert to rev 1.19). rev 1.20 is a bogus merge from somewhere. Emacs 22 branch etc/README is correct. The difference arises because some icons were moved from etc/ to etc/images/ in the trunk. On a related note, we should update the images/* README files at some point with info on the new icons brought in by the recent gnus merge. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: etc/ChangeLog, etc/**/*README, COPYING, gnus-*.ps, 2007-11-09 1:12 ` Glenn Morris @ 2007-11-20 21:54 ` Reiner Steib 2007-11-22 7:14 ` Glenn Morris 0 siblings, 1 reply; 9+ messages in thread From: Reiner Steib @ 2007-11-20 21:54 UTC (permalink / raw) To: Glenn Morris; +Cc: Emacs-Devel, ding, Miles Bader On Fri, Nov 09 2007, Glenn Morris wrote: > On a related note, we should update the images/* README files at some > point with info on the new icons brought in by the recent gnus merge. All the new smilies are from Adam Sjøgren: 2007-10-28 Adam Sjøgren <asjo@koldfront.dk> * images/smilies/grayscale/*.xpm: New larger grayscale smileys. * images/smilies/medium/*.xpm: New colorful smileys. I don't know if entries should be added to smilies/README or if adding separate README files for each directory is preferred. The only other new file is `gnus/mail_send.xpm' which was copied from Emacs 21 (./lisp/toolbar/mail_send.xpm) for the old-style tool bar. In fact it should also be v5-10/Emacs_22 , but obviously I forgot to add it there. ,----[ v5-10/lisp/message.el ] | (defcustom message-tool-bar-retro | '(;; Old Emacs 21 icon for consistency. | (message-send-and-exit "gnus/mail_send") `---- Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/ ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: etc/ChangeLog, etc/**/*README, COPYING, gnus-*.ps, 2007-11-20 21:54 ` Reiner Steib @ 2007-11-22 7:14 ` Glenn Morris 2007-11-22 21:30 ` Reiner Steib 0 siblings, 1 reply; 9+ messages in thread From: Glenn Morris @ 2007-11-22 7:14 UTC (permalink / raw) To: ding, Emacs-Devel Reiner Steib wrote: > All the new smilies are from Adam Sjøgren: OK, I added that info; thanks. > 2007-10-28 Adam Sjøgren <asjo@koldfront.dk> > > * images/smilies/grayscale/*.xpm: New larger grayscale smileys. > > * images/smilies/medium/*.xpm: New colorful smileys. This entry does not appear in Emacs's etc/ChangeLog, which perhaps indicates a merge problem. (Perhaps that explains the subject of this thread; I missed the start.) > The only other new file is `gnus/mail_send.xpm' which was copied from > Emacs 21 (./lisp/toolbar/mail_send.xpm) for the old-style tool bar. BTW, this is inconsistently named (underscore versus hyphen), but perhaps you're saying it has to be for backwards compatibility. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: etc/ChangeLog, etc/**/*README, COPYING, gnus-*.ps, 2007-11-22 7:14 ` Glenn Morris @ 2007-11-22 21:30 ` Reiner Steib 2007-11-24 3:25 ` Glenn Morris 0 siblings, 1 reply; 9+ messages in thread From: Reiner Steib @ 2007-11-22 21:30 UTC (permalink / raw) To: Glenn Morris; +Cc: ding, Emacs-Devel On Thu, Nov 22 2007, Glenn Morris wrote: > Reiner Steib wrote: [...] > This entry does not appear in Emacs's etc/ChangeLog, which perhaps > indicates a merge problem. I have added this missing ChangeLog entry. >> The only other new file is `gnus/mail_send.xpm' which was copied from >> Emacs 21 (./lisp/toolbar/mail_send.xpm) for the old-style tool bar. [I.e. when `message-tool-bar' is set to `message-tool-bar-retro'.] > BTW, this is inconsistently named (underscore versus hyphen), but > perhaps you're saying it has to be for backwards compatibility. I may also be a different name. Do you prefer a consistent name? Feel free to rename it (and adjust `message-tool-bar-retro' accordingly). The xpm file should be added to Emacs_22 as well. Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/ ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: etc/ChangeLog, etc/**/*README, COPYING, gnus-*.ps, 2007-11-22 21:30 ` Reiner Steib @ 2007-11-24 3:25 ` Glenn Morris 0 siblings, 0 replies; 9+ messages in thread From: Glenn Morris @ 2007-11-24 3:25 UTC (permalink / raw) To: ding; +Cc: Emacs-Devel Reiner Steib wrote: > Feel free to rename it (and adjust `message-tool-bar-retro' > accordingly). The xpm file should be added to Emacs_22 as well. done & done. ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2007-11-24 3:25 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <v9d4urv0id.fsf@marauder.physik.uni-ulm.de>
2007-11-08 23:20 ` etc/ChangeLog, etc/**/*README, COPYING, gnus-*.ps, Miles Bader
2007-11-08 23:53 ` Reiner Steib
2007-11-09 0:35 ` Miles Bader
2007-11-09 1:14 ` Glenn Morris
2007-11-09 1:12 ` Glenn Morris
2007-11-20 21:54 ` Reiner Steib
2007-11-22 7:14 ` Glenn Morris
2007-11-22 21:30 ` Reiner Steib
2007-11-24 3:25 ` Glenn Morris
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/emacs.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).