September 2005 - XEmacs-Patches - XEmacs Mailing List Archives

[C] xemacs-21.5-clean: Fix variable initialization order in xemacs.mak 18 years, 7 months

Adrian Aichner

COMMIT This patch is a result of testing my texinfmt.el fix for following defect report:

1 participants
0 comments

[COMMIT] update make-aux-readme 18 years, 7 months

Ben Wing

NOTE: This patch has been committed. Download/ChangeLog addition: 2005-09-25 Ben Wing <ben(a)xemacs.org> * make-aux-readme: Make the script actually copy the file to gwyn. xemacsweb source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: Download/make-aux-readme Sun Sep 25 10:02:58 CDT 2005 cvs server: Diffing . cvs server: Diffing About cvs server: Diffing About/Screenshots cvs server: Diffing Architecting-XEmacs cvs server: Diffing Debug cvs server: Diffing Develop cvs server: Diffing Documentation cvs server: Diffing Documentation/21.5 cvs server: Diffing Documentation/21.5/html cvs server: Diffing Documentation/packages cvs server: Diffing Documentation/packages/html cvs server: Diffing Download Index: Download/make-aux-readme =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/make-aux-readme,v retrieving revision 1.1 diff -u -p -r1.1 make-aux-readme --- Download/make-aux-readme 2005/01/24 02:42:27 1.1 +++ Download/make-aux-readme 2005/09/25 15:03:08 ＠＠ -1,9 +1,18 ＠＠ #!/bin/sh -echo "This page generated from xemacsweb/Download/optLibs.html using +tmpfile=/tmp/$$.readme +echo "Generating 00README.txt ..." +(echo "This page generated from xemacsweb/Download/optLibs.html using \`make-aux-readme' (lynx --dump --nolist). Optional Libraries" -lynx --dump --nolist optLibs.html | sed '1,/^Optional/d' +lynx --dump --nolist optLibs.html | sed '1,/^Optional/d' ) > $tmpfile +echo "Copying to gwyn ..." +# This assumes that you have ssh access to gwyn.tux.org and have +# set up an alias called `gwyn' in your ~/.ssh/config file giving the +# full hostname and proper user name. +scp $tmpfile gwyn:/ftp/xemacs/aux/00README.txt +rm $tmpfile +echo "Done." cvs server: Diffing Download/win32 cvs server: Diffing FAQ cvs server: Diffing FAQ/old cvs server: Diffing FAQ/oldstuff cvs server: Diffing Images cvs server: Diffing Install cvs server: Diffing Languages cvs server: Diffing Languages/German cvs server: Diffing Languages/Japanese cvs server: Diffing Links cvs server: Diffing Lists cvs server: Diffing News cvs server: Diffing People cvs server: Diffing People/adrian.aichner cvs server: Diffing People/aidan.kehoe cvs server: Diffing People/alastair.houghton cvs server: Diffing People/alexey.mahotkin cvs server: Diffing People/andreas.jaeger cvs server: Diffing People/andrew.cosgriff cvs server: Diffing People/andy.piper cvs server: Diffing People/anthony.rossini cvs server: Diffing People/barry.warsaw cvs server: Diffing People/ben.wing cvs server: Diffing People/bjorn.torkelsson cvs server: Diffing People/bob.weiner cvs server: Diffing People/carsten.dominik cvs server: Diffing People/charles.waldman cvs server: Diffing People/christian.nybo cvs server: Diffing People/chuck.thompson cvs server: Diffing People/colin.rafferty cvs server: Diffing People/craig.lanning cvs server: Diffing People/daiki.ueno cvs server: Diffing People/damon.lipparelli cvs server: Diffing People/dan.holmsand cvs server: Diffing People/daniel.pittman cvs server: Diffing People/darrell.kindred cvs server: Diffing People/darryl.okahata cvs server: Diffing People/david.hobley cvs server: Diffing People/david.moore cvs server: Diffing People/didier.verna cvs server: Diffing People/eduardo.pelegri-llopart cvs server: Diffing People/eric.benson cvs server: Diffing People/eric.knauel cvs server: Diffing People/eric.ludlam cvs server: Diffing People/evgeny.zajcev cvs server: Diffing People/fabrice.popineau cvs server: Diffing People/francisco.vides cvs server: Diffing People/gary.foster cvs server: Diffing People/glynn.clements cvs server: Diffing People/greg.klanderman cvs server: Diffing People/gunnar.evermann cvs server: Diffing People/hans.muller cvs server: Diffing People/harlan.sexton cvs server: Diffing People/heiko.muenkel cvs server: Diffing People/hisashi.miyashita cvs server: Diffing People/hrvoje.niksic cvs server: Diffing People/i.n.golubev cvs server: Diffing People/jake.colman cvs server: Diffing People/james.potts cvs server: Diffing People/jamie.zawinski cvs server: Diffing People/jan.rychter cvs server: Diffing People/jan.vroonhof cvs server: Diffing People/jareth.hein cvs server: Diffing People/jari.aalto cvs server: Diffing People/jason.mastaler cvs server: Diffing People/jeff.miller cvs server: Diffing People/jens-ulrik.petersen cvs server: Diffing People/jens.lautenbacher cvs server: Diffing People/jerry.james cvs server: Diffing People/jesper.pedersen cvs server: Diffing People/john.jacobs-anderson cvs server: Diffing People/john.paul.wallington cvs server: Diffing People/john.rose cvs server: Diffing People/john.wiegley cvs server: Diffing People/jonathan.harris cvs server: Diffing People/jonathan.stigelman cvs server: Diffing People/karl.hegbloom cvs server: Diffing People/kazuo.oishi cvs server: Diffing People/kazuyuki.ienaga cvs server: Diffing People/kenny.stevens cvs server: Diffing People/kevin.oberman cvs server: Diffing People/kirill.katsnelson cvs server: Diffing People/klaus.berndl cvs server: Diffing People/kyle.jones cvs server: Diffing People/lars.ingebrigtsen cvs server: Diffing People/linda.arai cvs server: Diffing People/malcolm.purvis cvs server: Diffing People/marc.paquette cvs server: Diffing People/marcus.crestani cvs server: Diffing People/marcus.thiessel cvs server: Diffing People/markus.kaltenbach cvs server: Diffing People/martin.buchholz cvs server: Diffing People/martin.schwenke cvs server: Diffing People/martin.stjernholm cvs server: Diffing People/mats.lidell cvs server: Diffing People/matt.simmons cvs server: Diffing People/matt.tucker cvs server: Diffing People/matthieu.devin cvs server: Diffing People/michael.albinus cvs server: Diffing People/michael.cook cvs server: Diffing People/michael.diers cvs server: Diffing People/michael.kifer cvs server: Diffing People/mike.alexander cvs server: Diffing People/mike.sperber cvs server: Diffing People/mike.woolley cvs server: Diffing People/nick.pakoulin cvs server: Diffing People/norbert.koch cvs server: Diffing People/oliver.graf cvs server: Diffing People/olivier.galibert cvs server: Diffing People/oscar.figueiredo cvs server: Diffing People/ovidiu.predescu cvs server: Diffing People/paul.kinnucan cvs server: Diffing People/per.abrahamsen cvs server: Diffing People/peter.brown cvs server: Diffing People/peter.osterlund cvs server: Diffing People/peter.pezaris cvs server: Diffing People/photos cvs server: Diffing People/raymond.toy cvs server: Diffing People/rebecca.ore cvs server: Diffing People/richard.mlynarik cvs server: Diffing People/richard.reingruber cvs server: Diffing People/rick.campbell cvs server: Diffing People/robin.socha cvs server: Diffing People/rodney.sparapani cvs server: Diffing People/sandy.wambold cvs server: Diffing People/sean.maclennan cvs server: Diffing People/simon.josefsson cvs server: Diffing People/stefanie.teufel cvs server: Diffing People/stephen.turnbull cvs server: Diffing People/steve.baur cvs server: Diffing People/steve.youngs cvs server: Diffing People/stig.bjorlykke cvs server: Diffing People/sven.grundmann cvs server: Diffing People/tomohiko.morioka cvs server: Diffing People/tomonori.ikeyama cvs server: Diffing People/trey.abelew cvs server: Diffing People/uwe.brauer cvs server: Diffing People/ville.skytta cvs server: Diffing People/vin.shelton cvs server: Diffing People/vladimir.ivanovic cvs server: Diffing People/will.deakin cvs server: Diffing People/william.perry cvs server: Diffing People/yoshiki.hayashi cvs server: Diffing Releases cvs server: Diffing Releases/Public-21.2 cvs server: Diffing Releases/Public-21.2/developers cvs server: Diffing Releases/Public-21.2/projects cvs server: Diffing Releases/Public-21.2/wishes cvs server: Diffing Texi2html cvs server: Diffing Texi2html/Tests cvs server: Diffing Texi2html/Tests/GermanNodeTest cvs server: Diffing Texi2html/doc cvs server: Diffing cgi-bin cvs server: Diffing cgi-bin/.wilma cvs server: Diffing etc cvs server: Diffing etc/namazu cvs server: Diffing etc/namazu/templates cvs server: Diffing genpage cvs server: Diffing genpage/bin cvs server: Diffing genpage/content cvs server: Diffing genpage/content/recipes cvs server: Diffing genpage/examples cvs server: Diffing genpage/examples/ex1 cvs server: Diffing genpage/examples/ex2 cvs server: Diffing genpage/examples/ex3 cvs server: Diffing genpage/examples/ex3/foo cvs server: Diffing genpage/include cvs server: Diffing genpage/layout cvs server: Diffing genpage/lib cvs server: Diffing genpage/news.themes

1 participants
0 comments

[COMMIT] Updates to optional libraries, review board members 18 years, 7 months

Ben Wing

NOTE: This patch has been committed. This is an old patch; I'm trying to go through some back workspaces. ChangeLog addition: 2005-09-25 Ben Wing <ben(a)xemacs.org> * template.html: Add section containing links to the most-wanted pages on the site. Download/ChangeLog addition: 2005-09-25 Ben Wing <ben(a)xemacs.org> * optLibs.content: Bring more-or-less up-to-date. Download/win32/ChangeLog addition: 2005-09-25 Ben Wing <ben(a)xemacs.org> * optional-libs.exe: Update somewhat. More updates to come. People/ChangeLog addition: 2005-09-25 Ben Wing <ben(a)xemacs.org> * index.content: Move Malcolm up to review board members. xemacsweb source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: People/index.content Download/win32/optional-libs.exe Download/optLibs.content template.html Sun Sep 25 09:36:53 CDT 2005 cvs server: Diffing . Index: template.html =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/template.html,v retrieving revision 1.63 diff -u -p -r1.63 template.html --- template.html 2005/01/31 02:36:44 1.63 +++ template.html 2005/09/25 14:37:03 ＠＠ -88,6 +88,18 ＠＠ <a href="http://www.xemacs.org/cgi-bin/namazu.cgi">help</a> </div> </form> + Quick Links + <ul> + <li><a href="">Download</a></li> + <li><a href="">FAQ</a></li> + <li><a href="">Mailing lists</a></li> + <li><a href="">Documentation</a></li> + <li><a href="">People</a></li> + <li><a href="">How to help</a></li> + <li><a href="">Bugs</a></li> + <li><a href="">Links</a></li> + </ul> + About XEmacs <ul> <li><a href="">Mailing lists</a></li> cvs server: Diffing About cvs server: Diffing About/Screenshots cvs server: Diffing Architecting-XEmacs cvs server: Diffing Debug cvs server: Diffing Develop cvs server: Diffing Documentation cvs server: Diffing Documentation/21.5 cvs server: Diffing Documentation/21.5/html cvs server: Diffing Documentation/packages cvs server: Diffing Documentation/packages/html cvs server: Diffing Download Index: Download/optLibs.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/optLibs.content,v retrieving revision 1.34 diff -u -p -r1.34 optLibs.content --- Download/optLibs.content 2005/01/31 20:52:55 1.34 +++ Download/optLibs.content 2005/09/25 14:37:03 ＠＠ -107,7 +107,7 ＠＠ Ben Wing The ZLIB compression library (strongly encouraged when building XEmacs) is used by the PNG library. A GZIP coding system is also available, in XEmacs 21.5 and onward. - <a href="http://ftp.xemacs.org/pub/xemacs/aux/zlib-1.2.1.tar.gz">zlib-1.2.1.... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/zlib-1.2.3.tar.gz">zlib-1.2.3.... /> <a href="http://www.gzip.org/zlib/">http://www.gzip.org/zlib/</a> configure flag: <tt>--with-zlib</tt> ＠＠ -121,7 +121,7 ＠＠ Ben Wing The TIFF image format library (not especially important when building XEmacs) - <a href="http://ftp.xemacs.org/pub/xemacs/aux/tiff-3.7.1.tar.gz">tiff-3.7.1.... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/tiff-3.7.3.tar.gz">tiff-3.7.3.... /> <a href="http://www.remotesensing.org/libtiff/">http://www.remotesensing.org... /> configure flag: <tt>--with-tiff</tt> ＠＠ -151,7 +151,7 ＠＠ Ben Wing Xaw3d is designed to be a drop-in replacement for the Athena widget library that `looks cooler'. <a href="http://ftp.xemacs.org/pub/xemacs/aux/Xaw3d-1.5.tar.gz">Xaw3d-1.5.ta... /> - <a href="http://ftp.x.org/contrib/widgets/Xaw3d/">http://ftp.x.org/contrib/w... /> + <a href="http://ftp.x.org/contrib/widgets/Xaw3d/R6.3/">http://ftp.x.org/cont... /> configure flag: <tt>--with-athena=3d</tt> ＠＠ -166,7 +166,7 ＠＠ Ben Wing LessTif is a library that is compatible with Motif, dating back from the days before Motif was free and still actively developed. - <a href="http://ftp.xemacs.org/pub/xemacs/aux/lesstif-0.94.0.tar.gz">lesstif... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/lesstif-0.94.4.tar.gz">lesstif... /> <a href="http://www.lesstif.org/">http://www.lesstif.org/</a> configure flag: <tt>--with-scrollbars=motif,--with-dialogs=motif,--with-widgets=motif</tt> (Same caveats apply for menubars as with OpenMotif. Also LessTif didn't use ＠＠ -176,6 +176,7 ＠＠ Ben Wing Network Audio System (NAS) is a client-server sound library for X. <a href="http://ftp.xemacs.org/pub/xemacs/aux/nas-1.7.src.tar.gz">nas-1.7.sr... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/nas-1.7b.src.tar.gz">nas-1.7b.... (experimental)</a> <a href="http://radscan.com/nas.html">http://radscan.com/nas.html</a> configure flag: <tt>--with-sound=nas</tt> ＠＠ -187,7 +188,7 ＠＠ Ben Wing Netpbm is a collection of programs that XEmacs might use at runtime. - <a href="http://ftp.xemacs.org/pub/xemacs/aux/netpbm-10.18.18.tgz">netpbm-10... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/netpbm-10.26.12.tgz">netpbm-10... /> <a href="http://netpbm.sourceforge.net/">http://netpbm.sourceforge.net/</a> <h1><a name="section-7.">Databases:</a></h1> ＠＠ -204,20 +205,20 ＠＠ Ben Wing Berkeley DB is provided by Sleepycat Software. - <a href="http://ftp.xemacs.org/pub/xemacs/aux/db-4.3.27.tar.gz">db-4.3.27.ta... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/db-4.3.28.tar.gz">db-4.3.28.ta... /> <a href="http://www.sleepycat.com/products/db.shtml">http://www.sleepycat.co... /> configure flag: <tt>--with-database=berkdb</tt> OpenLDAP is an implementation of the LDAP X.500 Directory protocol. - <a href="http://ftp.xemacs.org/pub/xemacs/aux/openldap-2.2.22.tgz">openldap-... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/openldap-2.3.4.tgz">openldap-2... /> <a href="http://www.openldap.org/">http://www.openldap.org/</a> configure flag: <tt>--with-ldap</tt> PostgreSQL is an SQL-compliant object-relational database management system. - <a href="http://ftp.xemacs.org/pub/xemacs/aux/postgresql-8.0.0.tar.gz">postg... /> - <a href="http://ftp.xemacs.org/pub/xemacs/aux/postgresql-base-8.0.0.tar.gz">... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/postgresql-8.0.3.tar.gz">postg... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/postgresql-base-8.0.3.tar.gz">... /> <a href="http://www.postgresql.org/">http://www.postgresql.org/</a> configure flag: <tt>--with-postgresql</tt> ＠＠ -247,7 +248,7 ＠＠ Ben Wing Mew is a multi-lingual mailreader. - <a href="http://ftp.xemacs.org/pub/xemacs/aux/mew-4.1.tar.gz">mew-4.1.tar.gz... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/mew-4.2.tar.gz">mew-4.2.tar.gz... /> <a href="http://www.mew.org/">http://www.mew.org/</a> ＠＠ -255,7 +256,7 ＠＠ Ben Wing special support for Asian languages with large character sets. There are other similar programs (e.g. xiterm), but this one appears to be the most actively maintained. - <a href="http://ftp.xemacs.org/pub/xemacs/aux/mlterm-2.9.1.tar.gz">mlterm-2.... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/mlterm-2.9.2.tar.gz">mlterm-2.... /> <a href="http://mlterm.sourceforge.net/">http://mlterm.sourceforge.net/</a> ＠＠ -267,7 +268,7 ＠＠ Ben Wing ispell is a spelling checker with support for multiple languages. - <a href="http://ftp.xemacs.org/pub/xemacs/aux/ispell-3.2.06.tar.gz">ispell-3... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/ispell-3.3.02.tar.gz">ispell-3... /> <a href="http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell.html">http://fm... /> <a href="http://www.kdstevens.com/~stevens/ispell-page.html">http://www.kdst...> ＠＠ -300,8 +301,10 ＠＠ It has been modified to work with XEmacs <h1><a name="section-10.">Developer Tools:</a></h1> CVS is the version control system used by XEmacs to manage the sources. - <a href="http://ftp.xemacs.org/pub/xemacs/aux/cvs-1.11.18.tar.gz">cvs-1.11.1... /> - <a href="https://www.cvshome.org/">https://www.cvshome.org/</a> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/cvs-1.11.20.tar.gz">cvs-1.11.2... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/cvs-1.12.12.tar.gz">cvs-1.12.1... (experimental)</a> +NOTE: The CVS home page recently (August 2, 2005) moved. + <a href="http://www.nongnu.org/cvs/">http://www.nongnu.org/cvs/</a> bzip2 is a compressor that compresses much better than gzip. ＠＠ -310,21 +313,22 ＠＠ It has been modified to work with XEmacs texi2html is a script that converts Texinfo pages to HTML. - <a href="http://ftp.xemacs.org/pub/xemacs/aux/texi2html-1.72.tar.gz">texi2ht... /> - The texi2html package underwent a change of ownership during 2001. - Current home page: <a href="https://texi2html.cvshome.org/">https://texi2html.cvshome.org/</a> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/texi2html-1.76.tar.gz">texi2ht... /> +NOTE: The texi2html home page recently (August 2, 2005) moved. + Current home page: <a href="http://www.nongnu.org/texi2html/">http://www.nongnu.org/texi2html/<... /> Gnats is a bug tracking system. - <a href="http://ftp.xemacs.org/pub/xemacs/aux/gnats-4.0.1.tar.gz">gnats-4.0.... /> - <a href="http://ftp.xemacs.org/pub/xemacs/aux/cern_wwwgnats_v2.0-beta.tar.gz...> (WWW front end to Gnats) + <a href="http://ftp.xemacs.org/pub/xemacs/aux/gnats-4.1.0.tar.gz">gnats-4.1.... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/cern_wwwgnats_v2.0-beta.tar.gz...> (WWW front end to Gnats, extremely old) <a href="http://sources.redhat.com/gnats/">http://sources.redhat.com/gnats/<... /> Use autoconf to generate `configure' from `configure.in'. Use autoconf to generate `configure' from `configure.in'. -NOTE: There is a more recent series, 2.5x, that XEmacs doesn't currently work with. +NOTE: Only autoconf 2.13 works with XEmacs 21.4. XEmacs 21.5 and above work with the current 2.59 release. <a href="http://ftp.xemacs.org/pub/xemacs/aux/autoconf-2.13.tar.gz">autoconf... /> + <a href="http://ftp.xemacs.org/pub/xemacs/aux/autoconf-2.59.tar.gz">autoconf... /> <a href="http://www.gnu.org/software/autoconf/">http://www.gnu.org/software/... /> cvs server: Diffing Download/win32 Index: Download/win32/optional-libs.exe =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/win32/optional-libs.exe,v retrieving revision 1.1 diff -u -p -r1.1 optional-libs.exe Binary files /tmp/cvsCAAR5aqHg and optional-libs.exe differ cvs server: Diffing FAQ cvs server: Diffing FAQ/old cvs server: Diffing FAQ/oldstuff cvs server: Diffing Images cvs server: Diffing Install cvs server: Diffing Languages cvs server: Diffing Languages/German cvs server: Diffing Languages/Japanese cvs server: Diffing Links cvs server: Diffing Lists cvs server: Diffing News cvs server: Diffing People Index: People/index.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/People/index.content,v retrieving revision 1.1 diff -u -p -r1.1 index.content --- People/index.content 2005/01/31 03:04:25 1.1 +++ People/index.content 2005/09/25 14:38:37 ＠＠ -30,6 +30,7 ＠＠ Ben Wing <li><a href="jerry.james/">Jerry James</a></li> <li><a href="jonathan.harris/">Jonathan Harris</a></li> <li><a href="kirill.katsnelson/">Kirill 'Big K' Katsnelson</a></li> + <li><a href="malcolm.purvis/">Malcolm Purvis</a></li> <li><a href="martin.buchholz/">Martin Buchholz</a></li> <li><a href="mike.sperber/">Michael Sperber</a></li> <li><a href="norbert.koch/">Norbert Koch</a></li> ＠＠ -105,7 +106,6 ＠＠ Ben Wing <li><a href="kyle.jones/">Kyle Jones</a></li> <li><a href="lars.ingebrigtsen/">Lars Ingebrigtsen</a></li> <li><a href="linda.arai/">Linda Arai</a></li> - <li><a href="malcolm.purvis/">Malcolm Purvis</a></li> <li><a href="marc.paquette/">Marc Paquette</a></li> <li><a href="marcus.crestani/">Marcus Crestani</a></li> <li><a href="marcus.thiessel/">Marcus Thiessel</a></li> cvs server: Diffing People/adrian.aichner cvs server: Diffing People/aidan.kehoe cvs server: Diffing People/alastair.houghton cvs server: Diffing People/alexey.mahotkin cvs server: Diffing People/andreas.jaeger cvs server: Diffing People/andrew.cosgriff cvs server: Diffing People/andy.piper cvs server: Diffing People/anthony.rossini cvs server: Diffing People/barry.warsaw cvs server: Diffing People/ben.wing cvs server: Diffing People/bjorn.torkelsson cvs server: Diffing People/bob.weiner cvs server: Diffing People/carsten.dominik cvs server: Diffing People/charles.waldman cvs server: Diffing People/christian.nybo cvs server: Diffing People/chuck.thompson cvs server: Diffing People/colin.rafferty cvs server: Diffing People/craig.lanning cvs server: Diffing People/daiki.ueno cvs server: Diffing People/damon.lipparelli cvs server: Diffing People/dan.holmsand cvs server: Diffing People/daniel.pittman cvs server: Diffing People/darrell.kindred cvs server: Diffing People/darryl.okahata cvs server: Diffing People/david.hobley cvs server: Diffing People/david.moore cvs server: Diffing People/didier.verna cvs server: Diffing People/eduardo.pelegri-llopart cvs server: Diffing People/eric.benson cvs server: Diffing People/eric.knauel cvs server: Diffing People/eric.ludlam cvs server: Diffing People/evgeny.zajcev cvs server: Diffing People/fabrice.popineau cvs server: Diffing People/francisco.vides cvs server: Diffing People/gary.foster cvs server: Diffing People/glynn.clements cvs server: Diffing People/greg.klanderman cvs server: Diffing People/gunnar.evermann cvs server: Diffing People/hans.muller cvs server: Diffing People/harlan.sexton cvs server: Diffing People/heiko.muenkel cvs server: Diffing People/hisashi.miyashita cvs server: Diffing People/hrvoje.niksic cvs server: Diffing People/i.n.golubev cvs server: Diffing People/jake.colman cvs server: Diffing People/james.potts cvs server: Diffing People/jamie.zawinski cvs server: Diffing People/jan.rychter cvs server: Diffing People/jan.vroonhof cvs server: Diffing People/jareth.hein cvs server: Diffing People/jari.aalto cvs server: Diffing People/jason.mastaler cvs server: Diffing People/jeff.miller cvs server: Diffing People/jens-ulrik.petersen cvs server: Diffing People/jens.lautenbacher cvs server: Diffing People/jerry.james cvs server: Diffing People/jesper.pedersen cvs server: Diffing People/john.jacobs-anderson cvs server: Diffing People/john.paul.wallington cvs server: Diffing People/john.rose cvs server: Diffing People/john.wiegley cvs server: Diffing People/jonathan.harris cvs server: Diffing People/jonathan.stigelman cvs server: Diffing People/karl.hegbloom cvs server: Diffing People/kazuo.oishi cvs server: Diffing People/kazuyuki.ienaga cvs server: Diffing People/kenny.stevens cvs server: Diffing People/kevin.oberman cvs server: Diffing People/kirill.katsnelson cvs server: Diffing People/klaus.berndl cvs server: Diffing People/kyle.jones cvs server: Diffing People/lars.ingebrigtsen cvs server: Diffing People/linda.arai cvs server: Diffing People/malcolm.purvis cvs server: Diffing People/marc.paquette cvs server: Diffing People/marcus.crestani cvs server: Diffing People/marcus.thiessel cvs server: Diffing People/markus.kaltenbach cvs server: Diffing People/martin.buchholz cvs server: Diffing People/martin.schwenke cvs server: Diffing People/martin.stjernholm cvs server: Diffing People/mats.lidell cvs server: Diffing People/matt.simmons cvs server: Diffing People/matt.tucker cvs server: Diffing People/matthieu.devin cvs server: Diffing People/michael.albinus cvs server: Diffing People/michael.cook cvs server: Diffing People/michael.diers cvs server: Diffing People/michael.kifer cvs server: Diffing People/mike.alexander cvs server: Diffing People/mike.sperber cvs server: Diffing People/mike.woolley cvs server: Diffing People/nick.pakoulin cvs server: Diffing People/norbert.koch cvs server: Diffing People/oliver.graf cvs server: Diffing People/olivier.galibert cvs server: Diffing People/oscar.figueiredo cvs server: Diffing People/ovidiu.predescu cvs server: Diffing People/paul.kinnucan cvs server: Diffing People/per.abrahamsen cvs server: Diffing People/peter.brown cvs server: Diffing People/peter.osterlund cvs server: Diffing People/peter.pezaris cvs server: Diffing People/photos cvs server: Diffing People/raymond.toy cvs server: Diffing People/rebecca.ore cvs server: Diffing People/richard.mlynarik cvs server: Diffing People/richard.reingruber cvs server: Diffing People/rick.campbell cvs server: Diffing People/robin.socha cvs server: Diffing People/rodney.sparapani cvs server: Diffing People/sandy.wambold cvs server: Diffing People/sean.maclennan cvs server: Diffing People/simon.josefsson cvs server: Diffing People/stefanie.teufel cvs server: Diffing People/stephen.turnbull cvs server: Diffing People/steve.baur cvs server: Diffing People/steve.youngs cvs server: Diffing People/stig.bjorlykke cvs server: Diffing People/sven.grundmann cvs server: Diffing People/tomohiko.morioka cvs server: Diffing People/tomonori.ikeyama cvs server: Diffing People/trey.abelew cvs server: Diffing People/uwe.brauer cvs server: Diffing People/ville.skytta cvs server: Diffing People/vin.shelton cvs server: Diffing People/vladimir.ivanovic cvs server: Diffing People/will.deakin cvs server: Diffing People/william.perry cvs server: Diffing People/yoshiki.hayashi cvs server: Diffing Releases cvs server: Diffing Releases/Public-21.2 cvs server: Diffing Releases/Public-21.2/developers cvs server: Diffing Releases/Public-21.2/projects cvs server: Diffing Releases/Public-21.2/wishes cvs server: Diffing Texi2html cvs server: Diffing Texi2html/Tests cvs server: Diffing Texi2html/Tests/GermanNodeTest cvs server: Diffing Texi2html/doc cvs server: Diffing cgi-bin cvs server: Diffing cgi-bin/.wilma cvs server: Diffing etc cvs server: Diffing etc/namazu cvs server: Diffing etc/namazu/templates cvs server: Diffing genpage cvs server: Diffing genpage/bin cvs server: Diffing genpage/content cvs server: Diffing genpage/content/recipes cvs server: Diffing genpage/examples cvs server: Diffing genpage/examples/ex1 cvs server: Diffing genpage/examples/ex2 cvs server: Diffing genpage/examples/ex3 cvs server: Diffing genpage/examples/ex3/foo cvs server: Diffing genpage/include cvs server: Diffing genpage/layout cvs server: Diffing genpage/lib cvs server: Diffing genpage/news.themes

1 participants
0 comments

[21.5 AC sjt-xft] Disable Canna+MC_ALLOC until crash is fixed 18 years, 7 months

Stephen J. Turnbull

21.5 APPROVE COMMIT sjt-xft This is the promised patch to make it hard (maybe impossible without patching configure.ac) to configure --with-canna --enable-mc-alloc. I've tested all nine possibilities (default, yes, no)^2 and they all configure as desired. If you want the version that allows you to build with both Canna and MC_ALLOC for debugging purposes, use the -r canna-mc-alloc-crash tag when updating. Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.418.2.17 diff -u -r1.418.2.17 ChangeLog --- ChangeLog 24 Sep 2005 14:02:11 -0000 1.418.2.17 +++ ChangeLog 24 Sep 2005 14:30:01 -0000 ＠＠ -0,0 +1,4 ＠＠ +2005-09-22 Stephen J. Turnbull <stephen(a)xemacs.org> + + * configure.ac (Canna): Disable if MC_ALLOC is enabled. + Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.1.14.13 diff -u -r1.1.14.13 configure.ac --- configure.ac 24 Sep 2005 14:02:12 -0000 1.1.14.13 +++ configure.ac 24 Sep 2005 14:30:02 -0000 ＠＠ -4400,13 +4400,18 ＠＠ test -z "$with_canna" && { AC_CHECK_LIB(canna,jrKanjiControl,[:],with_canna=no) } test -z "$with_canna" && with_canna=yes if test "$with_canna" = "yes"; then - AC_DEFINE(HAVE_CANNA) - XE_APPEND(modules/canna, MAKE_SUBDIR) - need_modules_common=yes - if test "$with_modules" = "yes"; then - XE_APPEND(modules/canna, INSTALL_ARCH_DEP_SUBDIR) + if test "$enable_mc_alloc" = "yes"; then + dnl #### REMOVE THIS BRANCH WHEN CANNA_MC_ALLOC CONFLICT IS FIXED #### + with_canna=disabled + else + AC_DEFINE(HAVE_CANNA) + XE_APPEND(modules/canna, MAKE_SUBDIR) + need_modules_common=yes + if test "$with_modules" = "yes"; then + XE_APPEND(modules/canna, INSTALL_ARCH_DEP_SUBDIR) + fi + XE_PREPEND(-lcanna -lRKC, canna_libs) fi - XE_PREPEND(-lcanna -lRKC, canna_libs) fi AC_SUBST(canna_libs) ＠＠ -5837,6 +5842,13 ＠＠ test "$with_xim" = xlib && echo " - Using raw Xlib to provide XIM support." test "$with_xfs" = yes && echo " - Using XFontSet to provide bilingual menubar." test "$with_canna" = yes && echo " Compiling in support for Canna on Mule." +if test "$with_canna" = disabled; then + echo " WARNING: ---------------------------------------------------------" + echo " WARNING: Canna found but disabled due to conflict with MC_ALLOC!" + echo " WARNING: To configure with Canna you must use --disable-mc-alloc." + echo " WARNING: If you don't know what Canna is, you don't need it." + echo " WARNING: ---------------------------------------------------------" +fi if test "$with_wnn" = yes; then echo " Compiling in support for the WNN input method on Mule." test "$with_wnn6" = yes && echo " - Using WNN version 6." -- School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

1 participants
0 comments

[21.5 AC sjt-xft] clean up register-input-method 18 years, 7 months

Stephen J. Turnbull

21.5 APPROVE COMMIT sjt-xft Minor clean up. I'll probably commit with the "Convert Canna to ELL" patches to follow. Index: lisp/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.599.2.8 diff -u -r1.599.2.8 ChangeLog --- lisp/ChangeLog 20 Sep 2005 16:05:22 -0000 1.599.2.8 +++ lisp/ChangeLog 24 Sep 2005 13:07:29 -0000 ＠＠ -0,0 +1,5 ＠＠ +2005-09-21 Stephen J. Turnbull <stephen(a)xemacs.org> + + * mule/mule-cmds.el (input-method-alist, register-input-method): + Improve docstrings and formal parameter names. + Index: lisp/mule/mule-cmds.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/mule-cmds.el,v retrieving revision 1.24 diff -u -r1.24 mule-cmds.el --- lisp/mule/mule-cmds.el 4 Nov 2004 23:06:02 -0000 1.24 +++ lisp/mule/mule-cmds.el 24 Sep 2005 13:07:30 -0000 ＠＠ -347,44 +347,41 ＠＠ (put 'describe-current-input-method-function 'permanent-local t) (defvar input-method-alist nil - "Alist of input method names vs how to use them. -Each element has the form: - (INPUT-METHOD LANGUAGE-ENV ACTIVATE-FUNC TITLE DESCRIPTION ARGS...) -See the function `register-input-method' for the meanings of the elements.") + "Alist mapping input method names to information used by the LEIM API. +Elements have the form (METHOD LANGUAGE ACTIVATOR TITLE DESCRIPTION ARGS...). +Use `register-input-method' to add input methods to the database. See its +documentation for the meanings of the elements.") -(defun register-input-method (input-method lang-env &rest args) - "Register INPUT-METHOD as an input method for language environment ENV. -INPUT-METHOD and LANG-ENV are symbols or strings. +(defun register-input-method (method language + ;; #### shouldn't be optional, but need to + ;; audit callers + &optional activator title description + &rest args) + "Register METHOD as an input method for language environment LANGUAGE. -The remaining arguments are: - ACTIVATE-FUNC, TITLE, DESCRIPTION, and ARGS... -ACTIVATE-FUNC is a function to call to activate this method. +METHOD and LANGUAGE may be symbols or strings. +ACTIVATOR is the function called to activate this method. METHOD (the + invocation name) and ARGS are passed to the function on activation. TITLE is a string to show in the mode line when this method is active. DESCRIPTION is a string describing this method and what it is good for. -The ARGS, if any, are passed as arguments to ACTIVATE-FUNC. -All told, the arguments to ACTIVATE-FUNC are INPUT-METHOD and the ARGS. +Optional ARGS, if any, are stored and passed as arguments to ACTIVATOR. -This function is mainly used in the file \"leim-list.el\" which is -created at building time of emacs, registering all quail input methods -contained in the emacs distribution. +When registering a new Quail input method, the input method title should be +the one given in the third parameter of `quail-define-package' (if the values +are different, the string specified in this function takes precedence). -In case you want to register a new quail input method by yourself, be -careful to use the same input method title as given in the third -parameter of `quail-define-package' (if the values are different, the -string specified in this function takes precedence). - -The commands `describe-input-method' and `list-input-methods' need -this duplicated values to show some information about input methods -without loading the affected quail packages." - (if (symbolp lang-env) - (setq lang-env (symbol-name lang-env))) - (if (symbolp input-method) - (setq input-method (symbol-name input-method))) - (let ((info (cons lang-env args)) - (slot (assoc input-method input-method-alist))) +The information provided is registered in `input-method-alist'. The commands +`describe-input-method' and `list-input-methods' use this database to show +information about input methods without loading them." + (if (symbolp language) + (setq language (symbol-name language))) + (if (symbolp method) + (setq method (symbol-name method))) + (let ((info (append (list language activator title description) args)) + (slot (assoc method input-method-alist))) (if slot (setcdr slot info) - (setq slot (cons input-method info)) + (setq slot (cons method info)) (setq input-method-alist (cons slot input-method-alist))))) (defun read-input-method-name (prompt &optional default inhibit-null) -- Graduate School of Systems and Information Engineering University of Tsukuba http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Economics of Information Communication and Computation Systems Experimental Economics, Microeconomic Theory, Game Theory

1 participants
0 comments

[AC sjt-xft] Reduce verbosity of font debugging and truenames 18 years, 7 months

Stephen J. Turnbull

APPROVE COMMIT sjt-xft This patch gives the user more control over verbosity of fontconfig font names in debugging output via the variable xft-debug. It also reduces the verbosity of both font names and frequency of output for xft-debug=1. More controversially, it reduces the verbosity of Xft font truenames by removing more of the rarely user-specified properties from the fontconfig name. I'm open to discussion on this. Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.28 diff -u -U0 -r1.758.2.28 ChangeLog --- src/ChangeLog 23 Sep 2005 18:20:37 -0000 1.758.2.28 +++ src/ChangeLog 24 Sep 2005 12:50:27 -0000 ＠＠ -0,0 +1,7 ＠＠ +2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> + + * objects-x.c (x_find_charset_font): Give user more control of + debug verbosity. Reduce verbosity at debug_xft=1. Reduce + verbosity of truename by removing properties that are rarely + specified from fontconfig font name. + Index: src/objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.26.2.18 diff -u -r1.26.2.18 objects-x.c --- src/objects-x.c 18 Apr 2005 03:51:18 -0000 1.26.2.18 +++ src/objects-x.c 24 Sep 2005 12:50:36 -0000 ＠＠ -1281,10 +1226,9 ＠＠ FcConfig *fcc; FcChar8 *lang = "en"; /* #### probably a bad idea */ FcCharSet *fccs = NULL; - DECLARE_EISTRING (eistr_shortname); -#ifdef RETURN_LONG_FONTCONFIG_NAMES - DECLARE_EISTRING (eistr_longname); -#endif + DECLARE_EISTRING (eistr_shortname); /* user-friendly nickname */ + DECLARE_EISTRING (eistr_longname); /* omit FC_LANG and FC_CHARSET */ + DECLARE_EISTRING (eistr_fullname); /* everything */ LISP_STRING_TO_EXTERNAL (font, patternext, Qxft_font_name_encoding); fcc = FcConfigGetCurrent (); ＠＠ -1293,36 +1237,66 ＠＠ { FcPattern *p = FcNameParse (patternext); - PRINT_XFT_PATTERN (1, "FcNameParse'ed name is %s\n", p); + PRINT_XFT_PATTERN (3, "FcNameParse'ed name is %s\n", p); /* #### Next two return FcBool, but what does the return mean? */ /* The order is correct according the fontconfig docs. */ FcConfigSubstitute (fcc, p, FcMatchPattern); - PRINT_XFT_PATTERN (0, "FcConfigSubstitute'ed name is %s\n", p); + PRINT_XFT_PATTERN (2, "FcConfigSubstitute'ed name is %s\n", p); FcDefaultSubstitute (p); - PRINT_XFT_PATTERN (1, "FcDefaultSubstitute'ed name is %s\n", p); + PRINT_XFT_PATTERN (3, "FcDefaultSubstitute'ed name is %s\n", p); /* #### check fcresult of following match? */ fontxft = FcFontMatch (fcc, p, &fcresult); /* this prints the long fontconfig name */ - PRINT_XFT_PATTERN (0, "FcFontMatch'ed name is %s\n", fontxft); + PRINT_XFT_PATTERN (1, "FcFontMatch'ed name is %s\n", fontxft); FcPatternDestroy (p); } - /* heuristic to give reasonable-length names for debug reports */ + /* heuristic to give reasonable-length names for debug reports + + I considered #ifdef SUPPORT_FULL_FONTCONFIG_NAME etc but that's + pointless. We're just going to remove this code once the font/ + face refactoring is done, but until then it could be very useful. + */ { FcPattern *p = FcFontRenderPrepare (fcc, fontxft, fontxft); FcChar8 *name; -#ifdef RETURN_LONG_FONTCONFIG_NAMES + /* full name, including language coverage and repertoire */ name = FcNameUnparse (p); - eicpy_ext (eistr_longname, name, Qxft_font_name_encoding); + eicpy_ext (eistr_fullname, name, Qxft_font_name_encoding); free (name); -#endif - /* short name, omitting coverage and repertoire */ + + /* long name, omitting coverage and repertoire, plus a number + of rarely useful properties */ FcPatternDel (p, FC_CHARSET); FcPatternDel (p, FC_LANG); + FcPatternDel (p, FC_WIDTH); + FcPatternDel (p, FC_SPACING); + FcPatternDel (p, FC_HINTING); + FcPatternDel (p, FC_VERTICAL_LAYOUT); + FcPatternDel (p, FC_AUTOHINT); + FcPatternDel (p, FC_GLOBAL_ADVANCE); + FcPatternDel (p, FC_INDEX); + FcPatternDel (p, FC_SCALE); + FcPatternDel (p, FC_FONTVERSION); + name = FcNameUnparse (p); + eicpy_ext (eistr_longname, name, Qxft_font_name_encoding); + free (name); + + /* nickname, just family and size, but + "family" names usually have style, slant, and weight */ + FcPatternDel (p, FC_FOUNDRY); + FcPatternDel (p, FC_STYLE); + FcPatternDel (p, FC_SLANT); + FcPatternDel (p, FC_WEIGHT); + FcPatternDel (p, FC_PIXEL_SIZE); + FcPatternDel (p, FC_OUTLINE); + FcPatternDel (p, FC_SCALABLE); + FcPatternDel (p, FC_DPI); name = FcNameUnparse (p); eicpy_ext (eistr_shortname, name, Qxft_font_name_encoding); free (name); + FcPatternDestroy (p); } ＠＠ -1342,7 +1316,19 ＠＠ if (cr->rfc3066) { - CHECKING_LANG (0, eidata(eistr_shortname), cr->language); + /* #### is it worth incorporating this logic in a macro? */ + if (debug_xft > 2) + { + CHECKING_LANG (0, eidata(eistr_fullname), cr->language); + } + else if (debug_xft > 1) + { + CHECKING_LANG (0, eidata(eistr_longname), cr->language); + } + else if (debug_xft > 0) + { + CHECKING_LANG (0, eidata(eistr_shortname), cr->language); + } lang = cr->rfc3066; } else if (cr->charset) ＠＠ -1384,20 +1370,51 ＠＠ [[ Aidan says yes. The full pattern with the bitmap coverage is massively unwieldy. ]] - It would be nice if we could just store it into the truename - right here, though. */ - DEBUG_XFT2 (0, "Xft font %s supports %s\n", - eidata(eistr_shortname), lang); + Yah, but that's just *wrong*. We should have the full + thing internally, and filter stuff the client doesn't want + to see on output. + And it would be nice if we could just store it into the + truename right here, though. */ + /* #### is it worth incorporating this logic in a macro? */ + if (debug_xft > 2) + { + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(eistr_fullname), lang); + } + else if (debug_xft > 1) + { + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(eistr_longname), lang); + } + else if (debug_xft > 0) + { + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(eistr_shortname), lang); + } #ifdef RETURN_LONG_FONTCONFIG_NAMES - result = eimake_string(eistr_longname); + result = eimake_string(eistr_fullname); #else - result = eimake_string(eistr_shortname); + result = eimake_string(eistr_longname); #endif } else { - DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", - eidata(eistr_shortname), lang); + /* #### is it worth incorporating this logic in a macro? */ + if (debug_xft > 2) + { + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(eistr_fullname), lang); + } + else if (debug_xft > 1) + { + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(eistr_longname), lang); + } + else if (debug_xft > 0) + { + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(eistr_shortname), lang); + } result = Qnil; } ＠＠ -1424,18 +1441,46 ＠＠ } else if (FcLangSetHasLang (v.u.l, lang) != FcLangDifferentLang) { - DEBUG_XFT2 (0, "Xft font %s supports %s\n", - eidata(eistr_shortname), lang); + /* #### is it worth incorporating this logic in a macro? */ + if (debug_xft > 2) + { + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(eistr_fullname), lang); + } + else if (debug_xft > 1) + { + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(eistr_longname), lang); + } + else if (debug_xft > 0) + { + DEBUG_XFT2 (0, "Xft font %s supports %s\n", + eidata(eistr_shortname), lang); + } #ifdef RETURN_LONG_FONTCONFIG_NAMES - result = eimake_string(eistr_longname); + result = eimake_string(eistr_fullname); #else - result = eimake_string(eistr_shortname); + result = eimake_string(eistr_longname); #endif } else { - DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", - eidata(eistr_shortname), lang); + /* #### is it worth incorporating this logic in a macro? */ + if (debug_xft > 2) + { + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(eistr_fullname), lang); + } + else if (debug_xft > 1) + { + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(eistr_longname), lang); + } + else if (debug_xft > 0) + { + DEBUG_XFT2 (0, "Xft font %s doesn't support %s\n", + eidata(eistr_shortname), lang); + } result = Qnil; } } -- Graduate School of Systems and Information Engineering University of Tsukuba http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Economics of Information Communication and Computation Systems Experimental Economics, Microeconomic Theory, Game Theory

1 participants
0 comments

[AC sjt-xft] Work around bug in FcInit() 18 years, 7 months

Stephen J. Turnbull

APPROVE COMMIT sjt-xft FcInit() never returns a failure, although it can fail. (This is a bug in fontconfig.) This patch works around that. Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.28 diff -u -U0 -r1.758.2.28 ChangeLog --- src/ChangeLog 23 Sep 2005 18:20:37 -0000 1.758.2.28 +++ src/ChangeLog 24 Sep 2005 12:40:09 -0000 ＠＠ -0,0 +1,10 ＠＠ +2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> + + * objects-x.c (x_find_charset_font): Work around buggy return + value in FcInit(). + Index: src/objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.26.2.18 diff -u -r1.26.2.18 objects-x.c --- src/objects-x.c 18 Apr 2005 03:51:18 -0000 1.26.2.18 +++ src/objects-x.c 24 Sep 2005 12:40:18 -0000 ＠＠ -1243,9 +1185,6 ＠＠ int count = 0; const Extbyte *patternext; Lisp_Object result = Qunbound; -#ifdef USE_XFT - FcBool waste; -#endif int i; /* #### with Xft need to handle second stage here -- sjt ＠＠ -1269,12 +1208,18 ＠＠ gives language or repertoire coverage. */ - waste = FcInit (); - if (!waste) /* I don't think this can fail */ - /* #### should we init in xft_fonts_init() - and FcInitBringUpToDate() here? */ + FcInit (); /* No-op if already initialized. + In fontconfig 2.3.2, this cannot return + failure, but that looks like a bug. We + check for it with FcGetCurrentConfig(), + which *can* fail. */ + if (!FcConfigGetCurrent()) /* #### should we init in xft_fonts_init() + and FcInitBringUpToDate() here? + I think not. We should expose FcInit* + interfaces to LISP and decide when to + reinitialize intelligently. */ stderr_out ("Failed fontconfig initialization\n"); - else if (waste) + else { FcPattern *fontxft; /* long-lived, freed at end of this block */ FcResult fcresult; -- Graduate School of Systems and Information Engineering University of Tsukuba http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Economics of Information Communication and Computation Systems Experimental Economics, Microeconomic Theory, Game Theory

1 participants
0 comments

[AC sjt-xft] comment and dead code cleanup 18 years, 7 months

Stephen J. Turnbull

APPROVE COMMIT sjt-xft Minor cleanups on private branch. Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.28 diff -u -U0 -r1.758.2.28 ChangeLog --- src/ChangeLog 23 Sep 2005 18:20:37 -0000 1.758.2.28 +++ src/ChangeLog 24 Sep 2005 12:28:52 -0000 ＠＠ -0,0 +1,5 ＠＠ +2005-09-24 Stephen J. Turnbull <stephen(a)xemacs.org> + + * objects-x.c: Improve various header comments. + (x_font_instance_truename): Remove obsolete #ifdef 0 code. + Index: src/objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.26.2.18 diff -u -r1.26.2.18 objects-x.c --- src/objects-x.c 18 Apr 2005 03:51:18 -0000 1.26.2.18 +++ src/objects-x.c 24 Sep 2005 12:29:01 -0000 ＠＠ -243,7 +243,7 ＠＠ going to #ifdef the return values defaulting to short. -- sjt */ -/* #### Do we need to properly implement Qxft_font_name_encoding? */ +/* Standard for fontconfig. Use a macro to show we're not guessing. */ #define Qxft_font_name_encoding Qutf_8 /* DEBUGGING STUFF */ ＠＠ -518,7 +518,8 ＠＠ /* Determining the truename of a font is hard. (Big surprise.) - This is almost not true for fontconfig. At least in theory, it is + This is not true for fontconfig. Each font has a (nearly) canonical + representation up to permutation of the order of properties. It is possible to construct a name which exactly identifies the properties of the current font. However, it is theoretically possible that there exists another font with a super set of those properties that would happen to get ＠＠ -824,7 +825,6 ＠＠ /* First, try an Xft font. */ if (NILP (FONT_INSTANCE_TRUENAME (f)) && FONT_INSTANCE_X_XFTFONT (f)) { -#ifndef DO_FORMER_BIZARRE_GYMNASTICS /* The font is already open, we just unparse. */ FcChar8 *res = FcNameUnparse (FONT_INSTANCE_X_XFTFONT (f)->pattern); if (res) ＠＠ -840,65 +840,6 ＠＠ Qnil, Qfont, errb); /* used to return Qnil here */ } -#else - /* FORMER BIZARRE GYMNASTICS */ - int core; - FcChar8* fcfont; - FcPattern *pat = FONT_INSTANCE_X_XFTFONT (f)->pattern; - FcResult res_xlfd = FcPatternGetString (pat, XFT_XLFD, 0, &fcfont); - FcResult res_core = FcPatternGetBool (pat, XFT_CORE, 0, &core); - - /* #### boy this is broken!! FIXME!! - Probably only makes sense in Xft v1. */ - if (res_xlfd == FcResultNoMatch || res_core == FcResultNoMatch || !core) - /* #### should we test fcfont for something here? if so, what? */ - { - /* we've got an Xft font! */ - FcChar8 *res = FcNameUnparse (pat); - Lisp_Object name = (res ? make_string (res, strlen (res)) : Qnil); - /* #### huh? device? Fc don' need no steekin' device! */ - Lisp_Object real_pat = Ffc_font_real_pattern (name, f->device); - free (res); - - res = FcNameUnparse (XFCPATTERN_PTR(real_pat)); - if (res) - { - FONT_INSTANCE_TRUENAME (f) = make_string (res, strlen (res)); - free (res); - return FONT_INSTANCE_TRUENAME (f); - } - else - { - maybe_signal_error (Qgui_error, - "Couldn't unparse Xft font to truename", - Qnil, Qfont, errb); - /* used to return Qnil here */ - } - } - else if (res_xlfd == FcResultMatch && res_core == FcResultMatch) - { - FONT_INSTANCE_TRUENAME (f) = - build_ext_string (truename_via_XListFonts (dpy, - (Extbyte *) &fcfont[0]), - Qx_font_name_encoding); - return FONT_INSTANCE_TRUENAME (f); - } - else if (res_xlfd == FcResultTypeMismatch || res_core == FcResultTypeMismatch) - { /* Now we're f.... */ - maybe_signal_error (Qgui_error, - "Xft TypeMismatch while determining font truename", - Qnil, Qfont, errb); - /* used to return Qnil here */ - } - /* we shouldn't have to worry about FcResultNoId */ - else - { /* Now we're f.... */ - maybe_signal_error (Qgui_error, - "Xft bogus status while determining font truename", - Qnil, Qfont, errb); - /* used to return Qnil here */ - } -#endif /* DO_FORMER_BIZARRE_GYMNASTICS */ } #endif /* USE_XFT */ ＠＠ -1194,9 +1135,10 ＠＠ struct charset_reporter { Lisp_Object *charset; - /* #### Mule-ize these strings? */ - Extbyte *language; - FcChar8 *rfc3066; + /* #### Mule-ize these strings? + No hurry, this is a debug facility. */ + Extbyte *language; /* ASCII, please */ + FcChar8 *rfc3066; /* ASCII, please */ }; static struct charset_reporter charset_table[] = -- Graduate School of Systems and Information Engineering University of Tsukuba http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Economics of Information Communication and Computation Systems Experimental Economics, Microeconomic Theory, Game Theory

1 participants
0 comments

[PATCH COMMIT] mail-lib sync 18 years, 7 months

Simon Josefsson

Another sync. Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/ChangeLog,v retrieving revision 1.159 diff -u -p -r1.159 ChangeLog --- ChangeLog 3 Apr 2005 12:04:01 -0000 1.159 +++ ChangeLog 23 Sep 2005 13:00:13 -0000 ＠＠ -1,3 +1,31 ＠＠ +2005-09-23 Simon Josefsson <jas(a)extundo.com> + + * reporter.el: Change maintainer to FSF, since nobody from the + XEmacs camp has touched this file for ages and it has effectively + been maintained by the FSF for quite some time through syncing + anyway. + +2005-08-08 Richard M. Stallman <rms(a)gnu.org> + + * mail/reporter.el (reporter-dump-state): Use insert-buffer-substring. + +2005-06-02 Katsumi Yamaoka <yamaoka(a)jpl.org> + + * starttls.el (starttls-set-process-query-on-exit-flag): + Use eval-and-compile. + +2005-05-31 Katsumi Yamaoka <yamaoka(a)jpl.org> + + * starttls.el (starttls-set-process-query-on-exit-flag): Alias to + set-process-query-on-exit-flag or process-kill-without-query. + (starttls-open-stream-gnutls): Use it instead of + process-kill-without-query. + (starttls-open-stream): Ditto. + +2001-11-22 Colin Walters <walters(a)debian.org> + + * mail/reporter.el (reporter-submit-bug-report): Doc fixes. + 2005-04-03 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.73 released. Index: mailheader.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/mailheader.el,v retrieving revision 1.2 diff -u -p -r1.2 mailheader.el --- mailheader.el 31 Dec 2000 00:02:38 -0000 1.2 +++ mailheader.el 23 Sep 2005 13:00:13 -0000 ＠＠ -1,6 +1,6 ＠＠ -;;; mailheader.el --- Mail header parsing, merging, formatting +;;; mailheader.el --- mail header parsing, merging, formatting -;; Copyright (C) 1996 by Free Software Foundation, Inc. +;; Copyright (C) 1996, 2002, 2003, 2004, 2005 by Free Software Foundation, Inc. ;; Author: Erik Naggum <erik(a)naggum.no> ;; Keywords: tools, mail, news ＠＠ -19,8 +19,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -191,4 +191,5 ＠＠ A key of nil has as its value a list of (provide 'mailheader) +;;; arch-tag: 6e7aa221-80b5-4b3d-b46f-fd66ab567be0 ;;; mailheader.el ends here Index: reporter.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/reporter.el,v retrieving revision 1.5 diff -u -p -r1.5 reporter.el --- reporter.el 13 Oct 2001 14:17:40 -0000 1.5 +++ reporter.el 23 Sep 2005 13:00:13 -0000 ＠＠ -1,9 +1,10 ＠＠ ;;; reporter.el --- customizable bug reporting of lisp programs -;; Copyright (C) 1993,1994,1995,1996,1997,1998 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: 1993-1998 Barry A. Warsaw -;; Maintainer: XEmacs Development Team +;; Maintainer: FSF ;; Created: 19-Apr-1993 ;; Keywords: maint mail tools ＠＠ -21,8 +22,8 ＠＠ ;; 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., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -62,15 +63,6 ＠＠ ;; ;; ... ;; 'mypkg-variable-last))) -;; Reporter Users -;; ============== -;; Packages that currently use reporter are: CC Mode, supercite, elp, -;; tcl, ediff, crypt++ (crypt), dired-x, rmailgen, mode-line, vm, -;; mh-e, edebug, archie, viper, w3-mode, framepop, hl319, hilit19, -;; pgp, eos, hm--html, efs, webster19. -;; -;; If you know of others, please email me! - ;;; Code: ＠＠ -272,7 +264,7 ＠＠ dumped." varlist) (lisp-indent-line) (insert ")\n")) - (insert-buffer elbuf)) + (insert-buffer-substring elbuf)) (error (insert "State could not be dumped due to the following error:\n\n" (format "%s" fault) ＠＠ -326,7 +318,7 ＠＠ This function prompts for a summary if ` is non-nil. This function does not send a message; it uses the given information -to initialize a a messagem, which the user can then edit and finally send +to initialize a message, which the user can then edit and finally send \(or decline to send). The variable `mail-user-agent' controls which mail-sending package is used for editing and sending the message." (let ((reporter-eval-buffer (current-buffer)) ＠＠ -416,4 +408,6 ＠＠ mail-sending package is used for editing (provide 'reporter) + +;;; arch-tag: 33612ff4-fbbc-4be2-b183-560ce9e0199b ;;; reporter.el ends here Index: rfc2104.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/rfc2104.el,v retrieving revision 1.4 diff -u -p -r1.4 rfc2104.el --- rfc2104.el 16 Sep 2004 13:01:29 -0000 1.4 +++ rfc2104.el 23 Sep 2005 13:00:13 -0000 ＠＠ -1,5 +1,7 ＠＠ ;;; rfc2104.el --- RFC2104 Hashed Message Authentication Codes -;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Simon Josefsson <jas(a)pdc.kth.se> ;; Keywords: mail ＠＠ -18,8 +20,8 ＠＠ ;; 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., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: Index: starttls.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/starttls.el,v retrieving revision 1.3 diff -u -p -r1.3 starttls.el --- starttls.el 10 Jun 2004 20:28:01 -0000 1.3 +++ starttls.el 23 Sep 2005 13:00:13 -0000 ＠＠ -1,6 +1,7 ＠＠ ;;; starttls.el --- STARTTLS functions -;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Author: Simon Josefsson <simon(a)josefsson.org> ＠＠ -21,8 +22,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -228,6 +229,13 ＠＠ handshake, or NIL on failure." (starttls-negotiate-gnutls process) (signal-process (process-id process) 'SIGALRM))) +(eval-and-compile + (if (fboundp 'set-process-query-on-exit-flag) + (defalias 'starttls-set-process-query-on-exit-flag + 'set-process-query-on-exit-flag) + (defalias 'starttls-set-process-query-on-exit-flag + 'process-kill-without-query))) + (defun starttls-open-stream-gnutls (name buffer host service) (message "Opening STARTTLS connection to `%s'..." host) (let* (done ＠＠ -239,7 +247,7 ＠＠ handshake, or NIL on failure." (int-to-string service) service) starttls-extra-arguments))) - (process-kill-without-query process) + (starttls-set-process-query-on-exit-flag process nil) (while (and (processp process) (eq (process-status process) 'run) (save-excursion ＠＠ -279,7 +287,7 ＠＠ specifying a port number to connect to." name buffer starttls-program host (format "%s" service) starttls-extra-args))) - (process-kill-without-query process) + (starttls-set-process-query-on-exit-flag process nil) process))) (provide 'starttls)

1 participants
0 comments

[PATCH COMMIT] pgg sync 18 years, 7 months

Simon Josefsson

More syncing. Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/ChangeLog,v retrieving revision 1.24 diff -u -p -r1.24 ChangeLog --- ChangeLog 16 Sep 2004 13:57:38 -0000 1.24 +++ ChangeLog 23 Sep 2005 12:50:48 -0000 ＠＠ -1,3 +1,55 ＠＠ +2005-08-15 Simon Josefsson <jas(a)extundo.com> + + * pgg.el (url-insert-file-contents): Don't autoload it, Emacs has + it in url-handlers.el and XEmacs in url.el. Reported by Luca + Capello and Romain Francoise. + (pgg-fetch-key-function): Removed, not used? + (pgg-insert-url-with-w3): Require url, to get + url-insert-file-contents regardless of where it is defined. + +2005-08-08 Simon Josefsson <jas(a)extundo.com> + + * pgg.el: Autoload url-insert-file-contents instead of loading + w3/url. + (pgg-insert-url-with-w3): Don't load url here. + +2005-08-05 Daiki Ueno <ueno(a)unixuser.org> + + * pgg-parse.el (pgg-parse-hash-algorithm-alist): Add SHA-2. + +2005-07-25 Simon Josefsson <jas(a)extundo.com> + + * pgg.el (pgg-insert-url-with-w3): Don't load w3, it is possible + to have the url package without w3. Reported by Daiki Ueno + <ueno(a)unixuser.org> and Luigi Panzeri <matley(a)muppetslab.org>. + +2005-07-04 Juanma Barranquero <lekktu(a)gmail.com> + + * pgg-gpg.el (pgg-gpg): + * pgg-parse.el (pgg-parse): + * pgg-pgp.el (pgg-pgp): + * pgg-pgp5.el (pgg-pgp5): Finish `defgroup' description with period. + +2005-06-29 Katsumi Yamaoka <yamaoka(a)jpl.org> + + * pgg.el (pgg-verify): Return the verification result. + +2005-05-30 Reiner Steib <Reiner.Steib(a)gmx.de> + + * pgg-gpg.el (pgg-gpg-snarf-keys-region): Replace `string-to-int' + by `string-to-number'. + * pgg-parse.el (pgg-read-body, pgg-read-bytes) + (pgg-format-key-identifier): Ditto. + +2005-05-09 Simon Josefsson <jas(a)extundo.com> + + * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching, + tiny patch from "Georg C. F. Greve" <greve(a)gnu.org>. + +2005-01-21 Derek Atkins <warlord(a)MIT.EDU> (tiny change) + + * pgg-pgp.el (pgg-pgp-decrypt-region): Use passphrase cache. + 2004-09-16 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.05 released. Index: pgg-def.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-def.el,v retrieving revision 1.4 diff -u -p -r1.4 pgg-def.el --- pgg-def.el 16 Sep 2004 12:02:15 -0000 1.4 +++ pgg-def.el 23 Sep 2005 12:50:48 -0000 ＠＠ -1,6 +1,6 ＠＠ ;;; pgg-def.el --- functions/macros for defining PGG functions -;; Copyright (C) 1999, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Created: 1999/11/02 ＠＠ -20,8 +20,8 ＠＠ ;; 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., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: Index: pgg-gpg.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-gpg.el,v retrieving revision 1.6 diff -u -p -r1.6 pgg-gpg.el --- pgg-gpg.el 16 Sep 2004 12:34:06 -0000 1.6 +++ pgg-gpg.el 23 Sep 2005 12:50:49 -0000 ＠＠ -1,6 +1,7 ＠＠ ;;; pgg-gpg.el --- GnuPG support for PGG. -;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Created: 1999/10/28 ＠＠ -20,8 +21,8 ＠＠ ;; 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., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: ＠＠ -30,7 +31,7 ＠＠ (require 'pgg)) (defgroup pgg-gpg () - "GnuPG interface" + "GnuPG interface." :group 'pgg) (defcustom pgg-gpg-program "gpg" ＠＠ -99,13 +100,13 ＠＠ (if (and pgg-cache-passphrase (progn (goto-char (point-min)) - (re-search-forward "^\\[GNUPG:] GOOD_PASSPHRASE\\>" nil t))) + (re-search-forward "^\\[GNUPG:] \$GOOD_PASSPHRASE\\>\$\\|\$SIG_CREATED\$" nil t))) (pgg-add-passphrase-cache (or key (progn (goto-char (point-min)) (if (re-search-forward - "^\\[GNUPG:] NEED_PASSPHRASE \\w+ ?\\w*" nil t) + "^\\[GNUPG:] NEED_PASSPHRASE\$_PIN\$? \\w+ ?\\w*" nil t) (substring (match-string 0) -8)))) passphrase))) ＠＠ -252,7 +253,7 ＠＠ If optional argument SIGN is non-nil, do (when (re-search-forward "^\\[GNUPG:] IMPORT_RES\\>" nil t) (setq status (buffer-substring (match-end 0) (progn (end-of-line)(point))) - status (vconcat (mapcar #'string-to-int (split-string status)))) + status (vconcat (mapcar #'string-to-number (split-string status)))) (erase-buffer) (insert (format "Imported %d key(s). \tArmor contains %d key(s) [%d bad, %d old].\n" Index: pgg-parse.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-parse.el,v retrieving revision 1.4 diff -u -p -r1.4 pgg-parse.el --- pgg-parse.el 16 Sep 2004 12:37:05 -0000 1.4 +++ pgg-parse.el 23 Sep 2005 12:50:49 -0000 ＠＠ -1,6 +1,6 ＠＠ ;;; pgg-parse.el --- OpenPGP packet parsing -;; Copyright (C) 1999, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Created: 1999/10/28 ＠＠ -20,8 +20,8 ＠＠ ;; 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., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -38,7 +38,7 ＠＠ (eval-when-compile (require 'cl)) (defgroup pgg-parse () - "OpenPGP packet parsing" + "OpenPGP packet parsing." :group 'pgg) (defcustom pgg-parse-public-key-algorithm-alist ＠＠ -56,7 +56,8 ＠＠ (cons (sexp :tag "Number") (sexp :tag "Type")))) (defcustom pgg-parse-hash-algorithm-alist - '((1 . MD5) (2 . SHA1) (3 . RIPEMD160) (5 . MD2)) + '((1 . MD5) (2 . SHA1) (3 . RIPEMD160) (5 . MD2) (8 . SHA256) (9 . SHA384) + (10 . SHA512)) "Alist of the assigned number to the cryptographic hash algorithm." :group 'pgg-parse :type '(repeat ＠＠ -111,7 +112,7 ＠＠ `(mapconcat (lambda (c) (format "%02X" (pgg-char-int c))) ,string "") ;; `(upcase (apply #'format "%02x%02x%02x%02x%02x%02x%02x%02x" - ;; (string-to-int-list ,string))) + ;; (string-to-number-list ,string))) ) (defmacro pgg-parse-time-field (bytes) ＠＠ -134,7 +135,7 ＠＠ (defmacro pgg-read-bytes (nbytes) `(mapcar #'pgg-char-int (pgg-read-bytes-string ,nbytes)) - ;; `(string-to-int-list (pgg-read-bytes-string ,nbytes)) + ;; `(string-to-number-list (pgg-read-bytes-string ,nbytes)) ) (defmacro pgg-read-body-string (ptag) ＠＠ -144,7 +145,7 ＠＠ (defmacro pgg-read-body (ptag) `(mapcar #'pgg-char-int (pgg-read-body-string ,ptag)) - ;; `(string-to-int-list (pgg-read-body-string ,ptag)) + ;; `(string-to-number-list (pgg-read-body-string ,ptag)) ) (defalias 'pgg-skip-bytes 'forward-char) Index: pgg-pgp.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-pgp.el,v retrieving revision 1.5 diff -u -p -r1.5 pgg-pgp.el --- pgg-pgp.el 16 Sep 2004 12:41:11 -0000 1.5 +++ pgg-pgp.el 23 Sep 2005 12:50:49 -0000 ＠＠ -1,6 +1,7 ＠＠ ;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG. -;; Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Created: 1999/11/02 ＠＠ -20,8 +21,8 ＠＠ ;; 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., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: ＠＠ -30,7 +31,7 ＠＠ (require 'pgg)) (defgroup pgg-pgp () - "PGP 2.* and 6.* interface" + "PGP 2.* and 6.* interface." :group 'pgg) (defcustom pgg-pgp-program "pgp" ＠＠ -148,14 +149,16 ＠＠ Bourne shell or its equivalent \(not tcs (defun pgg-pgp-decrypt-region (start end) "Decrypt the current region between START and END." (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) + (key (pgg-pgp-lookup-key pgg-pgp-user-id 'encrypt)) (passphrase (pgg-read-passphrase - (format "PGP passphrase for %s: " pgg-pgp-user-id) - (pgg-pgp-lookup-key pgg-pgp-user-id 'encrypt))) + (format "PGP passphrase for %s: " pgg-pgp-user-id) key)) (args '("+verbose=1" "+batchmode" "+language=us" "-f"))) (pgg-pgp-process-region start end passphrase pgg-pgp-program args) - (pgg-process-when-success nil))) + (pgg-process-when-success + (if pgg-cache-passphrase + (pgg-add-passphrase-cache key passphrase))))) (defun pgg-pgp-sign-region (start end &optional clearsign) "Make detached signature from text between START and END." Index: pgg-pgp5.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-pgp5.el,v retrieving revision 1.4 diff -u -p -r1.4 pgg-pgp5.el --- pgg-pgp5.el 16 Sep 2004 12:41:11 -0000 1.4 +++ pgg-pgp5.el 23 Sep 2005 12:50:49 -0000 ＠＠ -1,6 +1,7 ＠＠ ;;; pgg-pgp5.el --- PGP 5.* support for PGG. -;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Created: 1999/11/02 ＠＠ -20,8 +21,8 ＠＠ ;; 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., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: ＠＠ -30,7 +31,7 ＠＠ (require 'pgg)) (defgroup pgg-pgp5 () - "PGP 5.* interface" + "PGP 5.* interface." :group 'pgg) (defcustom pgg-pgp5-pgpe-program "pgpe" Index: pgg.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg.el,v retrieving revision 1.4 diff -u -p -r1.4 pgg.el --- pgg.el 16 Sep 2004 12:45:39 -0000 1.4 +++ pgg.el 23 Sep 2005 12:50:49 -0000 ＠＠ -1,6 +1,7 ＠＠ ;;; pgg.el --- glue for the various PGP implementations. -;; Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno(a)unixuser.org> ;; Created: 1999/10/28 ＠＠ -20,8 +21,8 ＠＠ ;; 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., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -34,20 +35,10 ＠＠ ;; Don't merge these two `eval-when-compile's. (eval-when-compile (require 'cl)) -;; Fixme: This would be better done with an autoload for -;; `url-insert-file-contents', and the url stuff rationalized. -;; (`locate-library' can say whether the url code is available.) -(eval-when-compile - (ignore-errors - (require 'w3) - (require 'url))) ;;; ＠ utility functions ;;; -(defvar pgg-fetch-key-function (if (fboundp 'url-insert-file-contents) - (function pgg-fetch-key-with-w3))) - (defun pgg-invoke (func scheme &rest args) (progn (require (intern (format "pgg-%s" scheme))) ＠＠ -298,7 +289,8 ＠＠ within the region." (with-output-to-temp-buffer pgg-echo-buffer (set-buffer standard-output) (insert-buffer-substring (if status pgg-output-buffer - pgg-errors-buffer))))))) + pgg-errors-buffer))))) + status)) ;;;###autoload (defun pgg-insert-key () ＠＠ -327,7 +319,6 ＠＠ within the region." (defun pgg-insert-url-with-w3 (url) (ignore-errors - (require 'w3) (require 'url) (let (buffer-file-name) (url-insert-file-contents url))))

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches September 2005