CVS update by adrian xemacs-builds/adrian/website
19 years, 2 months
CVS Monitor
CVS Monitor
, package-get-review-download-sites.el
...
User: adrian
Date: 05/10/25 01:46:15
Modified: xemacs-builds/adrian/website
package-get-review-download-sites.el
Log:
And another exception and some TODO.
Revision Changes Path
1.3 +12 -10 XEmacs/xemacs-builds/adrian/website/package-get-review-download-sites.el
Index: package-get-review-download-sites.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/adrian/website/package-get-review-download-sites.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- package-get-review-download-sites.el 2005/10/24 23:15:19 1.2
+++ package-get-review-download-sites.el 2005/10/24 23:46:15 1.3
＠＠ -6,9 +6,10 ＠＠
; and
; xemacsweb/Releases/index.content
-; 2005-10-22
+; TODO:
+; Handle sites with missing beta directories (use xemacs-21.5 instead).
+; Substitution rule can take care of this.
-
; DONE: 2005-10-23
; xemacsweb/Download/index.content
;-> Feature link to Releases/index.content more prominently!
＠＠ -25,17 +26,18 ＠＠
; HTTP Exceptions (only ftp available!):
(defconst package-get-review-ftp-only-regexp
(regexp-opt
- '("xemacs.xmundo.net"
- "ftp.br.xemacs.org"
- "ftp.nrc.ca"
- "ftp.pasteur.fr"
- "mirror.cict.fr"
+ '("ftp.br.xemacs.org"
"ftp.crc.ca"
- "ftp.stealth.net"
- "ftp.pt.xemacs.org"
"ftp.cz.xemacs.org"
"ftp.jp.xemacs.org"
- "ftp.nz.xemacs.org")
+ "ftp.nrc.ca"
+ "ftp.nz.xemacs.org"
+ "ftp.pasteur.fr"
+ "ftp.pt.xemacs.org"
+ "ftp.stealth.net"
+ "ftp.sunsite.utk.edu"
+ "mirror.cict.fr"
+ "xemacs.xmundo.net")
'words))
; Missing from package-get.el:
- 1 participants
- 0 comments
CVS update by adrian xemacsweb/Releases ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: adrian
Date: 05/10/25 01:32:53
Modified: xemacsweb/Releases ChangeLog index.content
Log:
xemacsweb: substitution errors
-------------------- ChangeLog entries follow: --------------------
Releases/ChangeLog addition:
2005-10-25 Adrian Aichner <adrian(a)xemacs.org>
* index.content: Manual substitution errors.
Revision Changes Path
1.122 +4 -0 XEmacs/xemacsweb/Releases/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/ChangeLog,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- ChangeLog 2005/10/24 22:58:51 1.121
+++ ChangeLog 2005/10/24 23:32:52 1.122
＠＠ -1,5 +1,9 ＠＠
2005-10-25 Adrian Aichner <adrian(a)xemacs.org>
+ * index.content: Manual substitution errors.
+
+2005-10-25 Adrian Aichner <adrian(a)xemacs.org>
+
* index.content: Update download site links after checklink and
linklint feedback.
1.109 +3 -3 XEmacs/xemacsweb/Releases/index.content
Index: index.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/index.content,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- index.content 2005/10/24 22:58:51 1.108
+++ index.content 2005/10/24 23:32:52 1.109
＠＠ -313,11 +313,11 ＠＠ john s jacobs anderson, Sandra Wambold &
<li><a href="http://ftp.au.xemacs.org/pub/xemacs/beta">Australia (au.xemacs.org)</a></li>
<li><a href="http://ftp.at.xemacs.org/editors/xemacs/beta">Austria (at.xemacs.org)</a></li>
<li><a href="http://ftp.be.xemacs.org/ftp/xemacs/beta">Belgium (be.xemacs.org)</a></li>
- <li><a href="ftp://ftp.br.xemacs.org/pub/xemacs/beta">Brazil (br.xemacs.org)</a></li>
+ <li><a href="ftp://ftp.br.xemacs.org/pub/xemacs/xemacs-21.5">Brazil (br.xemacs.org)</a></li>
<li><a href="http://ftp.ca.xemacs.org/pub/Mirror/xemacs/beta">Canada (ca.xemacs.org)</a></li>
<li><a href="ftp://ftp.crc.ca/pub/packages/editors/xemacs/beta">Canada (crc.ca)</a></li>
<li><a href="ftp://ftp.nrc.ca/pub/packages/editors/xemacs/beta">Canada (nrc.ca)</a></li>
- <li><a href="ftp://ftp.cz.xemacs.org/MIRRORS/ftp.xemacs.org/pub/xemacs/beta">Czech Republic (cz.xemacs.org)</a></li>
+ <li><a href="ftp://ftp.cz.xemacs.org/MIRRORS/ftp.xemacs.org/pub/xemacs/xemacs-21... Republic (cz.xemacs.org)</a></li>
<li><a href="http://ftp.dk.xemacs.org/pub/emacs/xemacs/beta">Denmark (dk.xemacs.org)</a></li>
<li><a href="http://ftp.fi.xemacs.org/pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/... (fi.xemacs.org)</a></li>
<li><a href="http://ftp.fr.xemacs.org/pub/xemacs/beta">France (fr.xemacs.org)</a></li>
＠＠ -333,7 +333,7 ＠＠ john s jacobs anderson, Sandra Wambold &
<li><a href="http://ftp.dti.ad.jp/pub/unix/editor/xemacs/beta">Japan (dti.ad.jp)</a></li>
<li><a href="http://ftp.jaist.ac.jp/pub/GNU/xemacs/beta">Japan (jaist.ac.jp)</a></li>
<li><a href="ftp://ftp.jp.xemacs.org/pub/GNU/xemacs/beta">Japan (jp.xemacs.org)</a></li>
- <li><a href="http://sunsite.sut.ac.jp/pub/archives/packages/xemacs/beta">Japan (sut.ac.jp)</a></li>
+ <li><a href="http://sunsite.sut.ac.jp/pub/archives/packages/xemacs/xemacs-21.5">Japan (sut.ac.jp)</a></li>
<li><a href="http://ftp.kr.xemacs.org/pub/tools/emacs/xemacs/beta">Korea (kr.xemacs.org)</a></li>
<li><a href="ftp://ftp.nz.xemacs.org/mirror/ftp.xemacs.org/beta">New Zealand (nz.xemacs.org)</a></li>
<li><a href="http://ftp.no.xemacs.org/pub/xemacs/beta">Norway (no.xemacs.org)</a></li>
- 1 participants
- 0 comments
CVS update by adrian xemacs-builds/adrian/website
19 years, 2 months
CVS Monitor
CVS Monitor
, package-get-review-download-sites.el
...
User: adrian
Date: 05/10/25 01:15:20
Modified: xemacs-builds/adrian/website
package-get-review-download-sites.el
Log:
Typo fix.
Revision Changes Path
1.2 +1 -1 XEmacs/xemacs-builds/adrian/website/package-get-review-download-sites.el
Index: package-get-review-download-sites.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/adrian/website/package-get-review-download-sites.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- package-get-review-download-sites.el 2005/10/24 22:43:48 1.1
+++ package-get-review-download-sites.el 2005/10/24 23:15:19 1.2
＠＠ -42,7 +42,7 ＠＠
; 2005-10-23
-; /beta/experimental/packages Expections (only /xemacs-21.5/experimental/packages available!):
+; /beta/experimental/packages Exceptions (only /xemacs-21.5/experimental/packages available!):
; ftp://ftp.br.xemacs.org/pub/xemacs/xemacs-21.5/experimental/packages
; ftp://ftp.cz.xemacs.org/MIRRORS/ftp.xemacs.org/pub/xemacs/xemacs-21.5/exp...
; http://sunsite.sut.ac.jp/pub/archives/packages/xemacs/xemacs-21.5/experim...
- 1 participants
- 0 comments
CVS update by adrian xemacsweb/Download ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: adrian
Date: 05/10/25 00:59:08
Modified: xemacsweb/Download ChangeLog index.content
Log:
xemacsweb: Update download site links after checklink and linklint feedback
-------------------- ChangeLog entries follow: --------------------
Download/ChangeLog addition:
2005-10-25 Adrian Aichner <adrian(a)xemacs.org>
* index.content: Update download site links after checklink and
linklint feedback.
Releases/ChangeLog addition:
2005-10-25 Adrian Aichner <adrian(a)xemacs.org>
* index.content: Update download site links after checklink and
linklint feedback.
Revision Changes Path
1.121 +5 -0 XEmacs/xemacsweb/Releases/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/ChangeLog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- ChangeLog 2005/10/23 17:15:43 1.120
+++ ChangeLog 2005/10/24 22:58:51 1.121
＠＠ -1,3 +1,8 ＠＠
+2005-10-25 Adrian Aichner <adrian(a)xemacs.org>
+
+ * index.content: Update download site links after checklink and
+ linklint feedback.
+
2005-10-23 Adrian Aichner <adrian(a)xemacs.org>
* index.content: Concentrate download links information into
1.108 +117 -110 XEmacs/xemacsweb/Releases/index.content
Index: index.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/index.content,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- index.content 2005/10/23 17:15:43 1.107
+++ index.content 2005/10/24 22:58:51 1.108
＠＠ -89,48 +89,49 ＠＠ john s jacobs anderson, Sandra Wambold &
<a href="http://ftp.xemacs.org/xemacs/stable/">ftp.xemacs.org</a>
or a mirror in your country:
+ <!-- Generated by 21.5 (beta22) "cucumber" (+CVS-20051023) XEmacs Lucid
+ at Tue Oct 25 00:28:29 2005 +0200 (W. Europe Daylight Time) -->
<ul>
<li><a href="http://ftp.xemacs.org/pub/xemacs/stable">US (Main XEmacs Site)</a></li>
<li><a href="ftp://xemacs.xmundo.net/pub/mirrors/xemacs/stable">Argentina (xmundo.net)</a></li>
<li><a href="http://mirror.aarnet.edu.au/pub/xemacs/stable">Australia (aarnet.edu.au)</a></li>
<li><a href="http://ftp.au.xemacs.org/pub/xemacs/stable">Australia (au.xemacs.org)</a></li>
<li><a href="http://ftp.at.xemacs.org/editors/xemacs/stable">Austria (at.xemacs.org)</a></li>
- <li><a href="http://ftp.be.xemacs.org/xemacs/stable">Belgium (be.xemacs.org)</a></li>
+ <li><a href="http://ftp.be.xemacs.org/ftp/xemacs/stable">Belgium (be.xemacs.org)</a></li>
<li><a href="ftp://ftp.br.xemacs.org/pub/xemacs/stable">Brazil (br.xemacs.org)</a></li>
<li><a href="http://ftp.ca.xemacs.org/pub/Mirror/xemacs/stable">Canada (ca.xemacs.org)</a></li>
- <li><a href="http://ftp.crc.ca/pub/packages/editors/xemacs/stable">Canada (crc.ca)</a></li>
- <li><a href="http://ftp.nrc.ca/pub/packages/editors/xemacs/stable">Canada (nrc.ca)</a></li>
+ <li><a href="ftp://ftp.crc.ca/pub/packages/editors/xemacs/stable">Canada (crc.ca)</a></li>
+ <li><a href="ftp://ftp.nrc.ca/pub/packages/editors/xemacs/stable">Canada (nrc.ca)</a></li>
<li><a href="ftp://ftp.cz.xemacs.org/MIRRORS/ftp.xemacs.org/pub/xemacs/stable">C... Republic (cz.xemacs.org)</a></li>
<li><a href="http://ftp.dk.xemacs.org/pub/emacs/xemacs/stable">Denmark (dk.xemacs.org)</a></li>
<li><a href="http://ftp.fi.xemacs.org/pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/... (fi.xemacs.org)</a></li>
<li><a href="http://ftp.fr.xemacs.org/pub/xemacs/stable">France (fr.xemacs.org)</a></li>
- <li><a href="http://mirror.cict.fr/xemacs/stable">France (mirror.cict.fr)</a></li>
- <li><a href="http://ftp.pasteur.fr/pub/computing/xemacs/stable">France (pasteur.fr)</a></li>
+ <li><a href="ftp://mirror.cict.fr/xemacs/stable">France (mirror.cict.fr)</a></li>
+ <li><a href="ftp://ftp.pasteur.fr/pub/computing/xemacs/stable">France (pasteur.fr)</a></li>
<li><a href="http://ftp.de.xemacs.org/pub/ftp.xemacs.org/tux/xemacs/stable">Germany (de.xemacs.org)</a></li>
<li><a href="http://ftp.is.xemacs.org/pub/xemacs/stable">Iceland (is.xemacs.org)</a></li>
<li><a href="http://ftp.ie.xemacs.org/mirrors/ftp.xemacs.org/pub/xemacs/stable">... (ie.xemacs.org)</a></li>
<li><a href="http://ftp.heanet.ie/mirrors/ftp.xemacs.org/stable">Ireland (heanet.ie)</a></li>
- <li><a href="http://ftp.it.xemacs.org/unix/packages/xemacs/stable">Italy (it.xemacs.org)</a></li>
+ <li><a href="http://ftp.it.xemacs.org/stable">Italy (it.xemacs.org)</a></li>
<li><a href="http://ring.aist.go.jp/pub/text/xemacs/stable">Japan (aist.go.jp)</a></li>
<li><a href="http://ring.asahi-net.or.jp/pub/text/xemacs/stable">Japan (asahi-net.or.jp)</a></li>
<li><a href="http://ftp.dti.ad.jp/pub/unix/editor/xemacs/stable">Japan (dti.ad.jp)</a></li>
<li><a href="http://ftp.jaist.ac.jp/pub/GNU/xemacs/stable">Japan (jaist.ac.jp)</a></li>
<li><a href="ftp://ftp.jp.xemacs.org/pub/GNU/xemacs/stable">Japan (jp.xemacs.org)</a></li>
- <li><a href="http://mirror.nucba.ac.jp/mirror/xemacs/stable">Japan (nucba.ac.jp)</a></li>
<li><a href="http://sunsite.sut.ac.jp/pub/archives/packages/xemacs/stable">Japan (sut.ac.jp)</a></li>
<li><a href="http://ftp.kr.xemacs.org/pub/tools/emacs/xemacs/stable">Korea (kr.xemacs.org)</a></li>
<li><a href="ftp://ftp.nz.xemacs.org/mirror/ftp.xemacs.org/stable">New Zealand (nz.xemacs.org)</a></li>
<li><a href="http://ftp.no.xemacs.org/pub/xemacs/stable">Norway (no.xemacs.org)</a></li>
<li><a href="http://ftp.pl.xemacs.org/pub/unix/editors/xemacs/stable">Poland (pl.xemacs.org)</a></li>
<li><a href="http://ftp.ru.xemacs.org/pub/xemacs/stable">Russia (ru.xemacs.org)</a></li>
- <li><a href="http://ftp.za.xemacs.org/mirrorsites/ftp.xemacs.org/stable">South Africa (za.xemacs.org)</a></li>
<li><a href="http://ftp.se.xemacs.org/pub/gnu/xemacs/stable">Sweden (se.xemacs.org)</a></li>
- <li><a href="http://ftp.ch.xemacs.org/mirror/xemacs/stable">Switzerland (ch.xemacs.org)</a></li>
+ <li><a href="http://ftp.ch.xemacs.org/ftp/mirror/xemacs/stable">Switzerland (ch.xemacs.org)</a></li>
+ <li><a href="http://ftp.tw.xemacs.org/Unix/Editors/XEmacs/stable">Taiwan (ftp.tw.xemacs.org)</a></li>
<li><a href="http://ftp.uk.xemacs.org/sites/ftp.xemacs.org/pub/xemacs/stable">UK (uk.xemacs.org)</a></li>
- <li><a href="http://ibiblio.org/pub/packages/editors/xemacs/stable">US (ibiblio.org)</a></li>
- <li><a href="http://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/stable... (stealth.net)</a></li>
+ <li><a href="http://mirrors.ibiblio.org/pub/mirrors/xemacs/stable">US (ibiblio.org)</a></li>
+ <li><a href="ftp://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/stable">US (stealth.net)</a></li>
<li><a href="http://metalab.unc.edu/pub/packages/editors/xemacs/stable">US (unc.edu)</a></li>
- <li><a href="http://ftp.us.xemacs.org/pub/xemacs/stable">US (us.xemacs.org)</a></li>
+ <li><a href="http://ftp.us.xemacs.org/ftp/pub/xemacs/stable">US (us.xemacs.org)</a></li>
<li><a href="http://ftp.sunsite.utk.edu/pub/xemacs/stable">US (utk.edu)</a></li>
</ul>
＠＠ -303,52 +304,53 ＠＠ john s jacobs anderson, Sandra Wambold &
<a href="http://ftp.xemacs.org/xemacs/beta/">ftp.xemacs.org</a>
or a mirror in your country:
+ <!-- Generated by 21.5 (beta22) "cucumber" (+CVS-20051023) XEmacs Lucid
+ at Tue Oct 25 00:28:29 2005 +0200 (W. Europe Daylight Time) -->
<ul>
<li><a href="http://ftp.xemacs.org/pub/xemacs/beta">US (Main XEmacs Site)</a></li>
<li><a href="ftp://xemacs.xmundo.net/pub/mirrors/xemacs/beta">Argentina (xmundo.net)</a></li>
<li><a href="http://mirror.aarnet.edu.au/pub/xemacs/beta">Australia (aarnet.edu.au)</a></li>
<li><a href="http://ftp.au.xemacs.org/pub/xemacs/beta">Australia (au.xemacs.org)</a></li>
<li><a href="http://ftp.at.xemacs.org/editors/xemacs/beta">Austria (at.xemacs.org)</a></li>
- <li><a href="http://ftp.be.xemacs.org/xemacs/beta">Belgium (be.xemacs.org)</a></li>
+ <li><a href="http://ftp.be.xemacs.org/ftp/xemacs/beta">Belgium (be.xemacs.org)</a></li>
<li><a href="ftp://ftp.br.xemacs.org/pub/xemacs/beta">Brazil (br.xemacs.org)</a></li>
<li><a href="http://ftp.ca.xemacs.org/pub/Mirror/xemacs/beta">Canada (ca.xemacs.org)</a></li>
- <li><a href="http://ftp.crc.ca/pub/packages/editors/xemacs/beta">Canada (crc.ca)</a></li>
- <li><a href="http://ftp.nrc.ca/pub/packages/editors/xemacs/beta">Canada (nrc.ca)</a></li>
+ <li><a href="ftp://ftp.crc.ca/pub/packages/editors/xemacs/beta">Canada (crc.ca)</a></li>
+ <li><a href="ftp://ftp.nrc.ca/pub/packages/editors/xemacs/beta">Canada (nrc.ca)</a></li>
<li><a href="ftp://ftp.cz.xemacs.org/MIRRORS/ftp.xemacs.org/pub/xemacs/beta">Czech Republic (cz.xemacs.org)</a></li>
<li><a href="http://ftp.dk.xemacs.org/pub/emacs/xemacs/beta">Denmark (dk.xemacs.org)</a></li>
<li><a href="http://ftp.fi.xemacs.org/pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/... (fi.xemacs.org)</a></li>
<li><a href="http://ftp.fr.xemacs.org/pub/xemacs/beta">France (fr.xemacs.org)</a></li>
- <li><a href="http://mirror.cict.fr/xemacs/beta">France (mirror.cict.fr)</a></li>
- <li><a href="http://ftp.pasteur.fr/pub/computing/xemacs/beta">France (pasteur.fr)</a></li>
+ <li><a href="ftp://mirror.cict.fr/xemacs/beta">France (mirror.cict.fr)</a></li>
+ <li><a href="ftp://ftp.pasteur.fr/pub/computing/xemacs/beta">France (pasteur.fr)</a></li>
<li><a href="http://ftp.de.xemacs.org/pub/ftp.xemacs.org/tux/xemacs/beta">Germany (de.xemacs.org)</a></li>
<li><a href="http://ftp.is.xemacs.org/pub/xemacs/beta">Iceland (is.xemacs.org)</a></li>
<li><a href="http://ftp.ie.xemacs.org/mirrors/ftp.xemacs.org/pub/xemacs/beta">Ir... (ie.xemacs.org)</a></li>
<li><a href="http://ftp.heanet.ie/mirrors/ftp.xemacs.org/beta">Ireland (heanet.ie)</a></li>
- <li><a href="http://ftp.it.xemacs.org/unix/packages/xemacs/beta">Italy (it.xemacs.org)</a></li>
+ <li><a href="http://ftp.it.xemacs.org/beta">Italy (it.xemacs.org)</a></li>
<li><a href="http://ring.aist.go.jp/pub/text/xemacs/beta">Japan (aist.go.jp)</a></li>
<li><a href="http://ring.asahi-net.or.jp/pub/text/xemacs/beta">Japan (asahi-net.or.jp)</a></li>
<li><a href="http://ftp.dti.ad.jp/pub/unix/editor/xemacs/beta">Japan (dti.ad.jp)</a></li>
<li><a href="http://ftp.jaist.ac.jp/pub/GNU/xemacs/beta">Japan (jaist.ac.jp)</a></li>
<li><a href="ftp://ftp.jp.xemacs.org/pub/GNU/xemacs/beta">Japan (jp.xemacs.org)</a></li>
- <li><a href="http://mirror.nucba.ac.jp/mirror/xemacs/beta">Japan (nucba.ac.jp)</a></li>
<li><a href="http://sunsite.sut.ac.jp/pub/archives/packages/xemacs/beta">Japan (sut.ac.jp)</a></li>
<li><a href="http://ftp.kr.xemacs.org/pub/tools/emacs/xemacs/beta">Korea (kr.xemacs.org)</a></li>
<li><a href="ftp://ftp.nz.xemacs.org/mirror/ftp.xemacs.org/beta">New Zealand (nz.xemacs.org)</a></li>
<li><a href="http://ftp.no.xemacs.org/pub/xemacs/beta">Norway (no.xemacs.org)</a></li>
<li><a href="http://ftp.pl.xemacs.org/pub/unix/editors/xemacs/beta">Poland (pl.xemacs.org)</a></li>
<li><a href="http://ftp.ru.xemacs.org/pub/xemacs/beta">Russia (ru.xemacs.org)</a></li>
- <li><a href="http://ftp.za.xemacs.org/mirrorsites/ftp.xemacs.org/beta">South Africa (za.xemacs.org)</a></li>
<li><a href="http://ftp.se.xemacs.org/pub/gnu/xemacs/beta">Sweden (se.xemacs.org)</a></li>
- <li><a href="http://ftp.ch.xemacs.org/mirror/xemacs/beta">Switzerland (ch.xemacs.org)</a></li>
+ <li><a href="http://ftp.ch.xemacs.org/ftp/mirror/xemacs/beta">Switzerland (ch.xemacs.org)</a></li>
+ <li><a href="http://ftp.tw.xemacs.org/Unix/Editors/XEmacs/beta">Taiwan (ftp.tw.xemacs.org)</a></li>
<li><a href="http://ftp.uk.xemacs.org/sites/ftp.xemacs.org/pub/xemacs/beta">UK (uk.xemacs.org)</a></li>
- <li><a href="http://ibiblio.org/pub/packages/editors/xemacs/beta">US (ibiblio.org)</a></li>
- <li><a href="http://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/beta">US (stealth.net)</a></li>
+ <li><a href="http://mirrors.ibiblio.org/pub/mirrors/xemacs/beta">US (ibiblio.org)</a></li>
+ <li><a href="ftp://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/beta">US (stealth.net)</a></li>
<li><a href="http://metalab.unc.edu/pub/packages/editors/xemacs/beta">US (unc.edu)</a></li>
- <li><a href="http://ftp.us.xemacs.org/pub/xemacs/beta">US (us.xemacs.org)</a></li>
+ <li><a href="http://ftp.us.xemacs.org/ftp/pub/xemacs/beta">US (us.xemacs.org)</a></li>
<li><a href="http://ftp.sunsite.utk.edu/pub/xemacs/beta">US (utk.edu)</a></li>
</ul>
- <h2><a id="Historical" name="Historical">Historical</a>XEmacs Releases</h2>
+ <h2><a id="Historical" name="Historical">Historical</a> XEmacs Releases</h2>
<p><a href="#index">Goto</a> Index</p>
＠＠ -392,50 +394,51 ＠＠ john s jacobs anderson, Sandra Wambold &
or from a mirror in your country:
</p>
-<ul>
- <li><a href="http://ftp.xemacs.org/pub/xemacs/packages">US (Main XEmacs Site)</a></li>
- <li><a href="ftp://xemacs.xmundo.net/pub/mirrors/xemacs/packages">Argentina (xmundo.net)</a></li>
- <li><a href="http://mirror.aarnet.edu.au/pub/xemacs/packages">Australia (aarnet.edu.au)</a></li>
- <li><a href="http://ftp.au.xemacs.org/pub/xemacs/packages">Australia (au.xemacs.org)</a></li>
- <li><a href="http://ftp.at.xemacs.org/editors/xemacs/packages">Austria (at.xemacs.org)</a></li>
- <li><a href="http://ftp.be.xemacs.org/xemacs/packages">Belgium (be.xemacs.org)</a></li>
- <li><a href="ftp://ftp.br.xemacs.org/pub/xemacs/packages">Brazil (br.xemacs.org)</a></li>
- <li><a href="http://ftp.ca.xemacs.org/pub/Mirror/xemacs/packages">Canada (ca.xemacs.org)</a></li>
- <li><a href="http://ftp.crc.ca/pub/packages/editors/xemacs/packages">Canada (crc.ca)</a></li>
- <li><a href="http://ftp.nrc.ca/pub/packages/editors/xemacs/packages">Canada (nrc.ca)</a></li>
- <li><a href="ftp://ftp.cz.xemacs.org/MIRRORS/ftp.xemacs.org/pub/xemacs/packages"... Republic (cz.xemacs.org)</a></li>
- <li><a href="http://ftp.dk.xemacs.org/pub/emacs/xemacs/packages">Denmark (dk.xemacs.org)</a></li>
- <li><a href="http://ftp.fi.xemacs.org/pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/... (fi.xemacs.org)</a></li>
- <li><a href="http://ftp.fr.xemacs.org/pub/xemacs/packages">France (fr.xemacs.org)</a></li>
- <li><a href="http://mirror.cict.fr/xemacs/packages">France (mirror.cict.fr)</a></li>
- <li><a href="http://ftp.pasteur.fr/pub/computing/xemacs/packages">France (pasteur.fr)</a></li>
- <li><a href="http://ftp.de.xemacs.org/pub/ftp.xemacs.org/tux/xemacs/packages">Ge... (de.xemacs.org)</a></li>
- <li><a href="http://ftp.is.xemacs.org/pub/xemacs/packages">Iceland (is.xemacs.org)</a></li>
- <li><a href="http://ftp.ie.xemacs.org/mirrors/ftp.xemacs.org/pub/xemacs/packages... (ie.xemacs.org)</a></li>
- <li><a href="http://ftp.heanet.ie/mirrors/ftp.xemacs.org/packages">Ireland (heanet.ie)</a></li>
- <li><a href="http://ftp.it.xemacs.org/unix/packages/XEMACS/packages">Italy (it.xemacs.org)</a></li>
- <li><a href="http://ring.aist.go.jp/pub/text/xemacs/packages">Japan (aist.go.jp)</a></li>
- <li><a href="http://ring.asahi-net.or.jp/pub/text/xemacs/packages">Japan (asahi-net.or.jp)</a></li>
- <li><a href="http://ftp.dti.ad.jp/pub/unix/editor/xemacs/packages">Japan (dti.ad.jp)</a></li>
- <li><a href="http://ftp.jaist.ac.jp/pub/GNU/xemacs/packages">Japan (jaist.ac.jp)</a></li>
- <li><a href="ftp://ftp.jp.xemacs.org/pub/GNU/xemacs/packages">Japan (jp.xemacs.org)</a></li>
- <li><a href="http://mirror.nucba.ac.jp/mirror/xemacs/packages">Japan (nucba.ac.jp)</a></li>
- <li><a href="http://sunsite.sut.ac.jp/pub/archives/packages/xemacs/packages">Japan (sut.ac.jp)</a></li>
- <li><a href="http://ftp.kr.xemacs.org/pub/tools/emacs/xemacs/packages">Korea (kr.xemacs.org)</a></li>
- <li><a href="ftp://ftp.nz.xemacs.org/mirror/ftp.xemacs.org/packages">New Zealand (nz.xemacs.org)</a></li>
- <li><a href="http://ftp.no.xemacs.org/pub/xemacs/packages">Norway (no.xemacs.org)</a></li>
- <li><a href="http://ftp.pl.xemacs.org/pub/unix/editors/xemacs/packages">Poland (pl.xemacs.org)</a></li>
- <li><a href="http://ftp.ru.xemacs.org/pub/xemacs/packages">Russia (ru.xemacs.org)</a></li>
- <li><a href="http://ftp.za.xemacs.org/mirrorsites/ftp.xemacs.org/packages">South Africa (za.xemacs.org)</a></li>
- <li><a href="http://ftp.se.xemacs.org/pub/gnu/xemacs/packages">Sweden (se.xemacs.org)</a></li>
- <li><a href="http://ftp.ch.xemacs.org/mirror/xemacs/packages">Switzerland (ch.xemacs.org)</a></li>
- <li><a href="http://ftp.uk.xemacs.org/sites/ftp.xemacs.org/pub/xemacs/packages">UK (uk.xemacs.org)</a></li>
- <li><a href="http://ibiblio.org/pub/packages/editors/xemacs/packages">US (ibiblio.org)</a></li>
- <li><a href="http://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/packag... (stealth.net)</a></li>
- <li><a href="http://metalab.unc.edu/pub/packages/editors/xemacs/packages">US (unc.edu)</a></li>
- <li><a href="http://ftp.us.xemacs.org/pub/xemacs/packages">US (us.xemacs.org)</a></li>
- <li><a href="http://ftp.sunsite.utk.edu/pub/xemacs/packages">US (utk.edu)</a></li>
-</ul>
+ <!-- Generated by 21.5 (beta22) "cucumber" (+CVS-20051023) XEmacs Lucid
+ at Tue Oct 25 00:28:29 2005 +0200 (W. Europe Daylight Time) -->
+ <ul>
+ <li><a href="http://ftp.xemacs.org/pub/xemacs/packages">US (Main XEmacs Site)</a></li>
+ <li><a href="ftp://xemacs.xmundo.net/pub/mirrors/xemacs/packages">Argentina (xmundo.net)</a></li>
+ <li><a href="http://mirror.aarnet.edu.au/pub/xemacs/packages">Australia (aarnet.edu.au)</a></li>
+ <li><a href="http://ftp.au.xemacs.org/pub/xemacs/packages">Australia (au.xemacs.org)</a></li>
+ <li><a href="http://ftp.at.xemacs.org/editors/xemacs/packages">Austria (at.xemacs.org)</a></li>
+ <li><a href="http://ftp.be.xemacs.org/ftp/xemacs/packages">Belgium (be.xemacs.org)</a></li>
+ <li><a href="ftp://ftp.br.xemacs.org/pub/xemacs/packages">Brazil (br.xemacs.org)</a></li>
+ <li><a href="http://ftp.ca.xemacs.org/pub/Mirror/xemacs/packages">Canada (ca.xemacs.org)</a></li>
+ <li><a href="ftp://ftp.crc.ca/pub/packages/editors/xemacs/packages">Canada (crc.ca)</a></li>
+ <li><a href="ftp://ftp.nrc.ca/pub/packages/editors/xemacs/packages">Canada (nrc.ca)</a></li>
+ <li><a href="ftp://ftp.cz.xemacs.org/MIRRORS/ftp.xemacs.org/pub/xemacs/packages"... Republic (cz.xemacs.org)</a></li>
+ <li><a href="http://ftp.dk.xemacs.org/pub/emacs/xemacs/packages">Denmark (dk.xemacs.org)</a></li>
+ <li><a href="http://ftp.fi.xemacs.org/pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/... (fi.xemacs.org)</a></li>
+ <li><a href="http://ftp.fr.xemacs.org/pub/xemacs/packages">France (fr.xemacs.org)</a></li>
+ <li><a href="ftp://mirror.cict.fr/xemacs/packages">France (mirror.cict.fr)</a></li>
+ <li><a href="ftp://ftp.pasteur.fr/pub/computing/xemacs/packages">France (pasteur.fr)</a></li>
+ <li><a href="http://ftp.de.xemacs.org/pub/ftp.xemacs.org/tux/xemacs/packages">Ge... (de.xemacs.org)</a></li>
+ <li><a href="http://ftp.is.xemacs.org/pub/xemacs/packages">Iceland (is.xemacs.org)</a></li>
+ <li><a href="http://ftp.ie.xemacs.org/mirrors/ftp.xemacs.org/pub/xemacs/packages... (ie.xemacs.org)</a></li>
+ <li><a href="http://ftp.heanet.ie/mirrors/ftp.xemacs.org/packages">Ireland (heanet.ie)</a></li>
+ <li><a href="http://ftp.it.xemacs.org/packages">Italy (it.xemacs.org)</a></li>
+ <li><a href="http://ring.aist.go.jp/pub/text/xemacs/packages">Japan (aist.go.jp)</a></li>
+ <li><a href="http://ring.asahi-net.or.jp/pub/text/xemacs/packages">Japan (asahi-net.or.jp)</a></li>
+ <li><a href="http://ftp.dti.ad.jp/pub/unix/editor/xemacs/packages">Japan (dti.ad.jp)</a></li>
+ <li><a href="http://ftp.jaist.ac.jp/pub/GNU/xemacs/packages">Japan (jaist.ac.jp)</a></li>
+ <li><a href="ftp://ftp.jp.xemacs.org/pub/GNU/xemacs/packages">Japan (jp.xemacs.org)</a></li>
+ <li><a href="http://sunsite.sut.ac.jp/pub/archives/packages/xemacs/packages">Japan (sut.ac.jp)</a></li>
+ <li><a href="http://ftp.kr.xemacs.org/pub/tools/emacs/xemacs/packages">Korea (kr.xemacs.org)</a></li>
+ <li><a href="ftp://ftp.nz.xemacs.org/mirror/ftp.xemacs.org/packages">New Zealand (nz.xemacs.org)</a></li>
+ <li><a href="http://ftp.no.xemacs.org/pub/xemacs/packages">Norway (no.xemacs.org)</a></li>
+ <li><a href="http://ftp.pl.xemacs.org/pub/unix/editors/xemacs/packages">Poland (pl.xemacs.org)</a></li>
+ <li><a href="http://ftp.ru.xemacs.org/pub/xemacs/packages">Russia (ru.xemacs.org)</a></li>
+ <li><a href="http://ftp.se.xemacs.org/pub/gnu/xemacs/packages">Sweden (se.xemacs.org)</a></li>
+ <li><a href="http://ftp.ch.xemacs.org/ftp/mirror/xemacs/packages">Switzerland (ch.xemacs.org)</a></li>
+ <li><a href="http://ftp.tw.xemacs.org/Unix/Editors/XEmacs/packages">Taiwan (ftp.tw.xemacs.org)</a></li>
+ <li><a href="http://ftp.uk.xemacs.org/sites/ftp.xemacs.org/pub/xemacs/packages">UK (uk.xemacs.org)</a></li>
+ <li><a href="http://mirrors.ibiblio.org/pub/mirrors/xemacs/packages">US (ibiblio.org)</a></li>
+ <li><a href="ftp://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/package... (stealth.net)</a></li>
+ <li><a href="http://metalab.unc.edu/pub/packages/editors/xemacs/packages">US (unc.edu)</a></li>
+ <li><a href="http://ftp.us.xemacs.org/ftp/pub/xemacs/packages">US (us.xemacs.org)</a></li>
+ <li><a href="http://ftp.sunsite.utk.edu/pub/xemacs/packages">US (utk.edu)</a></li>
+ </ul>
<h2><a id="Pre-Releases" name="Pre-Releases">Package Pre-Releases</a></h2>
＠＠ -456,47 +459,51 ＠＠ john s jacobs anderson, Sandra Wambold &
or from a mirror in your country:
</p>
-<ul>
- <li><a href="http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages">Pre-Re... (Main XEmacs Site)</a></li>
- <li><a href="ftp://xemacs.xmundo.net/pub/mirrors/xemacs/beta/experimental/packag... Pre-Releases (xmundo.net)</a></li>
- <li><a href="http://mirror.aarnet.edu.au/pub/xemacs/beta/experimental/packages">Australia Pre-Releases (aarnet.edu.au)</a></li>
- <li><a href="http://ftp.au.xemacs.org/pub/xemacs/beta/experimental/packages">Aus... Pre-Releases (au.xemacs.org)</a></li>
- <li><a href="http://ftp.at.xemacs.org/editors/xemacs/beta/experimentsl/packages"... Pre-Releases (at.xemacs.org)</a></li>
- <li><a href="ftp://ftp.br.xemacs.org/pub/xemacs/xemacs-21.5/experimental/package... Pre-Releases (br.xemacs.org)</a></li>
- <li><a href="http://ftp.ca.xemacs.org/pub/Mirror/xemacs/beta/experimental/packag... Pre-Releases (ca.xemacs.org)</a></li>
- <li><a href="http://ftp.crc.ca/pub/packages/editors/xemacs/beta/experimental/packages">Canada Pre-Releases (crc.ca)</a></li>
- <li><a href="http://ftp.nrc.ca/pub/packages/editors/xemacs/beta/experimental/packages">Canada Pre-Releases (nrc.ca)</a></li>
- <li><a href="ftp://ftp.cz.xemacs.org/MIRRORS/ftp.xemacs.org/pub/xemacs/xemacs-21... Republic Pre-Releases (cz.xemacs.org)</a></li>
- <li><a href="http://ftp.dk.xemacs.org/pub/emacs/xemacs/beta/experimental/package... Pre-Releases (dk.xemacs.org)</a></li>
- <li><a href="http://ftp.fi.xemacs.org/pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/... Pre-Releases (fi.xemacs.org)</a></li>
- <li><a href="http://ftp.fr.xemacs.org/pub/xemacs/beta/experimental/packages">France Pre-Releases (fr.xemacs.org)</a></li>
- <li><a href="http://mirror.cict.fr/xemacs/beta/experimental/packages">France Pre-Releases (mirror.cict.fr)</a></li>
- <li><a href="http://ftp.pasteur.fr/pub/computing/xemacs/beta/experimental/packages">France Pre-Releases (pasteur.fr)</a></li>
- <li><a href="http://ftp.de.xemacs.org/pub/ftp.xemacs.org/tux/xemacs/beta/experim... Pre-Releases (de.xemacs.org)</a></li>
- <li><a href="http://ftp.is.xemacs.org/pub/xemacs/beta/experimental/packages">Ice... Pre-Releases (is.xemacs.org)</a></li>
- <li><a href="http://ftp.ie.xemacs.org/mirrors/ftp.xemacs.org/pub/xemacs/beta/exp... Pre-Releases (ie.xemacs.org)</a></li>
- <li><a href="http://ftp.heanet.ie/mirrors/ftp.xemacs.org/beta/experimental/packa... Pre-Releases (heanet.ie)</a></li>
- <li><a href="http://ftp.it.xemacs.org/unix/packages/XEMACS/beta/experimental/pac... Pre-Releases (it.xemacs.org)</a></li>
- <li><a href="http://ring.aist.go.jp/pub/text/xemacs/beta/experimental/packages">Japan Pre-Releases (aist.go.jp)</a></li>
- <li><a href="http://ring.asahi-net.or.jp/pub/text/xemacs/beta/experimental/packages">Japan Pre-Releases (asahi-net.or.jp)</a></li>
- <li><a href="http://ftp.dti.ad.jp/pub/unix/editor/xemacs/beta/experimental/packages">Japan Pre-Releases (dti.ad.jp)</a></li>
- <li><a href="http://ftp.jaist.ac.jp/pub/GNU/xemacs/beta/experimental/packages">Japan Pre-Releases (jaist.ac.jp)</a></li>
- <li><a href="ftp://ftp.jp.xemacs.org/pub/GNU/xemacs/beta/experimental/packages">... Pre-Releases (jp.xemacs.org)</a></li>
- <li><a href="http://sunsite.sut.ac.jp/pub/archives/packages/xemacs/xemacs-21.5/experimental/packages">Japan Pre-Releases (sut.ac.jp)</a></li>
- <li><a href="ftp://ftp.nz.xemacs.org/mirror/ftp.xemacs.org/packages">New Zealand Pre-Releases (nz.xemacs.org)</a></li>
- <li><a href="http://ftp.no.xemacs.org/pub/xemacs/beta/experimental/packages">Norway Pre-Releases (no.xemacs.org)</a></li>
- <li><a href="http://ftp.pl.xemacs.org/pub/unix/editors/xemacs/beta/experimental/... Pre-Releases (pl.xemacs.org)</a></li>
- <li><a href="http://ftp.ru.xemacs.org/pub/xemacs/beta/experimental/packages">Russia Pre-Releases (ru.xemacs.org)</a></li>
- <li><a href="http://ftp.za.xemacs.org/mirrorsites/ftp.xemacs.org/beta/experiment... Africa Pre-Releases (za.xemacs.org)</a></li>
- <li><a href="http://ftp.se.xemacs.org/pub/gnu/xemacs/beta/experimental/packages"... Pre-Releases (se.xemacs.org)</a></li>
- <li><a href="http://ftp.ch.xemacs.org/mirror/xemacs/beta/experimental/packages">... Pre-Releases (ch.xemacs.org)</a></li>
- <li><a href="http://ftp.uk.xemacs.org/sites/ftp.xemacs.org/pub/xemacs/beta/exper... Pre-Releases (uk.xemacs.org)</a></li>
- <li><a href="http://ibiblio.org/pub/packages/editors/xemacs/beta/experimental/pa... Pre-Releases (ibiblio.org)</a></li>
- <li><a href="http://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/beta/e... Pre-Releases (stealth.net)</a></li>
- <li><a href="http://metalab.unc.edu/pub/packages/editors/xemacs/beta/experimenta... Pre-Releases (unc.edu)</a></li>
- <li><a href="http://ftp.us.xemacs.org/pub/xemacs/beta/experimental/packages">US Pre-Releases (us.xemacs.org)</a></li>
- <li><a href="http://ftp.sunsite.utk.edu/pub/xemacs/beta/experimental/packages">US Pre-Releases (utk.edu)</a></li>
-</ul>
+ <!-- Generated by 21.5 (beta22) "cucumber" (+CVS-20051023) XEmacs Lucid
+ at Tue Oct 25 00:28:29 2005 +0200 (W. Europe Daylight Time) -->
+ <ul>
+ <li><a href="http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages">Pre-Re... (Main XEmacs Site)</a></li>
+ <li><a href="ftp://xemacs.xmundo.net/pub/mirrors/xemacs/beta/experimental/packag... Pre-Releases (xmundo.net)</a></li>
+ <li><a href="http://mirror.aarnet.edu.au/pub/xemacs/beta/experimental/packages">Australia Pre-Releases (aarnet.edu.au)</a></li>
+ <li><a href="http://ftp.au.xemacs.org/pub/xemacs/beta/experimental/packages">Aus... Pre-Releases (au.xemacs.org)</a></li>
+ <li><a href="http://ftp.at.xemacs.org/editors/xemacs/beta/experimental/packages"... Pre-Releases (at.xemacs.org)</a></li>
+ <li><a href="http://ftp.be.xemacs.org/ftp/xemacs/beta/experimental/packages">Bel... (be.xemacs.org)</a></li>
+ <li><a href="ftp://ftp.br.xemacs.org/pub/xemacs/xemacs-21.5/experimental/package... Pre-Releases (br.xemacs.org)</a></li>
+ <li><a href="http://ftp.ca.xemacs.org/pub/Mirror/xemacs/beta/experimental/packag... Pre-Releases (ca.xemacs.org)</a></li>
+ <li><a href="ftp://ftp.crc.ca/pub/packages/editors/xemacs/beta/experimental/packages">Canada Pre-Releases (crc.ca)</a></li>
+ <li><a href="ftp://ftp.nrc.ca/pub/packages/editors/xemacs/beta/experimental/packages">Canada Pre-Releases (nrc.ca)</a></li>
+ <li><a href="ftp://ftp.cz.xemacs.org/MIRRORS/ftp.xemacs.org/pub/xemacs/xemacs-21... Republic Pre-Releases (cz.xemacs.org)</a></li>
+ <li><a href="http://ftp.dk.xemacs.org/pub/emacs/xemacs/beta/experimental/package... Pre-Releases (dk.xemacs.org)</a></li>
+ <li><a href="http://ftp.fi.xemacs.org/pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/... Pre-Releases (fi.xemacs.org)</a></li>
+ <li><a href="http://ftp.fr.xemacs.org/pub/xemacs/beta/experimental/packages">France Pre-Releases (fr.xemacs.org)</a></li>
+ <li><a href="ftp://mirror.cict.fr/xemacs/beta/experimental/packages">France Pre-Releases (mirror.cict.fr)</a></li>
+ <li><a href="ftp://ftp.pasteur.fr/pub/computing/xemacs/beta/experimental/packages">France Pre-Releases (pasteur.fr)</a></li>
+ <li><a href="http://ftp.de.xemacs.org/pub/ftp.xemacs.org/tux/xemacs/beta/experim... Pre-Releases (de.xemacs.org)</a></li>
+ <li><a href="http://ftp.is.xemacs.org/pub/xemacs/beta/experimental/packages">Ice... Pre-Releases (is.xemacs.org)</a></li>
+ <li><a href="http://ftp.ie.xemacs.org/mirrors/ftp.xemacs.org/pub/xemacs/beta/exp... Pre-Releases (ie.xemacs.org)</a></li>
+ <li><a href="http://ftp.heanet.ie/mirrors/ftp.xemacs.org/beta/experimental/packa... Pre-Releases (heanet.ie)</a></li>
+ <li><a href="http://ftp.it.xemacs.org/beta/experimental/packages">Italy Pre-Releases (it.xemacs.org)</a></li>
+ <li><a href="http://ring.aist.go.jp/pub/text/xemacs/beta/experimental/packages">Japan Pre-Releases (aist.go.jp)</a></li>
+ <li><a href="http://ring.asahi-net.or.jp/pub/text/xemacs/beta/experimental/packages">Japan Pre-Releases (asahi-net.or.jp)</a></li>
+ <li><a href="http://ftp.dti.ad.jp/pub/unix/editor/xemacs/beta/experimental/packages">Japan Pre-Releases (dti.ad.jp)</a></li>
+ <li><a href="http://ftp.jaist.ac.jp/pub/GNU/xemacs/beta/experimental/packages">Japan Pre-Releases (jaist.ac.jp)</a></li>
+ <li><a href="ftp://ftp.jp.xemacs.org/pub/GNU/xemacs/beta/experimental/packages">... Pre-Releases (jp.xemacs.org)</a></li>
+ <li><a href="http://sunsite.sut.ac.jp/pub/archives/packages/xemacs/xemacs-21.5/experimental/packages">Japan Pre-Releases (sut.ac.jp)</a></li>
+ <li><a href="http://ftp.kr.xemacs.org/pub/tools/emacs/xemacs/beta/experimental/p... (kr.xemacs.org)</a></li>
+ <li><a href="ftp://ftp.nz.xemacs.org/mirror/ftp.xemacs.org/packages">New Zealand Pre-Releases (nz.xemacs.org)</a></li>
+ <li><a href="http://ftp.no.xemacs.org/pub/xemacs/beta/experimental/packages">Norway Pre-Releases (no.xemacs.org)</a></li>
+ <li><a href="http://ftp.pl.xemacs.org/pub/unix/editors/xemacs/beta/experimental/... Pre-Releases (pl.xemacs.org)</a></li>
+ <li><a href="http://ftp.ru.xemacs.org/pub/xemacs/beta/experimental/packages">Russia Pre-Releases (ru.xemacs.org)</a></li>
+ <li><a href="http://ftp.se.xemacs.org/pub/gnu/xemacs/beta/experimental/packages"... Pre-Releases (se.xemacs.org)</a></li>
+ <li><a href="http://ftp.ch.xemacs.org/ftp/mirror/xemacs/beta/experimental/packag... Pre-Releases (ch.xemacs.org)</a></li>
+ <li><a href="http://ftp.tw.xemacs.org/Unix/Editors/XEmacs/beta/experimental/pack... Pre-Releases (ftp.tw.xemacs.org)</a></li>
+ <li><a href="http://ftp.uk.xemacs.org/sites/ftp.xemacs.org/pub/xemacs/beta/exper... Pre-Releases (uk.xemacs.org)</a></li>
+ <li><a href="http://mirrors.ibiblio.org/pub/mirrors/xemacs/beta/experimental/pac... Pre-Releases (ibiblio.org)</a></li>
+ <li><a href="ftp://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/beta/ex... Pre-Releases (stealth.net)</a></li>
+ <li><a href="http://metalab.unc.edu/pub/packages/editors/xemacs/beta/experimenta... Pre-Releases (unc.edu)</a></li>
+ <li><a href="http://ftp.us.xemacs.org/ftp/pub/xemacs/beta/experimental/packages">US Pre-Releases (us.xemacs.org)</a></li>
+ <li><a href="http://ftp.sunsite.utk.edu/pub/xemacs/beta/experimental/packages">US Pre-Releases (utk.edu)</a></li>
+ </ul>
<!-- Keep this comment at the end of the file
Local variables:
1.169 +5 -0 XEmacs/xemacsweb/Download/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/ChangeLog,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- ChangeLog 2005/10/23 17:15:18 1.168
+++ ChangeLog 2005/10/24 22:59:07 1.169
＠＠ -1,3 +1,8 ＠＠
+2005-10-25 Adrian Aichner <adrian(a)xemacs.org>
+
+ * index.content: Update download site links after checklink and
+ linklint feedback.
+
2005-10-23 Adrian Aichner <adrian(a)xemacs.org>
* index.content: Concentrate download links information into
1.70 +4 -7 XEmacs/xemacsweb/Download/index.content
Index: index.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Download/index.content,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- index.content 2005/10/23 17:15:18 1.69
+++ index.content 2005/10/24 22:59:07 1.70
＠＠ -204,11 +204,8 ＠＠ john s jacobs anderson; content ripped f
<h5>Secondary Mirrors</h5>
<ul>
<li><a href="ftp://ftp.stealth.net/pub/mirrors/ftp.xemacs.org/pub/xemacs/">ftp:/...>
- <li><a href="ftp://ibiblio.org/pub/packages/editors/xemacs/">ftp://ibiblio.org/p...>
- <li><a href="http://ibiblio.org/pub/packages/editors/xemacs/">http://ibiblio.org...>
- <li><a href="http://mirrors.mix5.com/xemacs/">http://mirrors.mix5.com/xemacs/</a...>
- <li><a href="http://www.binarycode.org/xemacs/">http://www.binarycode.org/xemacs...>
- <li><a href="http://xemacs.software-archive.net/">http://xemacs.software-archive...>
+ <li><a href="ftp://mirrors.ibiblio.org/pub/mirrors/xemacs/">ftp://ibiblio.org/pu...>
+ <li><a href="http://mirrors.ibiblio.org/pub/mirrors/xemacs/">http://ibiblio.org/...>
</ul></li>
</ul></li>
</ul>
＠＠ -275,9 +272,9 ＠＠ john s jacobs anderson; content ripped f
<li>
<h4>Taiwan</h4>
<ul>
- <li><a href="ftp://ftp.tw.xemacs.org/pub/xemacs/"
+ <li><a href="ftp://ftp.tw.xemacs.org/Unix/Editors/XEmacs/"
><b>ftp.tw.xemacs.org (FTP)</b></a></li>
- <li><a href="http://ftp.tw.xemacs.org/pub/xemacs/"
+ <li><a href="http://ftp.tw.xemacs.org/Unix/Editors/XEmacs/"
><b>ftp.tw.xemacs.org (HTTP)</b></a></li>
</ul>
<p></p>
- 1 participants
- 0 comments
CVS update by adrian xemacs-builds/adrian/website
19 years, 2 months
CVS Monitor
CVS Monitor
User: adrian
Date: 05/10/25 00:43:49
Added: xemacs-builds/adrian/website
package-get-review-download-sites.el
Log:
Initial version used for today's update.
Revision Changes Path
1.1 XEmacs/xemacs-builds/adrian/website/package-get-review-download-sites.el
Index: package-get-review-download-sites.el
===================================================================
; Adrian Aichner <adrian(a)xemacs.org>, The XEmacs Project, 2005-10-22.
; Hopefully someday this code will allow me to quickly sync
; information between
; xemacs/lisp/package-get.el
; and
; xemacsweb/Releases/index.content
; 2005-10-22
; DONE: 2005-10-23
; xemacsweb/Download/index.content
;-> Feature link to Releases/index.content more prominently!
; DONE: 2005-10-22
; xemacsweb/Documentation/packageGuide.content
;-> LINK to package info instead!
; DONE: 2005-10-22
; xemacsweb/Install/index.content
;-> LINK to package info instead!
; 2005-10-23
; HTTP Exceptions (only ftp available!):
(defconst package-get-review-ftp-only-regexp
(regexp-opt
'("xemacs.xmundo.net"
"ftp.br.xemacs.org"
"ftp.nrc.ca"
"ftp.pasteur.fr"
"mirror.cict.fr"
"ftp.crc.ca"
"ftp.stealth.net"
"ftp.pt.xemacs.org"
"ftp.cz.xemacs.org"
"ftp.jp.xemacs.org"
"ftp.nz.xemacs.org")
'words))
; Missing from package-get.el:
; 2005-10-23
; /beta/experimental/packages Expections (only /xemacs-21.5/experimental/packages available!):
; ftp://ftp.br.xemacs.org/pub/xemacs/xemacs-21.5/experimental/packages
; ftp://ftp.cz.xemacs.org/MIRRORS/ftp.xemacs.org/pub/xemacs/xemacs-21.5/exp...
; http://sunsite.sut.ac.jp/pub/archives/packages/xemacs/xemacs-21.5/experim...
; HTTP path exceptions (see xemacsweb\Download\index.content):
(defun package-get-review-map-ftp-to-http (host path)
(cond
((string-match
(regexp-opt
'("ftp.be.xemacs.org"
"ftp.ch.xemacs.org"
"ftp.us.xemacs.org")
'words) host)
(concat "ftp/" path))
((string-match "ftp.it.xemacs.org" host)
(substring path (length "unix/packages/XEMACS/")))
(t
path)))
(mapc
(lambda (site-list)
(with-output-to-temp-buffer
(concat "*" (symbol-name site-list) "*")
(princ
(format
"\n <!-- Generated by %s\n at %s %+.4d (%s) -->\n"
emacs-version
(current-time-string)
(/
(nth 0
(current-time-zone))
36)
(nth 1
(current-time-zone))))
(princ " <ul>\n")
(mapc
(lambda (e)
;; (princ (format "%s\nftp://%s/%s\n" (first e) (second e) (third e)))
(if (string-match package-get-review-ftp-only-regexp (second e))
(princ
(format " <li><a href=\"ftp://%s/%s\">%s</a></li>\n"
(second e) (third e) (first e)))
(princ
(format " <li><a href=\"http://%s/%s\">%s</a></li>\n"
(second e)
(package-get-review-map-ftp-to-http (second e) (third e))
(first e)))))
(symbol-value site-list))
(princ " </ul>\n")))
(list 'package-get-download-sites
'package-get-pre-release-download-sites))
- 1 participants
- 0 comments
CVS update by adrian xemacs/lisp ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: adrian
Date: 05/10/25 00:40:22
Modified: xemacs/lisp ChangeLog package-get.el
Log:
xemacs-21.5-clean: package-get.el fixes after checklink and linklint testing
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2005-10-25 Adrian Aichner <adrian(a)xemacs.org>
* package-get.el (package-get-download-sites): Fixes after
checklink and linklint testing.
* package-get.el (package-get-pre-release-download-sites): Ditto.
Revision Changes Path
1.688 +6 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.687
retrieving revision 1.688
diff -u -p -r1.687 -r1.688
--- ChangeLog 2005/10/24 10:07:26 1.687
+++ ChangeLog 2005/10/24 22:40:20 1.688
＠＠ -1,3 +1,9 ＠＠
+2005-10-25 Adrian Aichner <adrian(a)xemacs.org>
+
+ * package-get.el (package-get-download-sites): Fixes after
+ checklink and linklint testing.
+ * package-get.el (package-get-pre-release-download-sites): Ditto.
+
2005-10-24 Ben Wing <ben(a)xemacs.org>
* next-error.el (compilation-current-error):
1.71 +10 -8 XEmacs/xemacs/lisp/package-get.el
Index: package-get.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/package-get.el,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- package-get.el 2005/10/23 16:56:45 1.70
+++ package-get.el 2005/10/24 22:40:21 1.71
＠＠ -236,16 +236,16 ＠＠ directory."
("Norway (no.xemacs.org)" "ftp.no.xemacs.org" "pub/xemacs/packages")
("Poland (pl.xemacs.org)" "ftp.pl.xemacs.org" "pub/unix/editors/xemacs/packages")
("Russia (ru.xemacs.org)" "ftp.ru.xemacs.org" "pub/xemacs/packages")
- ("South Africa (za.xemacs.org)" "ftp.za.xemacs.org" "mirrorsites/ftp.xemacs.org/packages")
+; ("South Africa (za.xemacs.org)" "ftp.za.xemacs.org" "mirrorsites/ftp.xemacs.org/packages")
("Sweden (se.xemacs.org)" "ftp.se.xemacs.org" "pub/gnu/xemacs/packages")
("Switzerland (ch.xemacs.org)" "ftp.ch.xemacs.org" "mirror/xemacs/packages")
+ ("Taiwan (ftp.tw.xemacs.org)" "ftp.tw.xemacs.org" "Unix/Editors/XEmacs/packages")
("UK (uk.xemacs.org)" "ftp.uk.xemacs.org" "sites/ftp.xemacs.org/pub/xemacs/packages")
- ("US (ibiblio.org)" "ibiblio.org" "pub/packages/editors/xemacs/packages")
+ ("US (ibiblio.org)" "mirrors.ibiblio.org" "pub/mirrors/xemacs/packages")
("US (stealth.net)" "ftp.stealth.net" "pub/mirrors/ftp.xemacs.org/pub/xemacs/packages")
("US (unc.edu)" "metalab.unc.edu" "pub/packages/editors/xemacs/packages")
("US (us.xemacs.org)" "ftp.us.xemacs.org" "pub/xemacs/packages")
- ("US (utk.edu)" "ftp.sunsite.utk.edu" "pub/xemacs/packages")
- )
+ ("US (utk.edu)" "ftp.sunsite.utk.edu" "pub/xemacs/packages"))
"*List of remote sites available for downloading packages.
List format is '(site-description site-name directory-on-site).
SITE-DESCRIPTION is a textual description of the site. SITE-NAME
＠＠ -326,16 +326,18 ＠＠ variable actually used to specify packag
"pub/unix/editors/xemacs/beta/experimental/packages")
("Russia Pre-Releases (ru.xemacs.org)" "ftp.ru.xemacs.org"
"pub/xemacs/beta/experimental/packages")
- ("South Africa Pre-Releases (za.xemacs.org)" "ftp.za.xemacs.org"
- "mirrorsites/ftp.xemacs.org/beta/experimental/packages")
+; ("South Africa Pre-Releases (za.xemacs.org)" "ftp.za.xemacs.org"
+; "mirrorsites/ftp.xemacs.org/beta/experimental/packages")
("Sweden Pre-Releases (se.xemacs.org)" "ftp.se.xemacs.org"
"pub/gnu/xemacs/beta/experimental/packages")
("Switzerland Pre-Releases (ch.xemacs.org)" "ftp.ch.xemacs.org"
"mirror/xemacs/beta/experimental/packages")
+ ("Taiwan Pre-Releases (ftp.tw.xemacs.org)" "ftp.tw.xemacs.org"
+ "Unix/Editors/XEmacs/beta/experimental/packages")
("UK Pre-Releases (uk.xemacs.org)" "ftp.uk.xemacs.org"
"sites/ftp.xemacs.org/pub/xemacs/beta/experimental/packages")
- ("US Pre-Releases (ibiblio.org)" "ibiblio.org"
- "pub/packages/editors/xemacs/beta/experimental/packages")
+ ("US Pre-Releases (ibiblio.org)" "mirrors.ibiblio.org"
+ "pub/mirrors/xemacs/beta/experimental/packages")
("US Pre-Releases (stealth.net)" "ftp.stealth.net"
"pub/mirrors/ftp.xemacs.org/pub/xemacs/beta/experimental/packages")
("US Pre-Releases (unc.edu)" "metalab.unc.edu"
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/10/24 23:51:27
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1322 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1321
retrieving revision 1.1322
diff -u -p -r1.1321 -r1.1322
--- version.sh 2005/10/23 21:51:13 1.1321
+++ version.sh 2005/10/24 21:51:26 1.1322
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051023)"
+xemacs_extra_name="(+CVS-20051024)"
xemacs_release_date="2005-02-18"
- 1 participants
- 0 comments
CVS update by malcolmp xemacs ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: malcolmp
Date: 05/10/24 23:01:13
Modified: xemacs ChangeLog configure configure.ac
Log:
configure.ac: Fix broken complex arg support. Prefer Xaw to Motif on linux, Mac and BSD.
Revision Changes Path
1.464 +7 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -p -r1.463 -r1.464
--- ChangeLog 2005/10/24 20:39:38 1.463
+++ ChangeLog 2005/10/24 21:01:02 1.464
＠＠ -1,3 +1,10 ＠＠
+2005-10-25 Malcolm Purvis <malcolmp(a)xemacs.org>
+
+ * configure.ac: Prefer Xaw to Motif on Linux, Mac and BSD. From
+ 21.4.
+ * configure.ac (XE_PARSE_COMPLEX_OPTION): Remove debugging.
+ Fix broken --with-<complex>=no.
+
2005-10-20 Malcolm Purvis <malcolmp(a)xemacs.org>
* INSTALL: Reflect changes in the configure options. Update MacOS
1.257 +123 -210 XEmacs/xemacs/configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- configure 2005/10/24 08:12:59 1.256
+++ configure 2005/10/24 21:01:03 1.257
＠＠ -1630,13 +1630,11 ＠＠ with_dragndrop_default="no"
# If --with-prefix or --without-prefix were given then copy the value to the
# equivalent enable_prefix variable.
if test "${with_prefix+set}" = set; then
- echo prefix Setting enable to "$with_prefix"
enable_prefix="$with_prefix"
fi;
# If -enable-prefix or --disable-prefix were given then copy the value to the
# equivalent with_prefix variable.
if test "${enable_prefix+set}" = set; then
- echo prefix Setting with to "$enable_prefix"
with_prefix="$enable_prefix"
fi;
# Check whether --with-prefix or --without-prefix was given.
＠＠ -1650,13 +1648,11 ＠＠ fi;
# If --with-site-lisp or --without-site-lisp were given then copy the value to the
# equivalent enable_site-lisp variable.
if test "${with_site_lisp+set}" = set; then
- echo site-lisp Setting enable to "$with_site_lisp"
enable_site_lisp="$with_site_lisp"
fi;
# If -enable-site-lisp or --disable-site-lisp were given then copy the value to the
# equivalent with_site-lisp variable.
if test "${enable_site_lisp+set}" = set; then
- echo site-lisp Setting with to "$enable_site_lisp"
with_site_lisp="$enable_site_lisp"
fi;
# Check whether --with-site-lisp or --without-site-lisp was given.
＠＠ -1670,13 +1666,11 ＠＠ fi;
# If --with-site-modules or --without-site-modules were given then copy the value to the
# equivalent enable_site-modules variable.
if test "${with_site_modules+set}" = set; then
- echo site-modules Setting enable to "$with_site_modules"
enable_site_modules="$with_site_modules"
fi;
# If -enable-site-modules or --disable-site-modules were given then copy the value to the
# equivalent with_site-modules variable.
if test "${enable_site_modules+set}" = set; then
- echo site-modules Setting with to "$enable_site_modules"
with_site_modules="$enable_site_modules"
fi;
# Check whether --with-site-modules or --without-site-modules was given.
＠＠ -1688,13 +1682,11 ＠＠ fi;
# If --with-gtk or --without-gtk were given then copy the value to the
# equivalent enable_gtk variable.
if test "${with_gtk+set}" = set; then
- echo gtk Setting enable to "$with_gtk"
enable_gtk="$with_gtk"
fi;
# If -enable-gtk or --disable-gtk were given then copy the value to the
# equivalent with_gtk variable.
if test "${enable_gtk+set}" = set; then
- echo gtk Setting with to "$enable_gtk"
with_gtk="$enable_gtk"
fi;
# Check whether --with-gtk or --without-gtk was given.
＠＠ -1708,13 +1700,11 ＠＠ fi;
# If --with-gnome or --without-gnome were given then copy the value to the
# equivalent enable_gnome variable.
if test "${with_gnome+set}" = set; then
- echo gnome Setting enable to "$with_gnome"
enable_gnome="$with_gnome"
fi;
# If -enable-gnome or --disable-gnome were given then copy the value to the
# equivalent with_gnome variable.
if test "${enable_gnome+set}" = set; then
- echo gnome Setting with to "$enable_gnome"
with_gnome="$enable_gnome"
fi;
# Check whether --with-gnome or --without-gnome was given.
＠＠ -1728,13 +1718,11 ＠＠ fi;
# If --with-msw or --without-msw were given then copy the value to the
# equivalent enable_msw variable.
if test "${with_msw+set}" = set; then
- echo msw Setting enable to "$with_msw"
enable_msw="$with_msw"
fi;
# If -enable-msw or --disable-msw were given then copy the value to the
# equivalent with_msw variable.
if test "${enable_msw+set}" = set; then
- echo msw Setting with to "$enable_msw"
with_msw="$enable_msw"
fi;
# Check whether --with-msw or --without-msw was given.
＠＠ -1746,13 +1734,11 ＠＠ fi;
# If --with-gcc or --without-gcc were given then copy the value to the
# equivalent enable_gcc variable.
if test "${with_gcc+set}" = set; then
- echo gcc Setting enable to "$with_gcc"
enable_gcc="$with_gcc"
fi;
# If -enable-gcc or --disable-gcc were given then copy the value to the
# equivalent with_gcc variable.
if test "${enable_gcc+set}" = set; then
- echo gcc Setting with to "$enable_gcc"
with_gcc="$enable_gcc"
fi;
# Check whether --with-gcc or --without-gcc was given.
＠＠ -1764,13 +1750,11 ＠＠ fi;
# If --with-dynamic or --without-dynamic were given then copy the value to the
# equivalent enable_dynamic variable.
if test "${with_dynamic+set}" = set; then
- echo dynamic Setting enable to "$with_dynamic"
enable_dynamic="$with_dynamic"
fi;
# If -enable-dynamic or --disable-dynamic were given then copy the value to the
# equivalent with_dynamic variable.
if test "${enable_dynamic+set}" = set; then
- echo dynamic Setting with to "$enable_dynamic"
with_dynamic="$enable_dynamic"
fi;
# Check whether --with-dynamic or --without-dynamic was given.
＠＠ -1782,13 +1766,11 ＠＠ fi;
# If --with-ncurses or --without-ncurses were given then copy the value to the
# equivalent enable_ncurses variable.
if test "${with_ncurses+set}" = set; then
- echo ncurses Setting enable to "$with_ncurses"
enable_ncurses="$with_ncurses"
fi;
# If -enable-ncurses or --disable-ncurses were given then copy the value to the
# equivalent with_ncurses variable.
if test "${enable_ncurses+set}" = set; then
- echo ncurses Setting with to "$enable_ncurses"
with_ncurses="$enable_ncurses"
fi;
# Check whether --with-ncurses or --without-ncurses was given.
＠＠ -1800,13 +1782,11 ＠＠ fi;
# If --with-dnet or --without-dnet were given then copy the value to the
# equivalent enable_dnet variable.
if test "${with_dnet+set}" = set; then
- echo dnet Setting enable to "$with_dnet"
enable_dnet="$with_dnet"
fi;
# If -enable-dnet or --disable-dnet were given then copy the value to the
# equivalent with_dnet variable.
if test "${enable_dnet+set}" = set; then
- echo dnet Setting with to "$enable_dnet"
with_dnet="$enable_dnet"
fi;
# Check whether --with-dnet or --without-dnet was given.
＠＠ -1818,13 +1798,11 ＠＠ fi;
# If --with-socks or --without-socks were given then copy the value to the
# equivalent enable_socks variable.
if test "${with_socks+set}" = set; then
- echo socks Setting enable to "$with_socks"
enable_socks="$with_socks"
fi;
# If -enable-socks or --disable-socks were given then copy the value to the
# equivalent with_socks variable.
if test "${enable_socks+set}" = set; then
- echo socks Setting with to "$enable_socks"
with_socks="$enable_socks"
fi;
# Check whether --with-socks or --without-socks was given.
＠＠ -1836,13 +1814,11 ＠＠ fi;
# If --with-dragndrop or --without-dragndrop were given then copy the value to the
# equivalent enable_dragndrop variable.
if test "${with_dragndrop+set}" = set; then
- echo dragndrop Setting enable to "$with_dragndrop"
enable_dragndrop="$with_dragndrop"
fi;
# If -enable-dragndrop or --disable-dragndrop were given then copy the value to the
# equivalent with_dragndrop variable.
if test "${enable_dragndrop+set}" = set; then
- echo dragndrop Setting with to "$enable_dragndrop"
with_dragndrop="$enable_dragndrop"
fi;
# Check whether --with-dragndrop or --without-dragndrop was given.
＠＠ -1854,13 +1830,11 ＠＠ fi;
# If --with-cde or --without-cde were given then copy the value to the
# equivalent enable_cde variable.
if test "${with_cde+set}" = set; then
- echo cde Setting enable to "$with_cde"
enable_cde="$with_cde"
fi;
# If -enable-cde or --disable-cde were given then copy the value to the
# equivalent with_cde variable.
if test "${enable_cde+set}" = set; then
- echo cde Setting with to "$enable_cde"
with_cde="$enable_cde"
fi;
# Check whether --with-cde or --without-cde was given.
＠＠ -1872,13 +1846,11 ＠＠ fi;
# If --with-offix or --without-offix were given then copy the value to the
# equivalent enable_offix variable.
if test "${with_offix+set}" = set; then
- echo offix Setting enable to "$with_offix"
enable_offix="$with_offix"
fi;
# If -enable-offix or --disable-offix were given then copy the value to the
# equivalent with_offix variable.
if test "${enable_offix+set}" = set; then
- echo offix Setting with to "$enable_offix"
with_offix="$enable_offix"
fi;
# Check whether --with-offix or --without-offix was given.
＠＠ -1890,13 +1862,11 ＠＠ fi;
# If --with-gpm or --without-gpm were given then copy the value to the
# equivalent enable_gpm variable.
if test "${with_gpm+set}" = set; then
- echo gpm Setting enable to "$with_gpm"
enable_gpm="$with_gpm"
fi;
# If -enable-gpm or --disable-gpm were given then copy the value to the
# equivalent with_gpm variable.
if test "${enable_gpm+set}" = set; then
- echo gpm Setting with to "$enable_gpm"
with_gpm="$enable_gpm"
fi;
# Check whether --with-gpm or --without-gpm was given.
＠＠ -1908,13 +1878,11 ＠＠ fi;
# If --with-xpm or --without-xpm were given then copy the value to the
# equivalent enable_xpm variable.
if test "${with_xpm+set}" = set; then
- echo xpm Setting enable to "$with_xpm"
enable_xpm="$with_xpm"
fi;
# If -enable-xpm or --disable-xpm were given then copy the value to the
# equivalent with_xpm variable.
if test "${enable_xpm+set}" = set; then
- echo xpm Setting with to "$enable_xpm"
with_xpm="$enable_xpm"
fi;
# Check whether --with-xpm or --without-xpm was given.
＠＠ -1926,13 +1894,11 ＠＠ fi;
# If --with-xface or --without-xface were given then copy the value to the
# equivalent enable_xface variable.
if test "${with_xface+set}" = set; then
- echo xface Setting enable to "$with_xface"
enable_xface="$with_xface"
fi;
# If -enable-xface or --disable-xface were given then copy the value to the
# equivalent with_xface variable.
if test "${enable_xface+set}" = set; then
- echo xface Setting with to "$enable_xface"
with_xface="$enable_xface"
fi;
# Check whether --with-xface or --without-xface was given.
＠＠ -1944,13 +1910,11 ＠＠ fi;
# If --with-gif or --without-gif were given then copy the value to the
# equivalent enable_gif variable.
if test "${with_gif+set}" = set; then
- echo gif Setting enable to "$with_gif"
enable_gif="$with_gif"
fi;
# If -enable-gif or --disable-gif were given then copy the value to the
# equivalent with_gif variable.
if test "${enable_gif+set}" = set; then
- echo gif Setting with to "$enable_gif"
with_gif="$enable_gif"
fi;
# Check whether --with-gif or --without-gif was given.
＠＠ -1962,13 +1926,11 ＠＠ fi;
# If --with-jpeg or --without-jpeg were given then copy the value to the
# equivalent enable_jpeg variable.
if test "${with_jpeg+set}" = set; then
- echo jpeg Setting enable to "$with_jpeg"
enable_jpeg="$with_jpeg"
fi;
# If -enable-jpeg or --disable-jpeg were given then copy the value to the
# equivalent with_jpeg variable.
if test "${enable_jpeg+set}" = set; then
- echo jpeg Setting with to "$enable_jpeg"
with_jpeg="$enable_jpeg"
fi;
# Check whether --with-jpeg or --without-jpeg was given.
＠＠ -1980,13 +1942,11 ＠＠ fi;
# If --with-png or --without-png were given then copy the value to the
# equivalent enable_png variable.
if test "${with_png+set}" = set; then
- echo png Setting enable to "$with_png"
enable_png="$with_png"
fi;
# If -enable-png or --disable-png were given then copy the value to the
# equivalent with_png variable.
if test "${enable_png+set}" = set; then
- echo png Setting with to "$enable_png"
with_png="$enable_png"
fi;
# Check whether --with-png or --without-png was given.
＠＠ -1998,13 +1958,11 ＠＠ fi;
# If --with-tiff or --without-tiff were given then copy the value to the
# equivalent enable_tiff variable.
if test "${with_tiff+set}" = set; then
- echo tiff Setting enable to "$with_tiff"
enable_tiff="$with_tiff"
fi;
# If -enable-tiff or --disable-tiff were given then copy the value to the
# equivalent with_tiff variable.
if test "${enable_tiff+set}" = set; then
- echo tiff Setting with to "$enable_tiff"
with_tiff="$enable_tiff"
fi;
# Check whether --with-tiff or --without-tiff was given.
＠＠ -2016,13 +1974,11 ＠＠ fi;
# If --with-zlib or --without-zlib were given then copy the value to the
# equivalent enable_zlib variable.
if test "${with_zlib+set}" = set; then
- echo zlib Setting enable to "$with_zlib"
enable_zlib="$with_zlib"
fi;
# If -enable-zlib or --disable-zlib were given then copy the value to the
# equivalent with_zlib variable.
if test "${enable_zlib+set}" = set; then
- echo zlib Setting with to "$enable_zlib"
with_zlib="$enable_zlib"
fi;
# Check whether --with-zlib or --without-zlib was given.
＠＠ -2034,13 +1990,11 ＠＠ fi;
# If --with-wmcommand or --without-wmcommand were given then copy the value to the
# equivalent enable_wmcommand variable.
if test "${with_wmcommand+set}" = set; then
- echo wmcommand Setting enable to "$with_wmcommand"
enable_wmcommand="$with_wmcommand"
fi;
# If -enable-wmcommand or --disable-wmcommand were given then copy the value to the
# equivalent with_wmcommand variable.
if test "${enable_wmcommand+set}" = set; then
- echo wmcommand Setting with to "$enable_wmcommand"
with_wmcommand="$enable_wmcommand"
fi;
# Check whether --with-wmcommand or --without-wmcommand was given.
＠＠ -2052,13 +2006,11 ＠＠ fi;
# If --with-xmu or --without-xmu were given then copy the value to the
# equivalent enable_xmu variable.
if test "${with_xmu+set}" = set; then
- echo xmu Setting enable to "$with_xmu"
enable_xmu="$with_xmu"
fi;
# If -enable-xmu or --disable-xmu were given then copy the value to the
# equivalent with_xmu variable.
if test "${enable_xmu+set}" = set; then
- echo xmu Setting with to "$enable_xmu"
with_xmu="$enable_xmu"
fi;
# Check whether --with-xmu or --without-xmu was given.
＠＠ -2070,13 +2022,11 ＠＠ fi;
# If --with-purify or --without-purify were given then copy the value to the
# equivalent enable_purify variable.
if test "${with_purify+set}" = set; then
- echo purify Setting enable to "$with_purify"
enable_purify="$with_purify"
fi;
# If -enable-purify or --disable-purify were given then copy the value to the
# equivalent with_purify variable.
if test "${enable_purify+set}" = set; then
- echo purify Setting with to "$enable_purify"
with_purify="$enable_purify"
fi;
# Check whether --with-purify or --without-purify was given.
＠＠ -2088,13 +2038,11 ＠＠ fi;
# If --with-quantify or --without-quantify were given then copy the value to the
# equivalent enable_quantify variable.
if test "${with_quantify+set}" = set; then
- echo quantify Setting enable to "$with_quantify"
enable_quantify="$with_quantify"
fi;
# If -enable-quantify or --disable-quantify were given then copy the value to the
# equivalent with_quantify variable.
if test "${enable_quantify+set}" = set; then
- echo quantify Setting with to "$enable_quantify"
with_quantify="$enable_quantify"
fi;
# Check whether --with-quantify or --without-quantify was given.
＠＠ -2106,13 +2054,11 ＠＠ fi;
# If --with-toolbars or --without-toolbars were given then copy the value to the
# equivalent enable_toolbars variable.
if test "${with_toolbars+set}" = set; then
- echo toolbars Setting enable to "$with_toolbars"
enable_toolbars="$with_toolbars"
fi;
# If -enable-toolbars or --disable-toolbars were given then copy the value to the
# equivalent with_toolbars variable.
if test "${enable_toolbars+set}" = set; then
- echo toolbars Setting with to "$enable_toolbars"
with_toolbars="$enable_toolbars"
fi;
# Check whether --with-toolbars or --without-toolbars was given.
＠＠ -2124,13 +2070,11 ＠＠ fi;
# If --with-tty or --without-tty were given then copy the value to the
# equivalent enable_tty variable.
if test "${with_tty+set}" = set; then
- echo tty Setting enable to "$with_tty"
enable_tty="$with_tty"
fi;
# If -enable-tty or --disable-tty were given then copy the value to the
# equivalent with_tty variable.
if test "${enable_tty+set}" = set; then
- echo tty Setting with to "$enable_tty"
with_tty="$enable_tty"
fi;
# Check whether --with-tty or --without-tty was given.
＠＠ -2142,13 +2086,11 ＠＠ fi;
# If --with-xfs or --without-xfs were given then copy the value to the
# equivalent enable_xfs variable.
if test "${with_xfs+set}" = set; then
- echo xfs Setting enable to "$with_xfs"
enable_xfs="$with_xfs"
fi;
# If -enable-xfs or --disable-xfs were given then copy the value to the
# equivalent with_xfs variable.
if test "${enable_xfs+set}" = set; then
- echo xfs Setting with to "$enable_xfs"
with_xfs="$enable_xfs"
fi;
# Check whether --with-xfs or --without-xfs was given.
＠＠ -2160,13 +2102,11 ＠＠ fi;
# If --with-mule or --without-mule were given then copy the value to the
# equivalent enable_mule variable.
if test "${with_mule+set}" = set; then
- echo mule Setting enable to "$with_mule"
enable_mule="$with_mule"
fi;
# If -enable-mule or --disable-mule were given then copy the value to the
# equivalent with_mule variable.
if test "${enable_mule+set}" = set; then
- echo mule Setting with to "$enable_mule"
with_mule="$enable_mule"
fi;
# Check whether --with-mule or --without-mule was given.
＠＠ -2178,13 +2118,11 ＠＠ fi;
# If --with-default-eol-detection or --without-default-eol-detection were given then copy the value to the
# equivalent enable_default-eol-detection variable.
if test "${with_default_eol_detection+set}" = set; then
- echo default-eol-detection Setting enable to "$with_default_eol_detection"
enable_default_eol_detection="$with_default_eol_detection"
fi;
# If -enable-default-eol-detection or --disable-default-eol-detection were given then copy the value to the
# equivalent with_default-eol-detection variable.
if test "${enable_default_eol_detection+set}" = set; then
- echo default-eol-detection Setting with to "$enable_default_eol_detection"
with_default_eol_detection="$enable_default_eol_detection"
fi;
# Check whether --with-default-eol-detection or --without-default-eol-detection was given.
＠＠ -2196,13 +2134,11 ＠＠ fi;
# If --with-canna or --without-canna were given then copy the value to the
# equivalent enable_canna variable.
if test "${with_canna+set}" = set; then
- echo canna Setting enable to "$with_canna"
enable_canna="$with_canna"
fi;
# If -enable-canna or --disable-canna were given then copy the value to the
# equivalent with_canna variable.
if test "${enable_canna+set}" = set; then
- echo canna Setting with to "$enable_canna"
with_canna="$enable_canna"
fi;
# Check whether --with-canna or --without-canna was given.
＠＠ -2214,13 +2150,11 ＠＠ fi;
# If --with-wnn or --without-wnn were given then copy the value to the
# equivalent enable_wnn variable.
if test "${with_wnn+set}" = set; then
- echo wnn Setting enable to "$with_wnn"
enable_wnn="$with_wnn"
fi;
# If -enable-wnn or --disable-wnn were given then copy the value to the
# equivalent with_wnn variable.
if test "${enable_wnn+set}" = set; then
- echo wnn Setting with to "$enable_wnn"
with_wnn="$enable_wnn"
fi;
# Check whether --with-wnn or --without-wnn was given.
＠＠ -2232,13 +2166,11 ＠＠ fi;
# If --with-wnn6 or --without-wnn6 were given then copy the value to the
# equivalent enable_wnn6 variable.
if test "${with_wnn6+set}" = set; then
- echo wnn6 Setting enable to "$with_wnn6"
enable_wnn6="$with_wnn6"
fi;
# If -enable-wnn6 or --disable-wnn6 were given then copy the value to the
# equivalent with_wnn6 variable.
if test "${enable_wnn6+set}" = set; then
- echo wnn6 Setting with to "$enable_wnn6"
with_wnn6="$enable_wnn6"
fi;
# Check whether --with-wnn6 or --without-wnn6 was given.
＠＠ -2250,13 +2182,11 ＠＠ fi;
# If --with-workshop or --without-workshop were given then copy the value to the
# equivalent enable_workshop variable.
if test "${with_workshop+set}" = set; then
- echo workshop Setting enable to "$with_workshop"
enable_workshop="$with_workshop"
fi;
# If -enable-workshop or --disable-workshop were given then copy the value to the
# equivalent with_workshop variable.
if test "${enable_workshop+set}" = set; then
- echo workshop Setting with to "$enable_workshop"
with_workshop="$enable_workshop"
fi;
# Check whether --with-workshop or --without-workshop was given.
＠＠ -2268,13 +2198,11 ＠＠ fi;
# If --with-sparcworks or --without-sparcworks were given then copy the value to the
# equivalent enable_sparcworks variable.
if test "${with_sparcworks+set}" = set; then
- echo sparcworks Setting enable to "$with_sparcworks"
enable_sparcworks="$with_sparcworks"
fi;
# If -enable-sparcworks or --disable-sparcworks were given then copy the value to the
# equivalent with_sparcworks variable.
if test "${enable_sparcworks+set}" = set; then
- echo sparcworks Setting with to "$enable_sparcworks"
with_sparcworks="$enable_sparcworks"
fi;
# Check whether --with-sparcworks or --without-sparcworks was given.
＠＠ -2286,13 +2214,11 ＠＠ fi;
# If --with-tooltalk or --without-tooltalk were given then copy the value to the
# equivalent enable_tooltalk variable.
if test "${with_tooltalk+set}" = set; then
- echo tooltalk Setting enable to "$with_tooltalk"
enable_tooltalk="$with_tooltalk"
fi;
# If -enable-tooltalk or --disable-tooltalk were given then copy the value to the
# equivalent with_tooltalk variable.
if test "${enable_tooltalk+set}" = set; then
- echo tooltalk Setting with to "$enable_tooltalk"
with_tooltalk="$enable_tooltalk"
fi;
# Check whether --with-tooltalk or --without-tooltalk was given.
＠＠ -2304,13 +2230,11 ＠＠ fi;
# If --with-ldap or --without-ldap were given then copy the value to the
# equivalent enable_ldap variable.
if test "${with_ldap+set}" = set; then
- echo ldap Setting enable to "$with_ldap"
enable_ldap="$with_ldap"
fi;
# If -enable-ldap or --disable-ldap were given then copy the value to the
# equivalent with_ldap variable.
if test "${enable_ldap+set}" = set; then
- echo ldap Setting with to "$enable_ldap"
with_ldap="$enable_ldap"
fi;
# Check whether --with-ldap or --without-ldap was given.
＠＠ -2322,13 +2246,11 ＠＠ fi;
# If --with-postgresql or --without-postgresql were given then copy the value to the
# equivalent enable_postgresql variable.
if test "${with_postgresql+set}" = set; then
- echo postgresql Setting enable to "$with_postgresql"
enable_postgresql="$with_postgresql"
fi;
# If -enable-postgresql or --disable-postgresql were given then copy the value to the
# equivalent with_postgresql variable.
if test "${enable_postgresql+set}" = set; then
- echo postgresql Setting with to "$enable_postgresql"
with_postgresql="$enable_postgresql"
fi;
# Check whether --with-postgresql or --without-postgresql was given.
＠＠ -2340,13 +2262,11 ＠＠ fi;
# If --with-pop or --without-pop were given then copy the value to the
# equivalent enable_pop variable.
if test "${with_pop+set}" = set; then
- echo pop Setting enable to "$with_pop"
enable_pop="$with_pop"
fi;
# If -enable-pop or --disable-pop were given then copy the value to the
# equivalent with_pop variable.
if test "${enable_pop+set}" = set; then
- echo pop Setting with to "$enable_pop"
with_pop="$enable_pop"
fi;
# Check whether --with-pop or --without-pop was given.
＠＠ -2358,13 +2278,11 ＠＠ fi;
# If --with-kerberos or --without-kerberos were given then copy the value to the
# equivalent enable_kerberos variable.
if test "${with_kerberos+set}" = set; then
- echo kerberos Setting enable to "$with_kerberos"
enable_kerberos="$with_kerberos"
fi;
# If -enable-kerberos or --disable-kerberos were given then copy the value to the
# equivalent with_kerberos variable.
if test "${enable_kerberos+set}" = set; then
- echo kerberos Setting with to "$enable_kerberos"
with_kerberos="$enable_kerberos"
fi;
# Check whether --with-kerberos or --without-kerberos was given.
＠＠ -2376,13 +2294,11 ＠＠ fi;
# If --with-hesiod or --without-hesiod were given then copy the value to the
# equivalent enable_hesiod variable.
if test "${with_hesiod+set}" = set; then
- echo hesiod Setting enable to "$with_hesiod"
enable_hesiod="$with_hesiod"
fi;
# If -enable-hesiod or --disable-hesiod were given then copy the value to the
# equivalent with_hesiod variable.
if test "${enable_hesiod+set}" = set; then
- echo hesiod Setting with to "$enable_hesiod"
with_hesiod="$enable_hesiod"
fi;
# Check whether --with-hesiod or --without-hesiod was given.
＠＠ -2394,13 +2310,11 ＠＠ fi;
# If --with-infodock or --without-infodock were given then copy the value to the
# equivalent enable_infodock variable.
if test "${with_infodock+set}" = set; then
- echo infodock Setting enable to "$with_infodock"
enable_infodock="$with_infodock"
fi;
# If -enable-infodock or --disable-infodock were given then copy the value to the
# equivalent with_infodock variable.
if test "${enable_infodock+set}" = set; then
- echo infodock Setting with to "$enable_infodock"
with_infodock="$enable_infodock"
fi;
# Check whether --with-infodock or --without-infodock was given.
＠＠ -2412,13 +2326,11 ＠＠ fi;
# If --with-native-sound-lib or --without-native-sound-lib were given then copy the value to the
# equivalent enable_native-sound-lib variable.
if test "${with_native_sound_lib+set}" = set; then
- echo native-sound-lib Setting enable to "$with_native_sound_lib"
enable_native_sound_lib="$with_native_sound_lib"
fi;
# If -enable-native-sound-lib or --disable-native-sound-lib were given then copy the value to the
# equivalent with_native-sound-lib variable.
if test "${enable_native_sound_lib+set}" = set; then
- echo native-sound-lib Setting with to "$enable_native_sound_lib"
with_native_sound_lib="$enable_native_sound_lib"
fi;
# Check whether --with-native-sound-lib or --without-native-sound-lib was given.
＠＠ -2430,13 +2342,11 ＠＠ fi;
# If --with-netinstall or --without-netinstall were given then copy the value to the
# equivalent enable_netinstall variable.
if test "${with_netinstall+set}" = set; then
- echo netinstall Setting enable to "$with_netinstall"
enable_netinstall="$with_netinstall"
fi;
# If -enable-netinstall or --disable-netinstall were given then copy the value to the
# equivalent with_netinstall variable.
if test "${enable_netinstall+set}" = set; then
- echo netinstall Setting with to "$enable_netinstall"
with_netinstall="$enable_netinstall"
fi;
# Check whether --with-netinstall or --without-netinstall was given.
＠＠ -2450,13 +2360,11 ＠＠ fi;
# If --with-optimization or --without-optimization were given then copy the value to the
# equivalent enable_optimization variable.
if test "${with_optimization+set}" = set; then
- echo optimization Setting enable to "$with_optimization"
enable_optimization="$with_optimization"
fi;
# If -enable-optimization or --disable-optimization were given then copy the value to the
# equivalent with_optimization variable.
if test "${enable_optimization+set}" = set; then
- echo optimization Setting with to "$enable_optimization"
with_optimization="$enable_optimization"
fi;
# Check whether --with-optimization or --without-optimization was given.
＠＠ -2468,13 +2376,11 ＠＠ fi;
# If --with-ipv6-cname or --without-ipv6-cname were given then copy the value to the
# equivalent enable_ipv6-cname variable.
if test "${with_ipv6_cname+set}" = set; then
- echo ipv6-cname Setting enable to "$with_ipv6_cname"
enable_ipv6_cname="$with_ipv6_cname"
fi;
# If -enable-ipv6-cname or --disable-ipv6-cname were given then copy the value to the
# equivalent with_ipv6-cname variable.
if test "${enable_ipv6_cname+set}" = set; then
- echo ipv6-cname Setting with to "$enable_ipv6_cname"
with_ipv6_cname="$enable_ipv6_cname"
fi;
# Check whether --with-ipv6-cname or --without-ipv6-cname was given.
＠＠ -2488,13 +2394,11 ＠＠ fi;
# If --with-site-includes or --without-site-includes were given then copy the value to the
# equivalent enable_site-includes variable.
if test "${with_site_includes+set}" = set; then
- echo site-includes Setting enable to "$with_site_includes"
enable_site_includes="$with_site_includes"
fi;
# If -enable-site-includes or --disable-site-includes were given then copy the value to the
# equivalent with_site-includes variable.
if test "${enable_site_includes+set}" = set; then
- echo site-includes Setting with to "$enable_site_includes"
with_site_includes="$enable_site_includes"
fi;
# Check whether --with-site-includes or --without-site-includes was given.
＠＠ -2506,13 +2410,11 ＠＠ fi;
# If --with-site-libraries or --without-site-libraries were given then copy the value to the
# equivalent enable_site-libraries variable.
if test "${with_site_libraries+set}" = set; then
- echo site-libraries Setting enable to "$with_site_libraries"
enable_site_libraries="$with_site_libraries"
fi;
# If -enable-site-libraries or --disable-site-libraries were given then copy the value to the
# equivalent with_site-libraries variable.
if test "${enable_site_libraries+set}" = set; then
- echo site-libraries Setting with to "$enable_site_libraries"
with_site_libraries="$enable_site_libraries"
fi;
# Check whether --with-site-libraries or --without-site-libraries was given.
＠＠ -2524,13 +2426,11 ＠＠ fi;
# If --with-site-prefixes or --without-site-prefixes were given then copy the value to the
# equivalent enable_site-prefixes variable.
if test "${with_site_prefixes+set}" = set; then
- echo site-prefixes Setting enable to "$with_site_prefixes"
enable_site_prefixes="$with_site_prefixes"
fi;
# If -enable-site-prefixes or --disable-site-prefixes were given then copy the value to the
# equivalent with_site-prefixes variable.
if test "${enable_site_prefixes+set}" = set; then
- echo site-prefixes Setting with to "$enable_site_prefixes"
with_site_prefixes="$enable_site_prefixes"
fi;
# Check whether --with-site-prefixes or --without-site-prefixes was given.
＠＠ -2542,13 +2442,11 ＠＠ fi;
# If --with-statedir or --without-statedir were given then copy the value to the
# equivalent enable_statedir variable.
if test "${with_statedir+set}" = set; then
- echo statedir Setting enable to "$with_statedir"
enable_statedir="$with_statedir"
fi;
# If -enable-statedir or --disable-statedir were given then copy the value to the
# equivalent with_statedir variable.
if test "${enable_statedir+set}" = set; then
- echo statedir Setting with to "$enable_statedir"
with_statedir="$enable_statedir"
fi;
# Check whether --with-statedir or --without-statedir was given.
＠＠ -2562,13 +2460,11 ＠＠ fi;
# If --with-lispdir or --without-lispdir were given then copy the value to the
# equivalent enable_lispdir variable.
if test "${with_lispdir+set}" = set; then
- echo lispdir Setting enable to "$with_lispdir"
enable_lispdir="$with_lispdir"
fi;
# If -enable-lispdir or --disable-lispdir were given then copy the value to the
# equivalent with_lispdir variable.
if test "${enable_lispdir+set}" = set; then
- echo lispdir Setting with to "$enable_lispdir"
with_lispdir="$enable_lispdir"
fi;
# Check whether --with-lispdir or --without-lispdir was given.
＠＠ -2585,13 +2481,11 ＠＠ fi;
# If --with-archlibdir or --without-archlibdir were given then copy the value to the
# equivalent enable_archlibdir variable.
if test "${with_archlibdir+set}" = set; then
- echo archlibdir Setting enable to "$with_archlibdir"
enable_archlibdir="$with_archlibdir"
fi;
# If -enable-archlibdir or --disable-archlibdir were given then copy the value to the
# equivalent with_archlibdir variable.
if test "${enable_archlibdir+set}" = set; then
- echo archlibdir Setting with to "$enable_archlibdir"
with_archlibdir="$enable_archlibdir"
fi;
# Check whether --with-archlibdir or --without-archlibdir was given.
＠＠ -2608,13 +2502,11 ＠＠ fi;
# If --with-moduledir or --without-moduledir were given then copy the value to the
# equivalent enable_moduledir variable.
if test "${with_moduledir+set}" = set; then
- echo moduledir Setting enable to "$with_moduledir"
enable_moduledir="$with_moduledir"
fi;
# If -enable-moduledir or --disable-moduledir were given then copy the value to the
# equivalent with_moduledir variable.
if test "${enable_moduledir+set}" = set; then
- echo moduledir Setting with to "$enable_moduledir"
with_moduledir="$enable_moduledir"
fi;
# Check whether --with-moduledir or --without-moduledir was given.
＠＠ -2631,13 +2523,11 ＠＠ fi;
# If --with-etcdir or --without-etcdir were given then copy the value to the
# equivalent enable_etcdir variable.
if test "${with_etcdir+set}" = set; then
- echo etcdir Setting enable to "$with_etcdir"
enable_etcdir="$with_etcdir"
fi;
# If -enable-etcdir or --disable-etcdir were given then copy the value to the
# equivalent with_etcdir variable.
if test "${enable_etcdir+set}" = set; then
- echo etcdir Setting with to "$enable_etcdir"
with_etcdir="$enable_etcdir"
fi;
# Check whether --with-etcdir or --without-etcdir was given.
＠＠ -2654,13 +2544,11 ＠＠ fi;
# If --with-infopath or --without-infopath were given then copy the value to the
# equivalent enable_infopath variable.
if test "${with_infopath+set}" = set; then
- echo infopath Setting enable to "$with_infopath"
enable_infopath="$with_infopath"
fi;
# If -enable-infopath or --disable-infopath were given then copy the value to the
# equivalent with_infopath variable.
if test "${enable_infopath+set}" = set; then
- echo infopath Setting with to "$enable_infopath"
with_infopath="$enable_infopath"
fi;
# Check whether --with-infopath or --without-infopath was given.
＠＠ -2675,13 +2563,11 ＠＠ fi;
# If --with-docdir or --without-docdir were given then copy the value to the
# equivalent enable_docdir variable.
if test "${with_docdir+set}" = set; then
- echo docdir Setting enable to "$with_docdir"
enable_docdir="$with_docdir"
fi;
# If -enable-docdir or --disable-docdir were given then copy the value to the
# equivalent with_docdir variable.
if test "${enable_docdir+set}" = set; then
- echo docdir Setting with to "$enable_docdir"
with_docdir="$enable_docdir"
fi;
# Check whether --with-docdir or --without-docdir was given.
＠＠ -2698,13 +2584,11 ＠＠ fi;
# If --with-site-runtime-libraries or --without-site-runtime-libraries were given then copy the value to the
# equivalent enable_site-runtime-libraries variable.
if test "${with_site_runtime_libraries+set}" = set; then
- echo site-runtime-libraries Setting enable to "$with_site_runtime_libraries"
enable_site_runtime_libraries="$with_site_runtime_libraries"
fi;
# If -enable-site-runtime-libraries or --disable-site-runtime-libraries were given then copy the value to the
# equivalent with_site-runtime-libraries variable.
if test "${enable_site_runtime_libraries+set}" = set; then
- echo site-runtime-libraries Setting with to "$enable_site_runtime_libraries"
with_site_runtime_libraries="$enable_site_runtime_libraries"
fi;
# Check whether --with-site-runtime-libraries or --without-site-runtime-libraries was given.
＠＠ -2716,13 +2600,11 ＠＠ fi;
# If --with-package-prefix or --without-package-prefix were given then copy the value to the
# equivalent enable_package-prefix variable.
if test "${with_package_prefix+set}" = set; then
- echo package-prefix Setting enable to "$with_package_prefix"
enable_package_prefix="$with_package_prefix"
fi;
# If -enable-package-prefix or --disable-package-prefix were given then copy the value to the
# equivalent with_package-prefix variable.
if test "${enable_package_prefix+set}" = set; then
- echo package-prefix Setting with to "$enable_package_prefix"
with_package_prefix="$enable_package_prefix"
fi;
# Check whether --with-package-prefix or --without-package-prefix was given.
＠＠ -2737,13 +2619,11 ＠＠ fi;
# If --with-package-path or --without-package-path were given then copy the value to the
# equivalent enable_package-path variable.
if test "${with_package_path+set}" = set; then
- echo package-path Setting enable to "$with_package_path"
enable_package_path="$with_package_path"
fi;
# If -enable-package-path or --disable-package-path were given then copy the value to the
# equivalent with_package-path variable.
if test "${enable_package_path+set}" = set; then
- echo package-path Setting with to "$enable_package_path"
with_package_path="$enable_package_path"
fi;
# Check whether --with-package-path or --without-package-path was given.
＠＠ -2758,13 +2638,11 ＠＠ fi;
# If --with-external-widget or --without-external-widget were given then copy the value to the
# equivalent enable_external-widget variable.
if test "${with_external_widget+set}" = set; then
- echo external-widget Setting enable to "$with_external_widget"
enable_external_widget="$with_external_widget"
fi;
# If -enable-external-widget or --disable-external-widget were given then copy the value to the
# equivalent with_external-widget variable.
if test "${enable_external_widget+set}" = set; then
- echo external-widget Setting with to "$enable_external_widget"
with_external_widget="$enable_external_widget"
fi;
# Check whether --with-external-widget or --without-external-widget was given.
＠＠ -2776,13 +2654,11 ＠＠ fi;
# If --with-kkcc or --without-kkcc were given then copy the value to the
# equivalent enable_kkcc variable.
if test "${with_kkcc+set}" = set; then
- echo kkcc Setting enable to "$with_kkcc"
enable_kkcc="$with_kkcc"
fi;
# If -enable-kkcc or --disable-kkcc were given then copy the value to the
# equivalent with_kkcc variable.
if test "${enable_kkcc+set}" = set; then
- echo kkcc Setting with to "$enable_kkcc"
with_kkcc="$enable_kkcc"
fi;
# Check whether --with-kkcc or --without-kkcc was given.
＠＠ -2796,13 +2672,11 ＠＠ fi;
# If --with-mc-alloc or --without-mc-alloc were given then copy the value to the
# equivalent enable_mc-alloc variable.
if test "${with_mc_alloc+set}" = set; then
- echo mc-alloc Setting enable to "$with_mc_alloc"
enable_mc_alloc="$with_mc_alloc"
fi;
# If -enable-mc-alloc or --disable-mc-alloc were given then copy the value to the
# equivalent with_mc-alloc variable.
if test "${enable_mc_alloc+set}" = set; then
- echo mc-alloc Setting with to "$enable_mc_alloc"
with_mc_alloc="$enable_mc_alloc"
fi;
# Check whether --with-mc-alloc or --without-mc-alloc was given.
＠＠ -2816,13 +2690,11 ＠＠ fi;
# If --with-union-type or --without-union-type were given then copy the value to the
# equivalent enable_union-type variable.
if test "${with_union_type+set}" = set; then
- echo union-type Setting enable to "$with_union_type"
enable_union_type="$with_union_type"
fi;
# If -enable-union-type or --disable-union-type were given then copy the value to the
# equivalent with_union-type variable.
if test "${enable_union_type+set}" = set; then
- echo union-type Setting with to "$enable_union_type"
with_union_type="$enable_union_type"
fi;
# Check whether --with-union-type or --without-union-type was given.
＠＠ -2834,13 +2706,11 ＠＠ fi;
# If --with-pdump or --without-pdump were given then copy the value to the
# equivalent enable_pdump variable.
if test "${with_pdump+set}" = set; then
- echo pdump Setting enable to "$with_pdump"
enable_pdump="$with_pdump"
fi;
# If -enable-pdump or --disable-pdump were given then copy the value to the
# equivalent with_pdump variable.
if test "${enable_pdump+set}" = set; then
- echo pdump Setting with to "$enable_pdump"
with_pdump="$enable_pdump"
fi;
# Check whether --with-pdump or --without-pdump was given.
＠＠ -2852,13 +2722,11 ＠＠ fi;
# If --with-dump-in-exec or --without-dump-in-exec were given then copy the value to the
# equivalent enable_dump-in-exec variable.
if test "${with_dump_in_exec+set}" = set; then
- echo dump-in-exec Setting enable to "$with_dump_in_exec"
enable_dump_in_exec="$with_dump_in_exec"
fi;
# If -enable-dump-in-exec or --disable-dump-in-exec were given then copy the value to the
# equivalent with_dump-in-exec variable.
if test "${enable_dump_in_exec+set}" = set; then
- echo dump-in-exec Setting with to "$enable_dump_in_exec"
with_dump_in_exec="$enable_dump_in_exec"
fi;
# Check whether --with-dump-in-exec or --without-dump-in-exec was given.
＠＠ -2870,13 +2738,11 ＠＠ fi;
# If --with-debug or --without-debug were given then copy the value to the
# equivalent enable_debug variable.
if test "${with_debug+set}" = set; then
- echo debug Setting enable to "$with_debug"
enable_debug="$with_debug"
fi;
# If -enable-debug or --disable-debug were given then copy the value to the
# equivalent with_debug variable.
if test "${enable_debug+set}" = set; then
- echo debug Setting with to "$enable_debug"
with_debug="$enable_debug"
fi;
# Check whether --with-debug or --without-debug was given.
＠＠ -2888,13 +2754,11 ＠＠ fi;
# If --with-assertions or --without-assertions were given then copy the value to the
# equivalent enable_assertions variable.
if test "${with_assertions+set}" = set; then
- echo assertions Setting enable to "$with_assertions"
enable_assertions="$with_assertions"
fi;
# If -enable-assertions or --disable-assertions were given then copy the value to the
# equivalent with_assertions variable.
if test "${enable_assertions+set}" = set; then
- echo assertions Setting with to "$enable_assertions"
with_assertions="$enable_assertions"
fi;
# Check whether --with-assertions or --without-assertions was given.
＠＠ -2906,13 +2770,11 ＠＠ fi;
# If --with-memory-usage-stats or --without-memory-usage-stats were given then copy the value to the
# equivalent enable_memory-usage-stats variable.
if test "${with_memory_usage_stats+set}" = set; then
- echo memory-usage-stats Setting enable to "$with_memory_usage_stats"
enable_memory_usage_stats="$with_memory_usage_stats"
fi;
# If -enable-memory-usage-stats or --disable-memory-usage-stats were given then copy the value to the
# equivalent with_memory-usage-stats variable.
if test "${enable_memory_usage_stats+set}" = set; then
- echo memory-usage-stats Setting with to "$enable_memory_usage_stats"
with_memory_usage_stats="$enable_memory_usage_stats"
fi;
# Check whether --with-memory-usage-stats or --without-memory-usage-stats was given.
＠＠ -2924,13 +2786,11 ＠＠ fi;
# If --with-clash-detection or --without-clash-detection were given then copy the value to the
# equivalent enable_clash-detection variable.
if test "${with_clash_detection+set}" = set; then
- echo clash-detection Setting enable to "$with_clash_detection"
enable_clash_detection="$with_clash_detection"
fi;
# If -enable-clash-detection or --disable-clash-detection were given then copy the value to the
# equivalent with_clash-detection variable.
if test "${enable_clash_detection+set}" = set; then
- echo clash-detection Setting with to "$enable_clash_detection"
with_clash_detection="$enable_clash_detection"
fi;
# Check whether --with-clash-detection or --without-clash-detection was given.
＠＠ -2942,13 +2802,11 ＠＠ fi;
# If --with-modules or --without-modules were given then copy the value to the
# equivalent enable_modules variable.
if test "${with_modules+set}" = set; then
- echo modules Setting enable to "$with_modules"
enable_modules="$with_modules"
fi;
# If -enable-modules or --disable-modules were given then copy the value to the
# equivalent with_modules variable.
if test "${enable_modules+set}" = set; then
- echo modules Setting with to "$enable_modules"
with_modules="$enable_modules"
fi;
# Check whether --with-modules or --without-modules was given.
＠＠ -2960,13 +2818,11 ＠＠ fi;
# If --with-quick-build or --without-quick-build were given then copy the value to the
# equivalent enable_quick-build variable.
if test "${with_quick_build+set}" = set; then
- echo quick-build Setting enable to "$with_quick_build"
enable_quick_build="$with_quick_build"
fi;
# If -enable-quick-build or --disable-quick-build were given then copy the value to the
# equivalent with_quick-build variable.
if test "${enable_quick_build+set}" = set; then
- echo quick-build Setting with to "$enable_quick_build"
with_quick_build="$enable_quick_build"
fi;
# Check whether --with-quick-build or --without-quick-build was given.
＠＠ -2979,13 +2835,11 ＠＠ fi;
# If --with-compiler or --without-compiler were given then copy the value to the
# equivalent enable_compiler variable.
if test "${with_compiler+set}" = set; then
- echo compiler Setting enable to "$with_compiler"
enable_compiler="$with_compiler"
fi;
# If -enable-compiler or --disable-compiler were given then copy the value to the
# equivalent with_compiler variable.
if test "${enable_compiler+set}" = set; then
- echo compiler Setting with to "$enable_compiler"
with_compiler="$enable_compiler"
fi;
# Check whether --with-compiler or --without-compiler was given.
＠＠ -2998,13 +2852,11 ＠＠ fi;
# If --with-xemacs-compiler or --without-xemacs-compiler were given then copy the value to the
# equivalent enable_xemacs-compiler variable.
if test "${with_xemacs_compiler+set}" = set; then
- echo xemacs-compiler Setting enable to "$with_xemacs_compiler"
enable_xemacs_compiler="$with_xemacs_compiler"
fi;
# If -enable-xemacs-compiler or --disable-xemacs-compiler were given then copy the value to the
# equivalent with_xemacs-compiler variable.
if test "${enable_xemacs_compiler+set}" = set; then
- echo xemacs-compiler Setting with to "$enable_xemacs_compiler"
with_xemacs_compiler="$enable_xemacs_compiler"
fi;
# Check whether --with-xemacs-compiler or --without-xemacs-compiler was given.
＠＠ -3017,13 +2869,11 ＠＠ fi;
# If --with-cflags or --without-cflags were given then copy the value to the
# equivalent enable_cflags variable.
if test "${with_cflags+set}" = set; then
- echo cflags Setting enable to "$with_cflags"
enable_cflags="$with_cflags"
fi;
# If -enable-cflags or --disable-cflags were given then copy the value to the
# equivalent with_cflags variable.
if test "${enable_cflags+set}" = set; then
- echo cflags Setting with to "$enable_cflags"
with_cflags="$enable_cflags"
fi;
# Check whether --with-cflags or --without-cflags was given.
＠＠ -3036,13 +2886,11 ＠＠ fi;
# If --with-cflags-warning or --without-cflags-warning were given then copy the value to the
# equivalent enable_cflags-warning variable.
if test "${with_cflags_warning+set}" = set; then
- echo cflags-warning Setting enable to "$with_cflags_warning"
enable_cflags_warning="$with_cflags_warning"
fi;
# If -enable-cflags-warning or --disable-cflags-warning were given then copy the value to the
# equivalent with_cflags-warning variable.
if test "${enable_cflags_warning+set}" = set; then
- echo cflags-warning Setting with to "$enable_cflags_warning"
with_cflags_warning="$enable_cflags_warning"
fi;
# Check whether --with-cflags-warning or --without-cflags-warning was given.
＠＠ -3055,13 +2903,11 ＠＠ fi;
# If --with-cflags-optimization or --without-cflags-optimization were given then copy the value to the
# equivalent enable_cflags-optimization variable.
if test "${with_cflags_optimization+set}" = set; then
- echo cflags-optimization Setting enable to "$with_cflags_optimization"
enable_cflags_optimization="$with_cflags_optimization"
fi;
# If -enable-cflags-optimization or --disable-cflags-optimization were given then copy the value to the
# equivalent with_cflags-optimization variable.
if test "${enable_cflags_optimization+set}" = set; then
- echo cflags-optimization Setting with to "$enable_cflags_optimization"
with_cflags_optimization="$enable_cflags_optimization"
fi;
# Check whether --with-cflags-optimization or --without-cflags-optimization was given.
＠＠ -3074,13 +2920,11 ＠＠ fi;
# If --with-cflags-debugging or --without-cflags-debugging were given then copy the value to the
# equivalent enable_cflags-debugging variable.
if test "${with_cflags_debugging+set}" = set; then
- echo cflags-debugging Setting enable to "$with_cflags_debugging"
enable_cflags_debugging="$with_cflags_debugging"
fi;
# If -enable-cflags-debugging or --disable-cflags-debugging were given then copy the value to the
# equivalent with_cflags-debugging variable.
if test "${enable_cflags_debugging+set}" = set; then
- echo cflags-debugging Setting with to "$enable_cflags_debugging"
with_cflags_debugging="$enable_cflags_debugging"
fi;
# Check whether --with-cflags-debugging or --without-cflags-debugging was given.
＠＠ -3093,13 +2937,11 ＠＠ fi;
# If --with-cpp or --without-cpp were given then copy the value to the
# equivalent enable_cpp variable.
if test "${with_cpp+set}" = set; then
- echo cpp Setting enable to "$with_cpp"
enable_cpp="$with_cpp"
fi;
# If -enable-cpp or --disable-cpp were given then copy the value to the
# equivalent with_cpp variable.
if test "${enable_cpp+set}" = set; then
- echo cpp Setting with to "$enable_cpp"
with_cpp="$enable_cpp"
fi;
# Check whether --with-cpp or --without-cpp was given.
＠＠ -3112,13 +2954,11 ＠＠ fi;
# If --with-cppflags or --without-cppflags were given then copy the value to the
# equivalent enable_cppflags variable.
if test "${with_cppflags+set}" = set; then
- echo cppflags Setting enable to "$with_cppflags"
enable_cppflags="$with_cppflags"
fi;
# If -enable-cppflags or --disable-cppflags were given then copy the value to the
# equivalent with_cppflags variable.
if test "${enable_cppflags+set}" = set; then
- echo cppflags Setting with to "$enable_cppflags"
with_cppflags="$enable_cppflags"
fi;
# Check whether --with-cppflags or --without-cppflags was given.
＠＠ -3131,13 +2971,11 ＠＠ fi;
# If --with-libs or --without-libs were given then copy the value to the
# equivalent enable_libs variable.
if test "${with_libs+set}" = set; then
- echo libs Setting enable to "$with_libs"
enable_libs="$with_libs"
fi;
# If -enable-libs or --disable-libs were given then copy the value to the
# equivalent with_libs variable.
if test "${enable_libs+set}" = set; then
- echo libs Setting with to "$enable_libs"
with_libs="$enable_libs"
fi;
# Check whether --with-libs or --without-libs was given.
＠＠ -3150,13 +2988,11 ＠＠ fi;
# If --with-ldflags or --without-ldflags were given then copy the value to the
# equivalent enable_ldflags variable.
if test "${with_ldflags+set}" = set; then
- echo ldflags Setting enable to "$with_ldflags"
enable_ldflags="$with_ldflags"
fi;
# If -enable-ldflags or --disable-ldflags were given then copy the value to the
# equivalent with_ldflags variable.
if test "${enable_ldflags+set}" = set; then
- echo ldflags Setting with to "$enable_ldflags"
with_ldflags="$enable_ldflags"
fi;
# Check whether --with-ldflags or --without-ldflags was given.
＠＠ -3169,13 +3005,11 ＠＠ fi;
# If --with-rel-alloc or --without-rel-alloc were given then copy the value to the
# equivalent enable_rel-alloc variable.
if test "${with_rel_alloc+set}" = set; then
- echo rel-alloc Setting enable to "$with_rel_alloc"
enable_rel_alloc="$with_rel_alloc"
fi;
# If -enable-rel-alloc or --disable-rel-alloc were given then copy the value to the
# equivalent with_rel-alloc variable.
if test "${enable_rel_alloc+set}" = set; then
- echo rel-alloc Setting with to "$enable_rel_alloc"
with_rel_alloc="$enable_rel_alloc"
fi;
# Check whether --with-rel-alloc or --without-rel-alloc was given.
＠＠ -3190,13 +3024,11 ＠＠ fi;
# If --with-dlmalloc or --without-dlmalloc were given then copy the value to the
# equivalent enable_dlmalloc variable.
if test "${with_dlmalloc+set}" = set; then
- echo dlmalloc Setting enable to "$with_dlmalloc"
enable_dlmalloc="$with_dlmalloc"
fi;
# If -enable-dlmalloc or --disable-dlmalloc were given then copy the value to the
# equivalent with_dlmalloc variable.
if test "${enable_dlmalloc+set}" = set; then
- echo dlmalloc Setting with to "$enable_dlmalloc"
with_dlmalloc="$enable_dlmalloc"
fi;
# Check whether --with-dlmalloc or --without-dlmalloc was given.
＠＠ -3211,13 +3043,11 ＠＠ fi;
# If --with-debug-malloc or --without-debug-malloc were given then copy the value to the
# equivalent enable_debug-malloc variable.
if test "${with_debug_malloc+set}" = set; then
- echo debug-malloc Setting enable to "$with_debug_malloc"
enable_debug_malloc="$with_debug_malloc"
fi;
# If -enable-debug-malloc or --disable-debug-malloc were given then copy the value to the
# equivalent with_debug-malloc variable.
if test "${enable_debug_malloc+set}" = set; then
- echo debug-malloc Setting with to "$enable_debug_malloc"
with_debug_malloc="$enable_debug_malloc"
fi;
# Check whether --with-debug-malloc or --without-debug-malloc was given.
＠＠ -3230,13 +3060,11 ＠＠ fi;
# If --with-system-malloc or --without-system-malloc were given then copy the value to the
# equivalent enable_system-malloc variable.
if test "${with_system_malloc+set}" = set; then
- echo system-malloc Setting enable to "$with_system_malloc"
enable_system_malloc="$with_system_malloc"
fi;
# If -enable-system-malloc or --disable-system-malloc were given then copy the value to the
# equivalent with_system-malloc variable.
if test "${enable_system_malloc+set}" = set; then
- echo system-malloc Setting with to "$enable_system_malloc"
with_system_malloc="$enable_system_malloc"
fi;
# Check whether --with-system-malloc or --without-system-malloc was given.
＠＠ -3266,13 +3094,11 ＠＠ _database_default="berkdb,dbm,gdbm"
# If --with-database or --without-database were given then copy the value to the
# equivalent enable_database variable.
if test "${with_database+set}" = set; then
- echo database Setting enable to "$with_database"
enable_database="$with_database"
fi;
# If -enable-database or --disable-database were given then copy the value to the
# equivalent with_database variable.
if test "${enable_database+set}" = set; then
- echo database Setting with to "$enable_database"
with_database="$enable_database"
fi;
# Check whether --with-database or --without-database was given.
＠＠ -3311,7 +3137,8 ＠＠ Hardcoded default is: $_database_default
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
elif test -n "$_database_all_default" ; then
for y in $_database_types; do
- eval "database_$y=$_database_all_default"
+ eval "with_database_$y=$_database_all_default"
+ eval "enable_database_$y=$_database_all_default"
done
fi
_database_notfirst=yes
＠＠ -3346,13 +3173,11 ＠＠ _sound_default="native,nas,noesd"
# If --with-sound or --without-sound were given then copy the value to the
# equivalent enable_sound variable.
if test "${with_sound+set}" = set; then
- echo sound Setting enable to "$with_sound"
enable_sound="$with_sound"
fi;
# If -enable-sound or --disable-sound were given then copy the value to the
# equivalent with_sound variable.
if test "${enable_sound+set}" = set; then
- echo sound Setting with to "$enable_sound"
with_sound="$enable_sound"
fi;
# Check whether --with-sound or --without-sound was given.
＠＠ -3391,7 +3216,8 ＠＠ Hardcoded default is: $_sound_default."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
elif test -n "$_sound_all_default" ; then
for y in $_sound_types; do
- eval "sound_$y=$_sound_all_default"
+ eval "with_sound_$y=$_sound_all_default"
+ eval "enable_sound_$y=$_sound_all_default"
done
fi
_sound_notfirst=yes
＠＠ -3409,13 +3235,11 ＠＠ fi;
# If --with-athena or --without-athena were given then copy the value to the
# equivalent enable_athena variable.
if test "${with_athena+set}" = set; then
- echo athena Setting enable to "$with_athena"
enable_athena="$with_athena"
fi;
# If -enable-athena or --disable-athena were given then copy the value to the
# equivalent with_athena variable.
if test "${enable_athena+set}" = set; then
- echo athena Setting with to "$enable_athena"
with_athena="$enable_athena"
fi;
# Check whether --with-athena or --without-athena was given.
＠＠ -3442,13 +3266,11 ＠＠ fi;
# If --with-xim or --without-xim were given then copy the value to the
# equivalent enable_xim variable.
if test "${with_xim+set}" = set; then
- echo xim Setting enable to "$with_xim"
enable_xim="$with_xim"
fi;
# If -enable-xim or --disable-xim were given then copy the value to the
# equivalent with_xim variable.
if test "${enable_xim+set}" = set; then
- echo xim Setting with to "$enable_xim"
with_xim="$enable_xim"
fi;
# Check whether --with-xim or --without-xim was given.
＠＠ -3475,13 +3297,11 ＠＠ fi;
# If --with-mail-locking or --without-mail-locking were given then copy the value to the
# equivalent enable_mail-locking variable.
if test "${with_mail_locking+set}" = set; then
- echo mail-locking Setting enable to "$with_mail_locking"
enable_mail_locking="$with_mail_locking"
fi;
# If -enable-mail-locking or --disable-mail-locking were given then copy the value to the
# equivalent with_mail-locking variable.
if test "${enable_mail_locking+set}" = set; then
- echo mail-locking Setting with to "$enable_mail_locking"
with_mail_locking="$enable_mail_locking"
fi;
# Check whether --with-mail-locking or --without-mail-locking was given.
＠＠ -3509,13 +3329,11 ＠＠ fi;
# If --with-bignum or --without-bignum were given then copy the value to the
# equivalent enable_bignum variable.
if test "${with_bignum+set}" = set; then
- echo bignum Setting enable to "$with_bignum"
enable_bignum="$with_bignum"
fi;
# If -enable-bignum or --disable-bignum were given then copy the value to the
# equivalent with_bignum variable.
if test "${enable_bignum+set}" = set; then
- echo bignum Setting with to "$enable_bignum"
with_bignum="$enable_bignum"
fi;
# Check whether --with-bignum or --without-bignum was given.
＠＠ -3569,13 +3387,11 ＠＠ _error_checking_default="extents,types,t
# If --with-error-checking or --without-error-checking were given then copy the value to the
# equivalent enable_error-checking variable.
if test "${with_error_checking+set}" = set; then
- echo error-checking Setting enable to "$with_error_checking"
enable_error_checking="$with_error_checking"
fi;
# If -enable-error-checking or --disable-error-checking were given then copy the value to the
# equivalent with_error-checking variable.
if test "${enable_error_checking+set}" = set; then
- echo error-checking Setting with to "$enable_error_checking"
with_error_checking="$enable_error_checking"
fi;
# Check whether --with-error-checking or --without-error-checking was given.
＠＠ -3614,7 +3430,8 ＠＠ Hardcoded default is: $_error_checking_d
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
elif test -n "$_error_checking_all_default" ; then
for y in $_error_checking_types; do
- eval "error_checking_$y=$_error_checking_all_default"
+ eval "with_error_checking_$y=$_error_checking_all_default"
+ eval "enable_error_checking_$y=$_error_checking_all_default"
done
fi
_error_checking_notfirst=yes
＠＠ -3630,13 +3447,11 ＠＠ fi;
# If --with-menubars or --without-menubars were given then copy the value to the
# equivalent enable_menubars variable.
if test "${with_menubars+set}" = set; then
- echo menubars Setting enable to "$with_menubars"
enable_menubars="$with_menubars"
fi;
# If -enable-menubars or --disable-menubars were given then copy the value to the
# equivalent with_menubars variable.
if test "${enable_menubars+set}" = set; then
- echo menubars Setting with to "$enable_menubars"
with_menubars="$enable_menubars"
fi;
# Check whether --with-menubars or --without-menubars was given.
＠＠ -3664,13 +3479,11 ＠＠ fi;
# If --with-scrollbars or --without-scrollbars were given then copy the value to the
# equivalent enable_scrollbars variable.
if test "${with_scrollbars+set}" = set; then
- echo scrollbars Setting enable to "$with_scrollbars"
enable_scrollbars="$with_scrollbars"
fi;
# If -enable-scrollbars or --disable-scrollbars were given then copy the value to the
# equivalent with_scrollbars variable.
if test "${enable_scrollbars+set}" = set; then
- echo scrollbars Setting with to "$enable_scrollbars"
with_scrollbars="$enable_scrollbars"
fi;
# Check whether --with-scrollbars or --without-scrollbars was given.
＠＠ -3698,13 +3511,11 ＠＠ fi;
# If --with-dialogs or --without-dialogs were given then copy the value to the
# equivalent enable_dialogs variable.
if test "${with_dialogs+set}" = set; then
- echo dialogs Setting enable to "$with_dialogs"
enable_dialogs="$with_dialogs"
fi;
# If -enable-dialogs or --disable-dialogs were given then copy the value to the
# equivalent with_dialogs variable.
if test "${enable_dialogs+set}" = set; then
- echo dialogs Setting with to "$enable_dialogs"
with_dialogs="$enable_dialogs"
fi;
# Check whether --with-dialogs or --without-dialogs was given.
＠＠ -3732,13 +3543,11 ＠＠ fi;
# If --with-widgets or --without-widgets were given then copy the value to the
# equivalent enable_widgets variable.
if test "${with_widgets+set}" = set; then
- echo widgets Setting enable to "$with_widgets"
enable_widgets="$with_widgets"
fi;
# If -enable-widgets or --disable-widgets were given then copy the value to the
# equivalent with_widgets variable.
if test "${enable_widgets+set}" = set; then
- echo widgets Setting with to "$enable_widgets"
with_widgets="$enable_widgets"
fi;
# Check whether --with-widgets or --without-widgets was given.
＠＠ -9585,7 +9394,7 ＠＠ xe_runpath_dir=`echo '' "$arg" | sed -e
eval "$xe_add_unique_runpath_dir"
};; esac
done
- if test "$opsys $need_motif" = "sol2 yes"; then
+ if test "$opsys $need_motif" = "sol2 yes"; then
xe_runpath_dir="/opt/SUNWdt/lib";
eval "$xe_add_unique_runpath_dir";
fi
＠＠ -17801,7 +17610,7 ＠＠ xe_runpath_dir=`echo '' "$arg" | sed -e
eval "$xe_add_unique_runpath_dir"
};; esac
done
- if test "$opsys $need_motif" = "sol2 yes"; then
+ if test "$opsys $need_motif" = "sol2 yes"; then
xe_runpath_dir="/opt/SUNWdt/lib";
eval "$xe_add_unique_runpath_dir";
fi
＠＠ -24322,10 +24131,14 ＠＠ echo "$as_me: checking for X11 graphics
fi
case "$enable_widgets" in
- "yes" | "athena") detect_athena=yes ;;
+ "" | "yes" | "athena") detect_athena=yes ;;
*) detect_athena=no ;;
esac
+case "$enable_dialogs" in
+ "" | "yes" | "athena") detect_athena=yes ;;
+esac
+
if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
{ echo "$as_me:$LINENO: checking for the Athena widgets..." >&5
echo "$as_me: checking for the Athena widgets..." >&6;}
＠＠ -26061,24 +25874,45 ＠＠ echo "${ECHO_T}$have_lesstif" >&6
fi
+case "$opsys" in
+ *linux* | *darwin* | *bsd* ) lucid_prefers_motif="no" ;;
+ * ) lucid_prefers_motif="yes" ;;
+esac
+
case "$enable_menubars" in "" | "yes" | "athena" )
enable_menubars="lucid" ;;
esac
case "$enable_dialogs" in "" | "yes" | "lucid" )
- if test "$have_motif" = "yes"; then enable_dialogs="motif"
- elif test "$have_xaw" = "yes"; then enable_dialogs="athena"
- elif test "$with_msw" = "yes"; then enable_dialogs="msw"
- else enable_dialogs=no
+ if test "$lucid_prefers_motif" = "yes"; then
+ if test "$have_motif" = "yes"; then enable_dialogs="motif"
+ elif test "$have_xaw" = "yes"; then enable_dialogs="athena"
+ elif test "$with_msw" = "yes"; then enable_dialogs="msw"
+ else enable_dialogs=no
+ fi
+ else
+ if test "$have_xaw" = "yes"; then enable_dialogs="athena"
+ elif test "$have_motif" = "yes"; then enable_dialogs="motif"
+ elif test "$with_msw" = "yes"; then enable_dialogs="msw"
+ else enable_dialogs=no
+ fi
fi ;;
esac
case "$enable_scrollbars" in "" | "yes" )
enable_scrollbars="lucid" ;;
esac
case "$enable_widgets" in "" | "yes" | "lucid")
- if test "$have_motif" = "yes"; then enable_widgets="motif"
- elif test "$have_xaw" = "yes"; then enable_widgets="athena"
- elif test "$with_msw" = "yes"; then enable_widgets="msw"
- else enable_widgets=no
+ if test "$lucid_prefers_motif" = "yes"; then
+ if test "$have_motif" = "yes"; then enable_widgets="motif"
+ elif test "$have_xaw" = "yes"; then enable_widgets="athena"
+ elif test "$with_msw" = "yes"; then enable_widgets="msw"
+ else enable_widgets=no
+ fi
+ else
+ if test "$have_xaw" = "yes"; then enable_widgets="athena"
+ elif test "$have_motif" = "yes"; then enable_widgets="motif"
+ elif test "$with_msw" = "yes"; then enable_widgets="msw"
+ else enable_widgets=no
+ fi
fi ;;
esac
＠＠ -26584,7 +26418,7 ＠＠ else
with_xim=no
fi
- if test "$have_motif $have_lesstif" = "yes no"; then
+ if test "$need_motif $have_lesstif" = "yes no"; then
echo "$as_me:$LINENO: checking for XmImMbLookupString in -lXm" >&5
echo $ECHO_N "checking for XmImMbLookupString in -lXm... $ECHO_C" >&6
if test "${ac_cv_lib_Xm_XmImMbLookupString+set}" = set; then
＠＠ -26653,6 +26487,75 ＠＠ if test $ac_cv_lib_Xm_XmImMbLookupString
with_xim=motif
fi
+ elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then
+ echo "$as_me:$LINENO: checking for XmImMbLookupString in -lXm" >&5
+echo $ECHO_N "checking for XmImMbLookupString in -lXm... $ECHO_C" >&6
+if test "${ac_cv_lib_Xm_XmImMbLookupString+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXm $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char XmImMbLookupString ();
+int
+main ()
+{
+XmImMbLookupString ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_Xm_XmImMbLookupString=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xm_XmImMbLookupString=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xm_XmImMbLookupString" >&5
+echo "${ECHO_T}$ac_cv_lib_Xm_XmImMbLookupString" >&6
+if test $ac_cv_lib_Xm_XmImMbLookupString = yes; then
+ with_xim=motif
+fi
+
fi ;;
esac
if test "$with_xim" != "no"; then
＠＠ -28311,7 +28214,7 ＠＠ xe_runpath_dir=`echo '' "$arg" | sed -e
eval "$xe_add_unique_runpath_dir"
};; esac
done
- if test "$opsys $need_motif" = "sol2 yes"; then
+ if test "$opsys $need_motif" = "sol2 yes"; then
xe_runpath_dir="/opt/SUNWdt/lib";
eval "$xe_add_unique_runpath_dir";
fi
＠＠ -37582,6 +37485,16 ＠＠ if test "$with_x11" = "yes"; then
if test "$with_wmcommand" != no; then
echo " - Handling WM_COMMAND properly."
fi
+fi
+if test "$need_motif" = "yes" ; then
+ echo " Compiling in support for Motif."
+ if test "$have_lesstif" = "yes"; then
+ echo " - Using LessTif implementation."
+ fi
+ echo " *WARNING* Many versions of Motif are buggy, requiring workarounds."
+ echo " You are likely to experience slow redisplay."
+ echo " You may need to install vendor patches to Motif."
+ echo " See PROBLEMS for more information."
fi
if test "$need_athena" = "yes"; then
echo " Compiling in support for the Athena widget set:"
1.17 +52 -17 XEmacs/xemacs/configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- configure.ac 2005/10/20 12:37:49 1.16
+++ configure.ac 2005/10/24 21:01:08 1.17
＠＠ -208,6 +208,7 ＠＠ if test "$add_runtime_path" = "yes" -a -
case "$arg" in -L*) XE_ADD_RUNPATH_DIR(`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`);; esac
done
dnl Sometimes /opt/SUNWdt/lib is the only installed Motif available
+ dnl #### this test always fails here as need_motif is null
if test "$opsys $need_motif" = "sol2 yes"; then
xe_runpath_dir="/opt/SUNWdt/lib";
eval "$xe_add_unique_runpath_dir";
＠＠ -249,13 +250,11 ＠＠ m4_divert_once([HELP_ENABLE], m4_bpatsub
# If --with-$1 or --without-$1 were given then copy the value to the
# equivalent enable_$1 variable.
if test "[${with_]m4_bpatsubst([$1], -, _)+set}" = set; then
- echo $1 Setting enable to "[$with_]m4_bpatsubst([$1], -, _)"
[enable_]m4_bpatsubst([$1], -, _)="[$with_]m4_bpatsubst([$1], -, _)"
fi;
# If -enable-$1 or --disable-$1 were given then copy the value to the
# equivalent with_$1 variable.
if test "[${enable_]m4_bpatsubst([$1], -, _)+set}" = set; then
- echo $1 Setting with to "[$enable_]m4_bpatsubst([$1], -, _)"
[with_]m4_bpatsubst([$1], -, _)="[$enable_]m4_bpatsubst([$1], -, _)"
fi;
# Check whether --with-$1 or --without-$1 was given.
＠＠ -428,7 +427,8 ＠＠ Defaults may be overridden with \`all' o
Hardcoded default is: $_[$1]_default."])
elif test -n "$_[$1]_all_default" ; then
for y in $_[$1]_types; do
- eval "[$1]_$y=$_[$1]_all_default"
+ eval "with_[$1]_$y=$_[$1]_all_default"
+ eval "enable_[$1]_$y=$_[$1]_all_default"
done
fi
_[$1]_notfirst=yes
＠＠ -3925,14 +3925,15 ＠＠ if test "$with_x11" = "yes"; then
AC_CHECKING([for X11 graphics libraries])
fi
-dnl We don't automatically trigger widgets if athena is present
-dnl because of stability concerns.
-dnl But if the user wants widgets, still offer him autodetections
case "$enable_widgets" in
- "yes" | "athena") detect_athena=yes ;;
+ "" | "yes" | "athena") detect_athena=yes ;;
*) detect_athena=no ;;
esac
+case "$enable_dialogs" in
+ "" | "yes" | "athena") detect_athena=yes ;;
+esac
+
if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
AC_CHECKING([for the Athena widgets])
＠＠ -4085,26 +4086,47 ＠＠ fi dnl "$with_x11" = "yes"
dnl Finish ensuring that we have values for the various toolkit items.
dnl Not all toolkits support all widgets
-dnl if Motif is available we use it for the dialog boxes.
+dnl Avoid using Motif :-(
+case "$opsys" in
+ *linux* | *darwin* | *bsd* ) lucid_prefers_motif="no" ;;
+ * ) lucid_prefers_motif="yes" ;;
+esac
+
case "$enable_menubars" in "" | "yes" | "athena" )
enable_menubars="lucid" ;;
esac
case "$enable_dialogs" in "" | "yes" | "lucid" )
- if test "$have_motif" = "yes"; then enable_dialogs="motif"
- elif test "$have_xaw" = "yes"; then enable_dialogs="athena"
- elif test "$with_msw" = "yes"; then enable_dialogs="msw"
- else enable_dialogs=no
+ if test "$lucid_prefers_motif" = "yes"; then
+ if test "$have_motif" = "yes"; then enable_dialogs="motif"
+ elif test "$have_xaw" = "yes"; then enable_dialogs="athena"
+ elif test "$with_msw" = "yes"; then enable_dialogs="msw"
+ else enable_dialogs=no
+ fi
+ else
+ if test "$have_xaw" = "yes"; then enable_dialogs="athena"
+ elif test "$have_motif" = "yes"; then enable_dialogs="motif"
+ elif test "$with_msw" = "yes"; then enable_dialogs="msw"
+ else enable_dialogs=no
+ fi
fi ;;
esac
case "$enable_scrollbars" in "" | "yes" )
enable_scrollbars="lucid" ;;
esac
case "$enable_widgets" in "" | "yes" | "lucid")
- if test "$have_motif" = "yes"; then enable_widgets="motif"
- elif test "$have_xaw" = "yes"; then enable_widgets="athena"
- elif test "$with_msw" = "yes"; then enable_widgets="msw"
- else enable_widgets=no
+ if test "$lucid_prefers_motif" = "yes"; then
+ if test "$have_motif" = "yes"; then enable_widgets="motif"
+ elif test "$have_xaw" = "yes"; then enable_widgets="athena"
+ elif test "$with_msw" = "yes"; then enable_widgets="msw"
+ else enable_widgets=no
+ fi
+ else
+ if test "$have_xaw" = "yes"; then enable_widgets="athena"
+ elif test "$have_motif" = "yes"; then enable_widgets="motif"
+ elif test "$with_msw" = "yes"; then enable_widgets="msw"
+ else enable_widgets=no
+ fi
fi ;;
esac
＠＠ -4232,8 +4254,11 ＠＠ if test "$enable_mule" = "yes" ; then
AC_CHECKING([for XIM])
AC_CHECK_LIB(X11, XOpenIM, with_xim=xlib, with_xim=no)
dnl XIM + Lesstif is not (yet?) usable
- if test "$have_motif $have_lesstif" = "yes no"; then
+ dnl Only use Motif if linking Motif anyway, or don't have xlib XIM
+ if test "$need_motif $have_lesstif" = "yes no"; then
AC_CHECK_LIB(Xm, XmImMbLookupString, with_xim=motif)
+ elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then
+ AC_CHECK_LIB(Xm, XmImMbLookupString, with_xim=motif)
fi ;;
esac
if test "$with_xim" != "no"; then
＠＠ -5621,6 +5646,16 ＠＠ if test "$with_x11" = "yes"; then
if test "$with_wmcommand" != no; then
echo " - Handling WM_COMMAND properly."
fi
+fi
+if test "$need_motif" = "yes" ; then
+ echo " Compiling in support for Motif."
+ if test "$have_lesstif" = "yes"; then
+ echo " - Using LessTif implementation."
+ fi
+ echo " *WARNING* Many versions of Motif are buggy, requiring workarounds."
+ echo " You are likely to experience slow redisplay."
+ echo " You may need to install vendor patches to Motif."
+ echo " See PROBLEMS for more information."
fi
if test "$need_athena" = "yes"; then
echo " Compiling in support for the Athena widget set:"
- 1 participants
- 0 comments
CVS update by malcolmp xemacs/man ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: malcolmp
Date: 05/10/24 22:39:50
Modified: xemacs/man ChangeLog xemacs-faq.texi
Log:
Reflect changes in configure options in INSTALL and the FAQ.
Revision Changes Path
1.463 +6 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -p -r1.462 -r1.463
--- ChangeLog 2005/10/20 12:37:42 1.462
+++ ChangeLog 2005/10/24 20:39:38 1.463
＠＠ -1,3 +1,9 ＠＠
+2005-10-20 Malcolm Purvis <malcolmp(a)xemacs.org>
+
+ * INSTALL: Reflect changes in the configure options. Update MacOS
+ X X11 installation instructions to reflect the changes in recent
+ OS releases.
+
2005-10-15 Malcolm Purvis <malcolmp(a)xemacs.org>
* configure.ac: Added XE_MERGED_ARG to alias all local --enable
1.44 +17 -10 XEmacs/xemacs/INSTALL
Index: INSTALL
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/INSTALL,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- INSTALL 2005/03/10 11:49:00 1.43
+++ INSTALL 2005/10/24 20:39:38 1.44
＠＠ -74,16 +74,17 ＠＠ ADD-ON LIBRARIES
Decide which libraries you would like to use with XEmacs, but are not
yet available on your system. On some systems, X11, Motif and CDE are
-optional additions. On MacOS/X systems, you may download X11R6 for
-Mac OS X from http://www.apple.com/macosx/x11/download/. You need
-both the runtime libraries and the SDK (in a sidebar of that page at
-the time of writing). There is also a 3rd-party implementation of
-X11R6 for the Mac at http://www.xdarwin.org/. On Solaris, the
-SUNWaudmo package enables native sound support. There are also a
-number of free software applications that XEmacs can use. If these
-are not yet available on your system, obtain, build and install those
-external libraries before building XEmacs. The libraries XEmacs can
-use are:
+optional additions. On MacOS/X systems prior to 10.2, you may download
+X11R6 for Mac OS X from http://www.apple.com/macosx/x11/download/. In
+later releases X11 is available as an optional package on the
+installation CDs. In either case you need both the runtime libraries
+and the SDK (in a sidebar of that page at the time of writing). There
+is also a 3rd-party implementation of X11R6 for the Mac at
+http://www.xdarwin.org/. On Solaris, the SUNWaudmo package enables
+native sound support. There are also a number of free software
+applications that XEmacs can use. If these are not yet available on
+your system, obtain, build and install those external libraries before
+building XEmacs. The libraries XEmacs can use are:
Xaw3d, XPM, JPEG, compface, PNG, zlib, GNU DBM, Berkeley DB, socks,
term, NAS, Canna, Kinput2, SJ3, Wnn, PostgreSQL, LDAP.
＠＠ -137,6 +138,12 ＠＠ In the top level directory of the XEmacs
program `configure' as follows:
./configure [CONFIGURATION-NAME] [--OPTION[=VALUE]] ...
+
+Options are generally of the form `--with-FEATURE' or
+`--enable-FEATURE' to use a feature or `--without-FEATURE' or
+`--disable-FEATURE' to not use a feature. Unlike the `configure'
+program used in other applications, either `--with-FEATURE' or
+`--enable-FEATURE' can be used to use the same feature.
Controlling the Host Type
-------------------------
1.318 +16 -0 XEmacs/xemacs/man/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- ChangeLog 2005/10/20 12:38:02 1.317
+++ ChangeLog 2005/10/24 20:39:47 1.318
＠＠ -1,3 +1,19 ＠＠
+2005-10-20 Malcolm Purvis <malcolmp(a)xemacs.org>
+
+ * xemacs-faq.texi (Q1.2.2):
+ * xemacs-faq.texi (Q2.1.1):
+ * xemacs-faq.texi (Q2.1.6):
+ * xemacs-faq.texi (Q2.2.1):
+ * xemacs-faq.texi (Q2.3.6):
+ * xemacs-faq.texi (Q2.4.3):
+ * xemacs-faq.texi (Q2.4.4):
+ * xemacs-faq.texi (Q2.4.7):
+ * xemacs-faq.texi (Q5.3.3):
+ * xemacs-faq.texi (Q6.0.8):
+ * xemacs-faq.texi (Q7.2.1):
+ Add 21.5 specific examples of configure options in addition to the
+ existing 21.4 ones.
+
2005-10-15 Malcolm Purvis <malcolmp(a)xemacs.org>
* internals/internals.texi: "API's" -> "APIs". This fixes
1.87 +82 -51 XEmacs/xemacs/man/xemacs-faq.texi
Index: xemacs-faq.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs-faq.texi,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- xemacs-faq.texi 2005/10/14 02:11:49 1.86
+++ xemacs-faq.texi 2005/10/24 20:39:47 1.87
＠＠ -7,7 +7,7 ＠＠
＠finalout
＠titlepage
＠title XEmacs FAQ
-＠subtitle Frequently asked questions about XEmacs ＠* Last Modified: $Date: 2005/10/14 02:11:49 $
+＠subtitle Frequently asked questions about XEmacs ＠* Last Modified: $Date: 2005/10/24 20:39:47 $
＠sp 1
＠author Ben Wing <ben＠(a)xemacs.org>
＠author Tony Rossini <rossini＠(a)u.washington.edu>
＠＠ -1103,9 +1103,10 ＠＠ sparc-sun-solaris2.7 (both Sun's Forte C
sparc-sun-sunos4.1.4 (gcc)
＠end example
-Some systems have a dual mode 32-bit/64-bit compiler. On most of
-these, XEmacs requires the ＠samp{--pdump} configure option to build
-correctly with the 64-bit version of the compiler.
+Some systems have a dual mode 32-bit/64-bit compiler. On most of these,
+XEmacs requires the ＠samp{--pdump} (in XEmacs 21.5,
+＠samp{--enable-pdump}) configure option to build correctly with the
+64-bit version of the compiler.
＠example
mips-sgi-irix6.5, CC="gcc -mabi=64"
＠＠ -3263,14 +3264,14 ＠＠ If you have GNU tar you can use:
＠code{cd $prefix/lib/xemacs ; tar zxvf <tarballname>}
-If you have the packages somewhere nonstandard and don't want to
-bother with ＠samp{$prefix} (for example, you're a developer and are
-compiling the packages yourself, and want your own private copy of
-everything), you can also directly specify this using ＠file{configure}.
-To do this under 21.5 and above use the ＠samp{--package-prefix} parameter
-to specify the directory under which you untarred the above tarballs.
-Under 21.4 and previous you need to use ＠samp{--package-path},
-something like this:
+If you have the packages somewhere nonstandard and don't want to bother
+with ＠samp{$prefix} (for example, you're a developer and are compiling
+the packages yourself, and want your own private copy of everything),
+you can also directly specify this using ＠file{configure}. To do this
+with 21.5 and above use the ＠samp{--with-package-prefix} parameter to
+specify the directory under which you untarred the above tarballs.
+Under 21.4 and previous you need to use ＠samp{--package-path}. Using
+these options looks something like this:
＠example
configure --package-path="~/.xemacs::/src/xemacs/site-packages:/src/xemacs/xemacs-packages:/src/xemacs/mule-packages" ...
＠＠ -3505,11 +3506,10 ＠＠ XEmacs in its default installation will
under ＠file{/usr/local/lib/xemacs}.
You can specify where exactly XEmacs looks for packages by using the
-＠samp{--package-prefix} or ＠samp{--package-path} parameters to
-＠file{configure} (or the equivalent settings in ＠file{config.inc},
-under Windows), or setting the ＠samp{EMACSPACKAGEPATH} environment
-variable (which has the same format as ＠samp{--package-path}).
-(a)xref{Q2.1.1}.
+＠samp{--with-package-prefix} or ＠samp{--with-package-path} parameters to
+＠file{configure} (or the equivalent settings in ＠file{config.inc}, under
+Windows), or setting the ＠samp{EMACSPACKAGEPATH} environment variable
+(which has the same format as ＠samp{--with-package-path}). ＠xref{Q2.1.1}.
See ＠file{configure.usage} for more info about the format of these
＠file{configure} parameters.
＠＠ -3545,19 +3545,40 ＠＠ needed flag with `man ftp' or other loca
＠unnumberedsubsec Q2.2.1: Libraries in non-standard locations
If your libraries are in a non-standard location, you can specify the location
-using the following flags to ＠file{configure}:
+using the following flags to ＠file{configure}. Under 21.4 or earlier:
＠example
--site-libraries=WHATEVER
--site-includes=WHATEVER
＠end example
+Under 21.5 or later:
+
+＠example
+--with-site-libraries=WHATEVER
+--with-site-includes=WHATEVER
+＠end example
+
If you have multiple paths to specify, use the following syntax:
＠example
--site-libraries='/path/one /path/two /path/etc'
＠end example
+If the libraries and headers reside in the directories ＠samp{lib} and
+＠samp{include} of a common root (say ＠samp{/sw}) then both can be
+specified with a single option:
+
+＠example
+--site-prefixes=WHATEVER
+＠end example
+
+or for 21.5:
+
+＠example
+--with-site-prefixes=WHATEVER
+＠end example
+
＠node Q2.2.2, Q2.3.1, Q2.2.1, Installation
＠unnumberedsubsec Q2.2.2: Why can't I strip XEmacs?
＠＠ -3751,8 +3772,10 ＠＠ Build ＠samp{gcc -mno-cygwin} versions of
＠item
Specify the target location of the extra libs on the command line
-to ＠file{configure}, e.g.
-(a)samp{./configure --site-prefixes=/build/libs i586-pc-mingw32}.
+to ＠file{configure}, e.g.for 21.4 or earlier
+(a)samp{./configure --site-prefixes=/build/libs i586-pc-mingw32} and for
+21.5 or later
+(a)samp{./configure --with-site-prefixes=/build/libs i586-pc-mingw32}.
＠end itemize
＠node Q2.3.7, Q2.3.8, Q2.3.6, Installation
＠＠ -3965,10 +3988,11 ＠＠ Please see the ＠file{PROBLEMS} file that
the top-level source directory) to read what it says about your
platform.
-If you compiled XEmacs using ＠samp{--use-union-type} (or the option
-＠samp{USE_UNION_TYPE} in ＠file{config.inc} under Windows), try
-recompiling again without it. The union type has been known to trigger
-compiler errors in a number of cases.
+If you compiled XEmacs 21.4 or ealier using ＠samp{--use-union-type}, or
+21.5 or later using ＠samp{--enable-union-type} (or in either case used
+the option ＠samp{USE_UNION_TYPE} in ＠file{config.inc} under Windows),
+try recompiling again without it. The union type has been known to
+trigger compiler errors in a number of cases.
＠node Q2.4.4, Q2.4.5, Q2.4.3, Installation
＠unnumberedsubsec Q2.4.4: How to debug an XEmacs problem with a debugger
＠＠ -3983,12 +4007,14 ＠＠ First of all, if the crash is at all rep
strongly recompiling your XEmacs with debugging symbols and with no
optimization (e.g. with GCC use the compiler flags ＠samp{-g -O0} --
that's an "oh" followed by a zero), and with the configure options
-＠samp{--debug=yes} and ＠samp{--error-checking=all}. This will make
-your XEmacs run somewhat slower, but you are a lot more likely to
-catch the problem earlier (closer to its source). It makes it a lot
-easier to determine what's going on with a debugger. The way to
-control the compiler flags is with the configuration option
-＠samp{--cflags}. If you have a recent version of 21.5, you should use
+＠samp{--debug=yes} and ＠samp{--error-checking=all}
+(＠samp{--enable-debug=yes} and ＠samp{--enable-error-checking=all} on
+XEmacs 21.5 or later). This will make your XEmacs run somewhat slower,
+but you are a lot more likely to catch the problem earlier (closer to
+its source). It makes it a lot easier to determine what's going on with
+a debugger. The way to control the compiler flags is with the
+configuration option ＠samp{--cflags} (＠samp{--with-cflags} in 21.5). If
+you have a recent version of 21.5, you should use
＠samp{--without-optimization} in preference to directly setting
＠samp{--cflags}.
＠＠ -4146,11 +4172,11 ＠＠ If you are using Sun's ＠file{dbx} debugg
If you're using a debugger to get a C stack backtrace and you're seeing
stack traces with some of the innermost frames mangled, it may be due to
dynamic linking. (This happens especially under Linux.) Consider
-reconfiguring with ＠samp{--dynamic=no}. Also, sometimes (again under
-Linux), stack backtraces of core dumps will have the frame where the
-fatal signal occurred mangled; if you can obtain a stack trace while
-running the XEmacs process under a debugger, the stack trace should be
-clean.
+reconfiguring with ＠samp{--dynamic=no} (＠samp{--with-dynamic=no} in 21.5
+or later). Also, sometimes (again under Linux), stack backtraces of
+core dumps will have the frame where the fatal signal occurred mangled;
+if you can obtain a stack trace while running the XEmacs process under a
+debugger, the stack trace should be clean.
＠email{1CMC3466＠(a)ibm.mtsac.edu, Curtiss} suggests upgrading to ld.so
version 1.8 if dynamic linking and debugging is a problem on Linux.
＠＠ -4293,14 +4319,14 ＠＠ errors often occur during compiling, whi
complex command run from a make suite, it may be easier to attach to
the process once it's running.
-Under Microsoft Windows (and perhaps other operating systems), there
-is another useful trick you can do if you have configured with
-debugging support (configure option ＠samp{--debug} or setting
-＠samp{DEBUG_XEMACS} in ＠file{nt/config.inc}). Set the environment
-variable ＠samp{XEMACSDEBUG} (as described above) to ＠samp{(setq
-debug-on-error t)}. Then, when an error occurs noninteractively,
-instead of trying to invoke the Lisp debugger (which obviously won't
-work), XEmacs will break out to a C debugger using
+Under Microsoft Windows (and perhaps other operating systems), there is
+another useful trick you can do if you have configured with debugging
+support (configure option ＠samp{--debug} (＠samp{--with-debug} in 21.5)
+or setting ＠samp{DEBUG_XEMACS} in ＠file{nt/config.inc}). Set the
+environment variable ＠samp{XEMACSDEBUG} (as described above) to
+＠samp{(setq debug-on-error t)}. Then, when an error occurs
+noninteractively, instead of trying to invoke the Lisp debugger (which
+obviously won't work), XEmacs will break out to a C debugger using
＠code{(force-debugging-signal t)}. ＠emph{NOTE}: This runs
＠code{abort()}!!! (As well as and after executing INT 3 under MS
Windows, which should invoke a debugger if it's active.) This is
＠＠ -6441,15 +6467,19 ＠＠ in your ＠file{init.el}:
＠uref{http://radscan.com/nas.html}.
-To build XEmacs with it, use the ＠file{configure} flag ＠samp{--with-sound=nas}.
+To build XEmacs with it, use the ＠file{configure} flag
+＠samp{--with-sound=nas} (＠samp{--enable-sound=nas} in 21.5 or later).
＠dfn{Enlightened Sound Daemon} (ESD or EsounD) is yet another sound system.
＠uref{http://www.tux.org/~ricdude/EsounD.html}.
-To build XEmacs with it, use the ＠file{configure} flag ＠samp{--with-sound=esd}.
+To build XEmacs with it, use the ＠file{configure} flag
+＠samp{--with-sound=esd} (＠samp{--enable-sound=esd} in 21.5 or later).
-You can specify support for both with a flag like ＠samp{--with-sound=nas,esd}.
+You can specify support for both with a flag like
+＠samp{--with-sound=nas,esd} (＠samp{--enable-sound=nas,esd} in 21.5 or
+later).
＠node Q5.3.4, Q5.4.1, Q5.3.3, External Subsystems
＠unnumberedsubsec Q5.3.4: Sunsite sounds don't play.
＠＠ -6873,7 +6903,8 ＠＠ This program interlocks with ＠code{/bin/
defined by ＠code{/bin/mail}.
There are various different protocols in general use, which you need to
-specify using the ＠samp{--mail-locking} option to ＠file{configure}:
+specify using the ＠samp{--mail-locking} option
+(＠samp{--with-mail-locking} in 21.5 or later) to ＠file{configure}:
＠table ＠samp
＠item lockf
＠＠ -7794,10 +7825,10 ＠＠ says. If you work with extremely large
arbitrarily decide to hand you an unpleasant surprise rather than a
bignum ＠ref{Q7.2.2, XEmacs segfaults when I use very big numbers!}.
-To configure with GNU MP, add
-＠samp{--use-number-lib=gmp}
-to your invocation of ＠file{configure}. For BSD MP, use
-＠samp{--use-number-lib=mp}.
+To configure with GNU MP, add ＠samp{--use-number-lib=gmp}
+(＠samp{--enable-bignum=gmp} in 21.5 or later) to your invocation of
+＠file{configure}. For BSD MP, use ＠samp{--use-number-lib=mp}
+(＠samp{--enable-bignum=mp} for 21.5).
If you would like to help with bignum support, especially on BSD MP,
please subscribe to the ＠uref{http://www.xemacs.org/Lists/#xemacs-beta,
- 1 participants
- 0 comments
CVS update by ben xemacs/src, casetab.h, console-impl.h, database.c, dialog-msw.c, extents.c, file-coding.h, glyphs.h, lstream.c, objects.c, procimpl.h, scrollbar-msw.c, scrollbar.h, symeval.h, ui-gtk.h ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/10/24 12:07:54
Modified: xemacs/src ChangeLog alloc.c buffer.c buffer.h casetab.c
casetab.h charset.h chartab.c chartab.h
console-impl.h console-msw-impl.h console.c data.c
database.c device-impl.h device-msw.c device.c
dialog-msw.c elhash.c events.h extents-impl.h
extents.c faces.c faces.h file-coding.c
file-coding.h frame-impl.h frame.c glyphs.c
glyphs.h gui.c gui.h keymap.c lisp.h lrecord.h
lstream.c lstream.h mule-charset.c objects-impl.h
objects.c opaque.c opaque.h print.c process.c
procimpl.h rangetab.c rangetab.h scrollbar-gtk.c
scrollbar-msw.c scrollbar-x.c scrollbar.c
scrollbar.h specifier.c specifier.h symbols.c
symeval.h toolbar.c toolbar.h tooltalk.c ui-gtk.c
ui-gtk.h unicode.c window-impl.h window.c
Log:
refactor mc-alloc dependencies
next-error.el, occur.el: Fix some byte-compile warnings.
alloc.c, buffer.c, buffer.h, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, console-impl.h, console-msw-impl.h, console.c, data.c, database.c, device-impl.h, device-msw.c, device.c, dialog-msw.c, elhash.c, events.h, extents-impl.h, extents.c, faces.c, faces.h, file-coding.c, file-coding.h, frame-impl.h, frame.c, glyphs.c, glyphs.h, gui.c, gui.h, keymap.c, lisp.h, lrecord.h, lstream.c, lstream.h, mule-charset.c, objects-impl.h, objects.c, opaque.c, opaque.h, print.c, process.c, procimpl.h, rangetab.c, rangetab.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, specifier.c, specifier.h, symbols.c, symeval.h, toolbar.c, toolbar.h, tooltalk.c, ui-gtk.c, ui-gtk.h, unicode.c, window-impl.h, window.c:
Eliminate the majority of #ifdef MC_ALLOC occurrences through
macros LCRECORD_HEADER, ALLOC_LCRECORD_TYPE, MALLOCED_STORAGE_SIZE,
etc. (defined in lrecord.h).
Revision Changes Path
1.687 +9 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.686
retrieving revision 1.687
diff -u -p -r1.686 -r1.687
--- ChangeLog 2005/10/23 16:56:43 1.686
+++ ChangeLog 2005/10/24 10:07:26 1.687
＠＠ -1,3 +1,12 ＠＠
+2005-10-24 Ben Wing <ben(a)xemacs.org>
+
+ * next-error.el (compilation-current-error):
+ * next-error.el (compilation-current-error)): New.
+ * next-error.el (compilation-context-lines)): New.
+ * occur.el (occur-accumulate-lines):
+ * occur.el (multi-occur):
+ Fix some byte-compile warnings.
+
2005-10-23 Adrian Aichner <adrian(a)xemacs.org>
* package-get.el (package-get-download-sites): Sync packages
1.2 +2 -0 XEmacs/xemacs/lisp/next-error.el
Index: next-error.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/next-error.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- next-error.el 2005/10/18 20:49:42 1.1
+++ next-error.el 2005/10/24 10:07:26 1.2
＠＠ -270,6 +270,8 ＠＠ location."
;;; Used as a `post-command-hook' by `next-error-follow-mode'
;;; for the *Compilation* *grep* and *Occur* buffers.
+(defvar compilation-current-error)
+(defvar compilation-context-lines)
(defun next-error-follow-mode-post-command-hook ()
(unless (equal next-error-follow-last-line (line-number-at-pos))
(setq next-error-follow-last-line (line-number-at-pos))
1.2 +3 -2 XEmacs/xemacs/lisp/occur.el
Index: occur.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/occur.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- occur.el 2005/10/18 20:49:43 1.1
+++ occur.el 2005/10/24 10:07:27 1.2
＠＠ -247,9 +247,9 ＠＠ If the value is nil, don't highlight the
(setq count (+ count (if forwardp -1 1)))
(setq beg (line-beginning-position)
end (line-end-position))
- (if (and keep-props (if (boundp 'jit-lock-mode) jit-lock-mode)
+ (if (and keep-props (if-boundp 'jit-lock-mode jit-lock-mode)
(text-property-not-all beg end 'fontified t))
- (if (fboundp 'jit-lock-fontify-now)
+ (if-fboundp 'jit-lock-fontify-now
(jit-lock-fontify-now beg end)))
(push
(funcall (if keep-props
＠＠ -324,6 +324,7 ＠＠ the matching is case-sensitive."
"Show all lines in buffers BUFS containing a match for REGEXP.
This function acts on multiple buffers; otherwise, it is exactly like
`occur'."
+ (defvar ido-ignore-item-temp-list)
(interactive
(cons
(let* ((bufs (list (read-buffer "First buffer to search: "
1.2 +5 -4 XEmacs/xemacs/modules/canna/configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/canna/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- configure 2005/10/21 10:27:02 1.1
+++ configure 2005/10/24 10:07:30 1.2
＠＠ -1,5 +1,5 ＠＠
#! /bin/sh
-# From configure.ac Revision: 1.1.2.1 .
+# From configure.ac Revision: 1.3 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for Sample module 1.0.
#
＠＠ -3656,9 +3656,10 ＠＠ for ac_i in : $LIBOBJS; do test "x$ac_i"
# 1. Remove the extension, and $U if already installed.
ac_i=`echo "$ac_i" |
sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Add them.
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
1.871 +147 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.870
retrieving revision 1.871
diff -u -p -r1.870 -r1.871
--- ChangeLog 2005/10/21 15:48:39 1.870
+++ ChangeLog 2005/10/24 10:07:32 1.871
＠＠ -1,3 +1,150 ＠＠
+2005-10-24 Ben Wing <ben(a)xemacs.org>
+
+ * alloc.c:
+ * alloc.c (Lisp_Free):
+ * alloc.c (Fcons):
+ * alloc.c (noseeum_cons):
+ * alloc.c (make_float):
+ * alloc.c (make_bignum):
+ * alloc.c (make_bignum_bg):
+ * alloc.c (make_ratio):
+ * alloc.c (make_ratio_bg):
+ * alloc.c (make_ratio_rt):
+ * alloc.c (make_bigfloat):
+ * alloc.c (make_bigfloat_bf):
+ * alloc.c (make_vector_internal):
+ * alloc.c (make_bit_vector_internal):
+ * alloc.c (make_compiled_function):
+ * alloc.c (Fmake_symbol):
+ * alloc.c (allocate_extent):
+ * alloc.c (allocate_event):
+ * alloc.c (make_key_data):
+ * alloc.c (make_button_data):
+ * alloc.c (make_motion_data):
+ * alloc.c (make_process_data):
+ * alloc.c (make_timeout_data):
+ * alloc.c (make_magic_data):
+ * alloc.c (make_magic_eval_data):
+ * alloc.c (make_eval_data):
+ * alloc.c (make_misc_user_data):
+ * alloc.c (Fmake_marker):
+ * alloc.c (noseeum_make_marker):
+ * buffer.c (allocate_buffer):
+ * buffer.c (compute_buffer_usage):
+ * buffer.c (nuke_all_buffer_slots):
+ * buffer.c (common_init_complex_vars_of_buffer):
+ * buffer.h (struct buffer):
+ * casetab.c (allocate_case_table):
+ * casetab.h (struct Lisp_Case_Table):
+ * charset.h (struct Lisp_Charset):
+ * chartab.c (fill_char_table):
+ * chartab.c (Fmake_char_table):
+ * chartab.c (make_char_table_entry):
+ * chartab.c (copy_char_table_entry):
+ * chartab.c (Fcopy_char_table):
+ * chartab.c (put_char_table):
+ * chartab.h (struct Lisp_Char_Table_Entry):
+ * chartab.h (struct Lisp_Char_Table):
+ * console-impl.h (struct console):
+ * console-msw-impl.h (struct Lisp_Devmode):
+ * console-msw-impl.h (struct mswindows_dialog_id):
+ * console.c (allocate_console):
+ * console.c (nuke_all_console_slots):
+ * console.c (common_init_complex_vars_of_console):
+ * data.c (make_weak_list):
+ * data.c (make_weak_box):
+ * data.c (make_ephemeron):
+ * database.c (struct Lisp_Database):
+ * database.c (allocate_database):
+ * device-impl.h (struct device):
+ * device-msw.c (allocate_devmode):
+ * device.c (nuke_all_device_slots):
+ * device.c (allocate_device):
+ * dialog-msw.c (handle_question_dialog_box):
+ * elhash.c (struct Lisp_Hash_Table):
+ * elhash.c (make_general_lisp_hash_table):
+ * elhash.c (Fcopy_hash_table):
+ * events.h (struct Lisp_Timeout):
+ * events.h (struct command_builder):
+ * extents-impl.h (struct extent_auxiliary):
+ * extents-impl.h (struct extent_info):
+ * extents.c (allocate_extent_auxiliary):
+ * extents.c (allocate_extent_info):
+ * extents.c (copy_extent):
+ * faces.c (allocate_face):
+ * faces.h (struct Lisp_Face):
+ * file-coding.c (Fcopy_coding_system):
+ * file-coding.h (struct Lisp_Coding_System):
+ * frame-impl.h (struct frame):
+ * frame.c (nuke_all_frame_slots):
+ * frame.c (allocate_frame_core):
+ * glyphs.c (allocate_image_instance):
+ * glyphs.c (Fcolorize_image_instance):
+ * glyphs.c (allocate_glyph):
+ * glyphs.h (struct Lisp_Image_Instance):
+ * glyphs.h (struct Lisp_Glyph):
+ * gui.c (allocate_gui_item):
+ * gui.h (struct Lisp_Gui_Item):
+ * keymap.c (struct Lisp_Keymap):
+ * keymap.c (make_keymap):
+ * lisp.h (struct Lisp_Vector):
+ * lisp.h (struct Lisp_Bit_Vector):
+ * lisp.h (struct weak_box):
+ * lisp.h (struct ephemeron):
+ * lisp.h (struct weak_list):
+ * lrecord.h:
+ * lrecord.h (struct toolbar_button):
+ * lstream.c (COPY_SIZED_LCRECORD):
+ * lstream.h (struct lstream):
+ * mule-charset.c (make_charset):
+ * mule-charset.c (compute_charset_usage):
+ * objects-impl.h (struct Lisp_Color_Instance):
+ * objects-impl.h (struct Lisp_Font_Instance):
+ * objects.c (Fmake_color_instance):
+ * objects.c (Fmake_font_instance):
+ * objects.c (reinit_vars_of_objects):
+ * opaque.c (make_opaque):
+ * opaque.h (Lisp_Opaque):
+ * opaque.h (Lisp_Opaque_Ptr):
+ * print.c (default_object_printer):
+ * process.c (make_process_internal):
+ * procimpl.h (struct Lisp_Process):
+ * rangetab.c (Fmake_range_table):
+ * rangetab.c (Fcopy_range_table):
+ * rangetab.h (struct Lisp_Range_Table):
+ * scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage):
+ * scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
+ * scrollbar-x.c (x_compute_scrollbar_instance_usage):
+ * scrollbar.c (create_scrollbar_instance):
+ * scrollbar.c (compute_scrollbar_instance_usage):
+ * scrollbar.h (struct scrollbar_instance):
+ * specifier.c (make_specifier_internal):
+ * specifier.h (struct Lisp_Specifier):
+ * symbols.c (Fdefvaralias):
+ * symeval.h (SYMBOL_VALUE_MAGIC_P):
+ * toolbar.c (update_toolbar_button):
+ * toolbar.h (struct toolbar_button):
+ * tooltalk.c (struct Lisp_Tooltalk_Message):
+ * tooltalk.c (make_tooltalk_message):
+ * tooltalk.c (struct Lisp_Tooltalk_Pattern):
+ * tooltalk.c (make_tooltalk_pattern):
+ * ui-gtk.c (allocate_ffi_data):
+ * ui-gtk.c (allocate_emacs_gtk_object_data):
+ * ui-gtk.c (allocate_emacs_gtk_boxed_data):
+ * ui-gtk.h:
+ * unicode.c (compute_from_unicode_table_size_1):
+ * unicode.c (compute_to_unicode_table_size_1):
+ * window-impl.h (struct window):
+ * window-impl.h (struct window_mirror):
+ * window.c (allocate_window):
+ * window.c (new_window_mirror):
+ * window.c (make_dummy_parent):
+ * window.c (compute_window_mirror_usage):
+ * window.c (compute_window_usage):
+ Eliminate the majority of #ifdef MC_ALLOC occurrences through
+ macros LCRECORD_HEADER, ALLOC_LCRECORD_TYPE, MALLOCED_STORAGE_SIZE,
+ etc. (defined in lrecord.h).
+
2005-10-21 Stephen J. Turnbull <stephen(a)xemacs.org>
* Makefile.in.in (mule_canna_objs): Revert canna-api to canna_api.
1.117 +69 -213 XEmacs/xemacs/src/alloc.c
Index: alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- alloc.c 2005/10/14 01:21:59 1.116
+++ alloc.c 2005/10/24 10:07:33 1.117
＠＠ -811,7 +811,9 ＠＠ dbg_eq (Lisp_Object obj1, Lisp_Object ob
}
-#ifndef MC_ALLOC
+#ifdef MC_ALLOC
+#define DECLARE_FIXED_TYPE_ALLOC(type, structture) struct __foo__
+#else
/************************************************************************/
/* Fixed-size type macros */
/************************************************************************/
＠＠ -1085,7 +1087,6 ＠＠ do \
NOSEEUM_INCREMENT_CONS_COUNTER (sizeof (structtype), #type); \
} while (0)
-
/* Lisp_Free is the type to represent a free list member inside a frob
block of any lisp object type. */
typedef struct Lisp_Free
＠＠ -1172,18 +1173,42 ＠＠ do { FREE_FIXED_TYPE (type, structtype,
#endif
#endif /* not MC_ALLOC */
+#ifdef MC_ALLOC
+#define ALLOCATE_FIXED_TYPE_AND_SET_IMPL(type, lisp_type, var, lrec_ptr) \
+do { \
+ (var) = alloc_lrecord_type (lisp_type, lrec_ptr); \
+} while (0)
+#define NOSEEUM_ALLOCATE_FIXED_TYPE_AND_SET_IMPL(type, lisp_type, var, \
+ lrec_ptr) \
+do { \
+ (var) = noseeum_alloc_lrecord_type (lisp_type, lrec_ptr); \
+} while (0)
+#else /* not MC_ALLOC */
+#define ALLOCATE_FIXED_TYPE_AND_SET_IMPL(type, lisp_type, var, lrec_ptr) \
+do \
+{ \
+ ALLOCATE_FIXED_TYPE (type, lisp_type, var); \
+ set_lheader_implementation (&(var)->lheader, lrec_ptr); \
+} while (0)
+#define NOSEEUM_ALLOCATE_FIXED_TYPE_AND_SET_IMPL(type, lisp_type, var, \
+ lrec_ptr) \
+do \
+{ \
+ NOSEEUM_ALLOCATE_FIXED_TYPE (type, lisp_type, var); \
+ set_lheader_implementation (&(var)->lheader, lrec_ptr); \
+} while (0)
+#endif /* MC_ALLOC */
+
/************************************************************************/
/* Cons allocation */
/************************************************************************/
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (cons, Lisp_Cons);
/* conses are used and freed so often that we set this really high */
/* #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_cons 20000 */
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_cons 2000
-#endif /* not MC_ALLOC */
static Lisp_Object
mark_cons (Lisp_Object obj)
＠＠ -1237,12 +1262,7 ＠＠ Create a new cons, give it CAR and CDR a
Lisp_Object val;
Lisp_Cons *c;
-#ifdef MC_ALLOC
- c = alloc_lrecord_type (Lisp_Cons, &lrecord_cons);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (cons, Lisp_Cons, c);
- set_lheader_implementation (&c->lheader, &lrecord_cons);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (cons, Lisp_Cons, c, &lrecord_cons);
val = wrap_cons (c);
XSETCAR (val, car);
XSETCDR (val, cdr);
＠＠ -1258,12 +1278,7 ＠＠ noseeum_cons (Lisp_Object car, Lisp_Obje
Lisp_Object val;
Lisp_Cons *c;
-#ifdef MC_ALLOC
- c = noseeum_alloc_lrecord_type (Lisp_Cons, &lrecord_cons);
-#else /* not MC_ALLOC */
- NOSEEUM_ALLOCATE_FIXED_TYPE (cons, Lisp_Cons, c);
- set_lheader_implementation (&c->lheader, &lrecord_cons);
-#endif /* not MC_ALLOC */
+ NOSEEUM_ALLOCATE_FIXED_TYPE_AND_SET_IMPL (cons, Lisp_Cons, c, &lrecord_cons);
val = wrap_cons (c);
XCAR (val) = car;
XCDR (val) = cdr;
＠＠ -1365,27 +1380,20 ＠＠ Return a new list of length LENGTH, with
/*** With enhanced number support, these are short floats */
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (float, Lisp_Float);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_float 1000
-#endif /* not MC_ALLOC */
Lisp_Object
make_float (double float_value)
{
Lisp_Float *f;
-#ifdef MC_ALLOC
- f = alloc_lrecord_type (Lisp_Float, &lrecord_float);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (float, Lisp_Float, f);
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (float, Lisp_Float, f, &lrecord_float);
/* Avoid dump-time `uninitialized memory read' purify warnings. */
if (sizeof (struct lrecord_header) + sizeof (double) != sizeof (*f))
- xzero (*f);
-#endif /* not MC_ALLOC */
+ zero_lrecord (f);
- set_lheader_implementation (&f->lheader, &lrecord_float);
float_data (f) = float_value;
return wrap_float (f);
}
＠＠ -1397,10 +1405,8 ＠＠ make_float (double float_value)
/*** Bignum ***/
#ifdef HAVE_BIGNUM
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (bignum, Lisp_Bignum);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_bignum 250
-#endif /* not MC_ALLOC */
/* WARNING: This function returns a bignum even if its argument fits into a
fixnum. See Fcanonicalize_number(). */
＠＠ -1409,12 +1415,7 ＠＠ make_bignum (long bignum_value)
{
Lisp_Bignum *b;
-#ifdef MC_ALLOC
- b = alloc_lrecord_type (Lisp_Bignum, &lrecord_bignum);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (bignum, Lisp_Bignum, b);
- set_lheader_implementation (&b->lheader, &lrecord_bignum);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (bignum, Lisp_Bignum, b, &lrecord_bignum);
bignum_init (bignum_data (b));
bignum_set_long (bignum_data (b), bignum_value);
return wrap_bignum (b);
＠＠ -1427,12 +1428,7 ＠＠ make_bignum_bg (bignum bg)
{
Lisp_Bignum *b;
-#ifdef MC_ALLOC
- b = alloc_lrecord_type (Lisp_Bignum, &lrecord_bignum);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (bignum, Lisp_Bignum, b);
- set_lheader_implementation (&b->lheader, &lrecord_bignum);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (bignum, Lisp_Bignum, b, &lrecord_bignum);
bignum_init (bignum_data (b));
bignum_set (bignum_data (b), bg);
return wrap_bignum (b);
＠＠ -1441,22 +1437,15 ＠＠ make_bignum_bg (bignum bg)
/*** Ratio ***/
#ifdef HAVE_RATIO
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (ratio, Lisp_Ratio);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_ratio 250
-#endif /* not MC_ALLOC */
Lisp_Object
make_ratio (long numerator, unsigned long denominator)
{
Lisp_Ratio *r;
-#ifdef MC_ALLOC
- r = alloc_lrecord_type (Lisp_Ratio, &lrecord_ratio);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (ratio, Lisp_Ratio, r);
- set_lheader_implementation (&r->lheader, &lrecord_ratio);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (ratio, Lisp_Ratio, r, &lrecord_ratio);
ratio_init (ratio_data (r));
ratio_set_long_ulong (ratio_data (r), numerator, denominator);
ratio_canonicalize (ratio_data (r));
＠＠ -1468,12 +1457,7 ＠＠ make_ratio_bg (bignum numerator, bignum
{
Lisp_Ratio *r;
-#ifdef MC_ALLOC
- r = alloc_lrecord_type (Lisp_Ratio, &lrecord_ratio);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (ratio, Lisp_Ratio, r);
- set_lheader_implementation (&r->lheader, &lrecord_ratio);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (ratio, Lisp_Ratio, r, &lrecord_ratio);
ratio_init (ratio_data (r));
ratio_set_bignum_bignum (ratio_data (r), numerator, denominator);
ratio_canonicalize (ratio_data (r));
＠＠ -1485,12 +1469,7 ＠＠ make_ratio_rt (ratio rat)
{
Lisp_Ratio *r;
-#ifdef MC_ALLOC
- r = alloc_lrecord_type (Lisp_Ratio, &lrecord_ratio);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (ratio, Lisp_Ratio, r);
- set_lheader_implementation (&r->lheader, &lrecord_ratio);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (ratio, Lisp_Ratio, r, &lrecord_ratio);
ratio_init (ratio_data (r));
ratio_set (ratio_data (r), rat);
return wrap_ratio (r);
＠＠ -1499,10 +1478,8 ＠＠ make_ratio_rt (ratio rat)
/*** Bigfloat ***/
#ifdef HAVE_BIGFLOAT
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (bigfloat, Lisp_Bigfloat);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_bigfloat 250
-#endif /* not MC_ALLOC */
/* This function creates a bigfloat with the default precision if the
PRECISION argument is zero. */
＠＠ -1511,12 +1488,7 ＠＠ make_bigfloat (double float_value, unsig
{
Lisp_Bigfloat *f;
-#ifdef MC_ALLOC
- f = alloc_lrecord_type (Lisp_Bigfloat, &lrecord_bigfloat);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (bigfloat, Lisp_Bigfloat, f);
- set_lheader_implementation (&f->lheader, &lrecord_bigfloat);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (bigfloat, Lisp_Bigfloat, f, &lrecord_bigfloat);
if (precision == 0UL)
bigfloat_init (bigfloat_data (f));
else
＠＠ -1531,12 +1503,7 ＠＠ make_bigfloat_bf (bigfloat float_value)
{
Lisp_Bigfloat *f;
-#ifdef MC_ALLOC
- f = alloc_lrecord_type (Lisp_Bigfloat, &lrecord_bigfloat);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (bigfloat, Lisp_Bigfloat, f);
- set_lheader_implementation (&f->lheader, &lrecord_bigfloat);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (bigfloat, Lisp_Bigfloat, f, &lrecord_bigfloat);
bigfloat_init_prec (bigfloat_data (f), bigfloat_get_prec (float_value));
bigfloat_set (bigfloat_data (f), float_value);
return wrap_bigfloat (f);
＠＠ -1613,11 +1580,7 ＠＠ make_vector_internal (Elemcount sizei)
Bytecount sizem = FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_Vector, Lisp_Object,
contents, sizei);
Lisp_Vector *p =
-#ifdef MC_ALLOC
- (Lisp_Vector *) alloc_lrecord (sizem, &lrecord_vector);
-#else /* not MC_ALLOC */
- (Lisp_Vector *) basic_alloc_lcrecord (sizem, &lrecord_vector);
-#endif /* not MC_ALLOC */
+ (Lisp_Vector *) BASIC_ALLOC_LCRECORD (sizem, &lrecord_vector);
p->size = sizei;
return p;
＠＠ -1774,11 +1737,7 ＠＠ make_bit_vector_internal (Elemcount size
unsigned long,
bits, num_longs);
Lisp_Bit_Vector *p = (Lisp_Bit_Vector *)
-#ifdef MC_ALLOC
- alloc_lrecord (sizem, &lrecord_bit_vector);
-#else /* not MC_ALLOC */
- basic_alloc_lcrecord (sizem, &lrecord_bit_vector);
-#endif /* not MC_ALLOC */
+ BASIC_ALLOC_LCRECORD (sizem, &lrecord_bit_vector);
bit_vector_length (p) = sizei;
return p;
＠＠ -1854,22 +1813,16 ＠＠ Each argument must be one of the integer
/* Compiled-function allocation */
/************************************************************************/
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (compiled_function, Lisp_Compiled_Function);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_compiled_function 1000
-#endif /* not MC_ALLOC */
static Lisp_Object
make_compiled_function (void)
{
Lisp_Compiled_Function *f;
-#ifdef MC_ALLOC
- f = alloc_lrecord_type (Lisp_Compiled_Function, &lrecord_compiled_function);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (compiled_function, Lisp_Compiled_Function, f);
- set_lheader_implementation (&f->lheader, &lrecord_compiled_function);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (compiled_function, Lisp_Compiled_Function,
+ f, &lrecord_compiled_function);
f->stack_depth = 0;
f->specpdl_depth = 0;
＠＠ -2001,10 +1954,8 ＠＠ This is terrible behavior which is retai
/* Symbol allocation */
/************************************************************************/
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (symbol, Lisp_Symbol);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_symbol 1000
-#endif /* not MC_ALLOC */
DEFUN ("make-symbol", Fmake_symbol, 1, 1, 0, /*
Return a newly allocated uninterned symbol whose name is NAME.
＠＠ -2016,12 +1967,7 ＠＠ Its value and function definition are vo
CHECK_STRING (name);
-#ifdef MC_ALLOC
- p = alloc_lrecord_type (Lisp_Symbol, &lrecord_symbol);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (symbol, Lisp_Symbol, p);
- set_lheader_implementation (&p->lheader, &lrecord_symbol);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (symbol, Lisp_Symbol, p, &lrecord_symbol);
p->name = name;
p->plist = Qnil;
p->value = Qunbound;
＠＠ -2035,22 +1981,15 ＠＠ Its value and function definition are vo
/* Extent allocation */
/************************************************************************/
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (extent, struct extent);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_extent 1000
-#endif /* not MC_ALLOC */
struct extent *
allocate_extent (void)
{
struct extent *e;
-#ifdef MC_ALLOC
- e = alloc_lrecord_type (struct extent, &lrecord_extent);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (extent, struct extent, e);
- set_lheader_implementation (&e->lheader, &lrecord_extent);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (extent, struct extent, e, &lrecord_extent);
extent_object (e) = Qnil;
set_extent_start (e, -1);
set_extent_end (e, -1);
＠＠ -2070,221 +2009,151 ＠＠ allocate_extent (void)
/* Event allocation */
/************************************************************************/
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (event, Lisp_Event);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_event 1000
-#endif /* not MC_ALLOC */
Lisp_Object
allocate_event (void)
{
Lisp_Event *e;
-#ifdef MC_ALLOC
- e = alloc_lrecord_type (Lisp_Event, &lrecord_event);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (event, Lisp_Event, e);
- set_lheader_implementation (&e->lheader, &lrecord_event);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (event, Lisp_Event, e, &lrecord_event);
return wrap_event (e);
}
#ifdef EVENT_DATA_AS_OBJECTS
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (key_data, Lisp_Key_Data);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_key_data 1000
-#endif /* not MC_ALLOC */
Lisp_Object
make_key_data (void)
{
Lisp_Key_Data *d;
-#ifdef MC_ALLOC
- d = alloc_lrecord_type (Lisp_Key_Data, &lrecord_key_data);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (key_data, Lisp_Key_Data, d);
- xzero (*d);
- set_lheader_implementation (&d->lheader, &lrecord_key_data);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (key_data, Lisp_Key_Data, d,
+ &lrecord_key_data);
+ zero_lrecord (d);
d->keysym = Qnil;
return wrap_key_data (d);
}
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (button_data, Lisp_Button_Data);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_button_data 1000
-#endif /* not MC_ALLOC */
Lisp_Object
make_button_data (void)
{
Lisp_Button_Data *d;
-#ifdef MC_ALLOC
- d = alloc_lrecord_type (Lisp_Button_Data, &lrecord_button_data);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (button_data, Lisp_Button_Data, d);
- xzero (*d);
- set_lheader_implementation (&d->lheader, &lrecord_button_data);
-
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (button_data, Lisp_Button_Data, d, &lrecord_button_data);
+ zero_lrecord (d);
return wrap_button_data (d);
}
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (motion_data, Lisp_Motion_Data);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_motion_data 1000
-#endif /* not MC_ALLOC */
Lisp_Object
make_motion_data (void)
{
Lisp_Motion_Data *d;
-#ifdef MC_ALLOC
- d = alloc_lrecord_type (Lisp_Motion_Data, &lrecord_motion_data);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (motion_data, Lisp_Motion_Data, d);
- xzero (*d);
- set_lheader_implementation (&d->lheader, &lrecord_motion_data);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (motion_data, Lisp_Motion_Data, d, &lrecord_motion_data);
+ zero_lrecord (d);
return wrap_motion_data (d);
}
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (process_data, Lisp_Process_Data);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_process_data 1000
-#endif /* not MC_ALLOC */
Lisp_Object
make_process_data (void)
{
Lisp_Process_Data *d;
-#ifdef MC_ALLOC
- d = alloc_lrecord_type (Lisp_Process_Data, &lrecord_process_data);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (process_data, Lisp_Process_Data, d);
- xzero (*d);
- set_lheader_implementation (&d->lheader, &lrecord_process_data);
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (process_data, Lisp_Process_Data, d, &lrecord_process_data);
+ zero_lrecord (d);
d->process = Qnil;
-#endif /* not MC_ALLOC */
return wrap_process_data (d);
}
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (timeout_data, Lisp_Timeout_Data);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_timeout_data 1000
-#endif /* not MC_ALLOC */
Lisp_Object
make_timeout_data (void)
{
Lisp_Timeout_Data *d;
-#ifdef MC_ALLOC
- d = alloc_lrecord_type (Lisp_Timeout_Data, &lrecord_timeout_data);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (timeout_data, Lisp_Timeout_Data, d);
- xzero (*d);
- set_lheader_implementation (&d->lheader, &lrecord_timeout_data);
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (timeout_data, Lisp_Timeout_Data, d, &lrecord_timeout_data);
+ zero_lrecord (d);
d->function = Qnil;
d->object = Qnil;
-#endif /* not MC_ALLOC */
return wrap_timeout_data (d);
}
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (magic_data, Lisp_Magic_Data);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_magic_data 1000
-#endif /* not MC_ALLOC */
Lisp_Object
make_magic_data (void)
{
Lisp_Magic_Data *d;
-#ifdef MC_ALLOC
- d = alloc_lrecord_type (Lisp_Magic_Data, &lrecord_magic_data);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (magic_data, Lisp_Magic_Data, d);
- xzero (*d);
- set_lheader_implementation (&d->lheader, &lrecord_magic_data);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (magic_data, Lisp_Magic_Data, d, &lrecord_magic_data);
+ zero_lrecord (d);
return wrap_magic_data (d);
}
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (magic_eval_data, Lisp_Magic_Eval_Data);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_magic_eval_data 1000
-#endif /* not MC_ALLOC */
Lisp_Object
make_magic_eval_data (void)
{
Lisp_Magic_Eval_Data *d;
-#ifdef MC_ALLOC
- d = alloc_lrecord_type (Lisp_Magic_Eval_Data, &lrecord_magic_eval_data);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (magic_eval_data, Lisp_Magic_Eval_Data, d);
- xzero (*d);
- set_lheader_implementation (&d->lheader, &lrecord_magic_eval_data);
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (magic_eval_data, Lisp_Magic_Eval_Data, d, &lrecord_magic_eval_data);
+ zero_lrecord (d);
d->object = Qnil;
-#endif /* not MC_ALLOC */
return wrap_magic_eval_data (d);
}
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (eval_data, Lisp_Eval_Data);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_eval_data 1000
-#endif /* not MC_ALLOC */
Lisp_Object
make_eval_data (void)
{
Lisp_Eval_Data *d;
-#ifdef MC_ALLOC
- d = alloc_lrecord_type (Lisp_Eval_Data, &lrecord_eval_data);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (eval_data, Lisp_Eval_Data, d);
- xzero (*d);
- set_lheader_implementation (&d->lheader, &lrecord_eval_data);
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (eval_data, Lisp_Eval_Data, d, &lrecord_eval_data);
+ zero_lrecord (d);
d->function = Qnil;
d->object = Qnil;
-#endif /* not MC_ALLOC */
return wrap_eval_data (d);
}
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (misc_user_data, Lisp_Misc_User_Data);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_misc_user_data 1000
-#endif /* not MC_ALLOC */
Lisp_Object
make_misc_user_data (void)
{
Lisp_Misc_User_Data *d;
-#ifdef MC_ALLOC
- d = alloc_lrecord_type (Lisp_Misc_User_Data, &lrecord_misc_user_data);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (misc_user_data, Lisp_Misc_User_Data, d);
- xzero (*d);
- set_lheader_implementation (&d->lheader, &lrecord_misc_user_data);
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (misc_user_data, Lisp_Misc_User_Data, d, &lrecord_misc_user_data);
+ zero_lrecord (d);
d->function = Qnil;
d->object = Qnil;
-#endif /* not MC_ALLOC */
return wrap_misc_user_data (d);
}
＠＠ -2295,10 +2164,8 ＠＠ make_misc_user_data (void)
/* Marker allocation */
/************************************************************************/
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (marker, Lisp_Marker);
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_marker 1000
-#endif /* not MC_ALLOC */
DEFUN ("make-marker", Fmake_marker, 0, 0, 0, /*
Return a new marker which does not point at any place.
＠＠ -2307,12 +2174,7 ＠＠ Return a new marker which does not point
{
Lisp_Marker *p;
-#ifdef MC_ALLOC
- p = alloc_lrecord_type (Lisp_Marker, &lrecord_marker);
-#else /* not MC_ALLOC */
- ALLOCATE_FIXED_TYPE (marker, Lisp_Marker, p);
- set_lheader_implementation (&p->lheader, &lrecord_marker);
-#endif /* not MC_ALLOC */
+ ALLOCATE_FIXED_TYPE_AND_SET_IMPL (marker, Lisp_Marker, p, &lrecord_marker);
p->buffer = 0;
p->membpos = 0;
marker_next (p) = 0;
＠＠ -2326,12 +2188,8 ＠＠ noseeum_make_marker (void)
{
Lisp_Marker *p;
-#ifdef MC_ALLOC
- p = noseeum_alloc_lrecord_type (Lisp_Marker, &lrecord_marker);
-#else /* not MC_ALLOC */
- NOSEEUM_ALLOCATE_FIXED_TYPE (marker, Lisp_Marker, p);
- set_lheader_implementation (&p->lheader, &lrecord_marker);
-#endif /* not MC_ALLOC */
+ NOSEEUM_ALLOCATE_FIXED_TYPE_AND_SET_IMPL (marker, Lisp_Marker, p,
+ &lrecord_marker);
p->buffer = 0;
p->membpos = 0;
marker_next (p) = 0;
＠＠ -2358,12 +2216,10 ＠＠ noseeum_make_marker (void)
This new method makes things somewhat bigger, but it is MUCH safer. */
-#ifndef MC_ALLOC
DECLARE_FIXED_TYPE_ALLOC (string, Lisp_String);
/* strings are used and freed quite often */
/* #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_string 10000 */
#define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_string 1000
-#endif /* not MC_ALLOC */
static Lisp_Object
mark_string (Lisp_Object obj)
1.72 +6 -25 XEmacs/xemacs/src/buffer.c
Index: buffer.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/buffer.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- buffer.c 2005/04/08 23:11:18 1.71
+++ buffer.c 2005/10/24 10:07:33 1.72
＠＠ -587,15 +587,9 ＠＠ get_truename_buffer (REGISTER Lisp_Objec
static struct buffer *
allocate_buffer (void)
{
-#ifdef MC_ALLOC
- struct buffer *b = alloc_lrecord_type (struct buffer, &lrecord_buffer);
-
- copy_lrecord (b, XBUFFER (Vbuffer_defaults));
-#else /* not MC_ALLOC */
- struct buffer *b = alloc_lcrecord_type (struct buffer, &lrecord_buffer);
+ struct buffer *b = ALLOC_LCRECORD_TYPE (struct buffer, &lrecord_buffer);
- copy_lcrecord (b, XBUFFER (Vbuffer_defaults));
-#endif /* not MC_ALLOC */
+ COPY_LCRECORD (b, XBUFFER (Vbuffer_defaults));
return b;
}
＠＠ -1763,11 +1757,7 ＠＠ compute_buffer_usage (struct buffer *b,
struct overhead_stats *ovstats)
{
xzero (*stats);
-#ifdef MC_ALLOC
- stats->other += mc_alloced_storage_size (sizeof (*b), ovstats);
-#else /* not MC_ALLOC */
- stats->other += malloced_storage_size (b, sizeof (*b), ovstats);
-#endif /* not MC_ALLOC */
+ stats->other += MALLOCED_STORAGE_SIZE (b, sizeof (*b), ovstats);
stats->text += compute_buffer_text_usage (b, ovstats);
stats->markers += compute_buffer_marker_usage (b, ovstats);
stats->extents += compute_buffer_extent_usage (b, ovstats);
＠＠ -2204,11 +2194,7 ＠＠ do { \
static void
nuke_all_buffer_slots (struct buffer *b, Lisp_Object zap)
{
-#ifdef MC_ALLOC
- zero_lrecord (b);
-#else /* not MC_ALLOC */
- zero_lcrecord (b);
-#endif /* not MC_ALLOC */
+ ZERO_LCRECORD (b);
b->extent_info = Qnil;
b->indirect_children = Qnil;
＠＠ -2223,13 +2209,8 ＠＠ common_init_complex_vars_of_buffer (void
{
/* Make sure all markable slots in buffer_defaults
are initialized reasonably, so mark_buffer won't choke. */
-#ifdef MC_ALLOC
- struct buffer *defs = alloc_lrecord_type (struct buffer, &lrecord_buffer);
- struct buffer *syms = alloc_lrecord_type (struct buffer, &lrecord_buffer);
-#else /* not MC_ALLOC */
- struct buffer *defs = alloc_lcrecord_type (struct buffer, &lrecord_buffer);
- struct buffer *syms = alloc_lcrecord_type (struct buffer, &lrecord_buffer);
-#endif /* not MC_ALLOC */
+ struct buffer *defs = ALLOC_LCRECORD_TYPE (struct buffer, &lrecord_buffer);
+ struct buffer *syms = ALLOC_LCRECORD_TYPE (struct buffer, &lrecord_buffer);
staticpro_nodump (&Vbuffer_defaults);
staticpro_nodump (&Vbuffer_local_symbols);
1.33 +1 -5 XEmacs/xemacs/src/buffer.h
Index: buffer.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/buffer.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- buffer.h 2005/04/08 23:11:19 1.32
+++ buffer.h 2005/10/24 10:07:34 1.33
＠＠ -140,11 +140,7 ＠＠ struct buffer_text
struct buffer
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
/* This structure holds the coordinates of the buffer contents
in ordinary buffers. In indirect buffers, this is not used. */
1.17 +1 -5 XEmacs/xemacs/src/casetab.c
Index: casetab.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/casetab.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- casetab.c 2005/04/08 23:11:19 1.16
+++ casetab.c 2005/10/24 10:07:34 1.17
＠＠ -116,11 +116,7 ＠＠ static Lisp_Object
allocate_case_table (int init_tables)
{
Lisp_Case_Table *ct =
-#ifdef MC_ALLOC
- alloc_lrecord_type (Lisp_Case_Table, &lrecord_case_table);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (Lisp_Case_Table, &lrecord_case_table);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (Lisp_Case_Table, &lrecord_case_table);
if (init_tables)
{
1.7 +1 -5 XEmacs/xemacs/src/casetab.h
Index: casetab.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/casetab.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- casetab.h 2005/04/08 23:11:19 1.6
+++ casetab.h 2005/10/24 10:07:34 1.7
＠＠ -25,11 +25,7 ＠＠ Boston, MA 02111-1307, USA. */
struct Lisp_Case_Table
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object downcase_table;
Lisp_Object upcase_table;
Lisp_Object case_canon_table;
1.12 +1 -5 XEmacs/xemacs/src/charset.h
Index: charset.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/charset.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- charset.h 2005/04/08 23:11:20 1.11
+++ charset.h 2005/10/24 10:07:34 1.12
＠＠ -181,11 +181,7 ＠＠ leading_byte_prefix_p (Ibyte lb)
struct Lisp_Charset
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
int id;
Lisp_Object name;
1.37 +6 -30 XEmacs/xemacs/src/chartab.c
Index: chartab.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/chartab.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- chartab.c 2005/04/11 05:15:06 1.36
+++ chartab.c 2005/10/24 10:07:34 1.37
＠＠ -476,11 +476,7 ＠＠ fill_char_table (Lisp_Char_Table *ct, Li
if (!EQ (ct->level1[i], Qnull_pointer) &&
CHAR_TABLE_ENTRYP (ct->level1[i]) &&
!OBJECT_DUMPED_P (ct->level1[1]))
-#ifdef MC_ALLOC
- free_lrecord (ct->level1[i]);
-#else /* not MC_ALLOC */
- free_lcrecord (ct->level1[i]);
-#endif /* not MC_ALLOC */
+ FREE_LCRECORD (ct->level1[i]);
ct->level1[i] = value;
}
#endif /* MULE */
＠＠ -596,11 +592,7 ＠＠ sorts of values. The different char tab
Lisp_Object obj;
enum char_table_type ty = symbol_to_char_table_type (type);
-#ifdef MC_ALLOC
- ct = alloc_lrecord_type (Lisp_Char_Table, &lrecord_char_table);
-#else /* not MC_ALLOC */
- ct = alloc_lcrecord_type (Lisp_Char_Table, &lrecord_char_table);
-#endif /* not MC_ALLOC */
+ ct = ALLOC_LCRECORD_TYPE (Lisp_Char_Table, &lrecord_char_table);
ct->type = ty;
obj = wrap_char_table (ct);
if (ty == CHAR_TABLE_TYPE_SYNTAX)
＠＠ -633,11 +625,7 ＠＠ make_char_table_entry (Lisp_Object initv
{
int i;
Lisp_Char_Table_Entry *cte =
-#ifdef MC_ALLOC
- alloc_lrecord_type (Lisp_Char_Table_Entry, &lrecord_char_table_entry);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (Lisp_Char_Table_Entry, &lrecord_char_table_entry);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (Lisp_Char_Table_Entry, &lrecord_char_table_entry);
for (i = 0; i < 96; i++)
cte->level2[i] = initval;
＠＠ -651,11 +639,7 ＠＠ copy_char_table_entry (Lisp_Object entry
Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (entry);
int i;
Lisp_Char_Table_Entry *ctenew =
-#ifdef MC_ALLOC
- alloc_lrecord_type (Lisp_Char_Table_Entry, &lrecord_char_table_entry);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (Lisp_Char_Table_Entry, &lrecord_char_table_entry);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (Lisp_Char_Table_Entry, &lrecord_char_table_entry);
for (i = 0; i < 96; i++)
{
＠＠ -684,11 +668,7 ＠＠ as CHAR-TABLE. The values will not them
CHECK_CHAR_TABLE (char_table);
ct = XCHAR_TABLE (char_table);
-#ifdef MC_ALLOC
- ctnew = alloc_lrecord_type (Lisp_Char_Table, &lrecord_char_table);
-#else /* not MC_ALLOC */
- ctnew = alloc_lcrecord_type (Lisp_Char_Table, &lrecord_char_table);
-#endif /* not MC_ALLOC */
+ ctnew = ALLOC_LCRECORD_TYPE (Lisp_Char_Table, &lrecord_char_table);
ctnew->type = ct->type;
ctnew->parent = ct->parent;
ctnew->default_ = ct->default_;
＠＠ -1080,11 +1060,7 ＠＠ put_char_table (Lisp_Object table, struc
int lb = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
if (CHAR_TABLE_ENTRYP (ct->level1[lb]) &&
!OBJECT_DUMPED_P (ct->level1[lb]))
-#ifdef MC_ALLOC
- free_lrecord (ct->level1[lb]);
-#else /* not MC_ALLOC */
- free_lcrecord (ct->level1[lb]);
-#endif /* not MC_ALLOC */
+ FREE_LCRECORD (ct->level1[lb]);
ct->level1[lb] = val;
}
break;
1.16 +2 -10 XEmacs/xemacs/src/chartab.h
Index: chartab.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/chartab.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- chartab.h 2005/04/08 23:11:20 1.15
+++ chartab.h 2005/10/24 10:07:34 1.16
＠＠ -42,11 +42,7 ＠＠ Boston, MA 02111-1307, USA. */
struct Lisp_Char_Table_Entry
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
/* In the interests of simplicity, we just use a fixed 96-entry
table. If we felt like being smarter, we could make this
＠＠ -84,11 +80,7 ＠＠ enum char_table_type
struct Lisp_Char_Table
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object ascii[NUM_ASCII_CHARS];
Lisp_Object default_;
1.12 +1 -5 XEmacs/xemacs/src/console-impl.h
Index: console-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-impl.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- console-impl.h 2005/09/27 05:48:27 1.11
+++ console-impl.h 2005/10/24 10:07:34 1.12
＠＠ -412,11 +412,7 ＠＠ struct console_methods * type##_console_
struct console
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
/* Description of this console's methods. */
struct console_methods *conmeths;
1.5 +2 -10 XEmacs/xemacs/src/console-msw-impl.h
Index: console-msw-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-msw-impl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- console-msw-impl.h 2005/04/08 23:11:21 1.4
+++ console-msw-impl.h 2005/10/24 10:07:34 1.5
＠＠ -57,11 +57,7 ＠＠ DECLARE_CONSOLE_TYPE (msprinter);
struct Lisp_Devmode
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
/* Pointer to the DEVMODE structure */
DEVMODEW *devmode;
＠＠ -279,11 +275,7 ＠＠ struct msprinter_frame
struct mswindows_dialog_id
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object frame;
Lisp_Object callbacks;
1.42 +5 -22 XEmacs/xemacs/src/console.c
Index: console.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- console.c 2005/04/08 23:11:21 1.41
+++ console.c 2005/10/24 10:07:34 1.42
＠＠ -194,18 +194,10 ＠＠ static struct console *
allocate_console (Lisp_Object type)
{
Lisp_Object console;
-#ifdef MC_ALLOC
- struct console *con = alloc_lrecord_type (struct console, &lrecord_console);
-#else /* not MC_ALLOC */
- struct console *con = alloc_lcrecord_type (struct console, &lrecord_console);
-#endif /* not MC_ALLOC */
+ struct console *con = ALLOC_LCRECORD_TYPE (struct console, &lrecord_console);
struct gcpro gcpro1;
-#ifdef MC_ALLOC
- copy_lrecord (con, XCONSOLE (Vconsole_defaults));
-#else /* not MC_ALLOC */
- copy_lcrecord (con, XCONSOLE (Vconsole_defaults));
-#endif /* not MC_ALLOC */
+ COPY_LCRECORD (con, XCONSOLE (Vconsole_defaults));
console = wrap_console (con);
GCPRO1 (console);
＠＠ -670,11 +662,7 ＠＠ find_nonminibuffer_frame_not_on_console
static void
nuke_all_console_slots (struct console *con, Lisp_Object zap)
{
-#ifdef MC_ALLOC
- zero_lrecord (con);
-#else /* not MC_ALLOC */
- zero_lcrecord (con);
-#endif /* not MC_ALLOC */
+ ZERO_LCRECORD (con);
#define MARKED_SLOT(x) con->x = zap;
#include "conslots.h"
＠＠ -1405,13 +1393,8 ＠＠ common_init_complex_vars_of_console (voi
/* Make sure all markable slots in console_defaults
are initialized reasonably, so mark_console won't choke.
*/
-#ifdef MC_ALLOC
- struct console *defs = alloc_lrecord_type (struct console, &lrecord_console);
- struct console *syms = alloc_lrecord_type (struct console, &lrecord_console);
-#else /* not MC_ALLOC */
- struct console *defs = alloc_lcrecord_type (struct console, &lrecord_console);
- struct console *syms = alloc_lcrecord_type (struct console, &lrecord_console);
-#endif /* not MC_ALLOC */
+ struct console *defs = ALLOC_LCRECORD_TYPE (struct console, &lrecord_console);
+ struct console *syms = ALLOC_LCRECORD_TYPE (struct console, &lrecord_console);
staticpro_nodump (&Vconsole_defaults);
staticpro_nodump (&Vconsole_local_symbols);
1.65 +3 -15 XEmacs/xemacs/src/data.c
Index: data.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/data.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- data.c 2005/04/08 23:11:21 1.64
+++ data.c 2005/10/24 10:07:35 1.65
＠＠ -2577,11 +2577,7 ＠＠ make_weak_list (enum weak_list_type type
{
Lisp_Object result;
struct weak_list *wl =
-#ifdef MC_ALLOC
- alloc_lrecord_type (struct weak_list, &lrecord_weak_list);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (struct weak_list, &lrecord_weak_list);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (struct weak_list, &lrecord_weak_list);
wl->list = Qnil;
wl->type = type;
＠＠ -3056,11 +3052,7 ＠＠ make_weak_box (Lisp_Object value)
Lisp_Object result;
struct weak_box *wb =
-#ifdef MC_ALLOC
- alloc_lrecord_type (struct weak_box, &lrecord_weak_box);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (struct weak_box, &lrecord_weak_box);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (struct weak_box, &lrecord_weak_box);
wb->value = value;
result = wrap_weak_box (wb);
＠＠ -3283,11 +3275,7 ＠＠ make_ephemeron(Lisp_Object key, Lisp_Obj
struct gcpro gcpro1, gcpro2;
struct ephemeron *eph =
-#ifdef MC_ALLOC
- alloc_lrecord_type (struct ephemeron, &lrecord_ephemeron);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (struct ephemeron, &lrecord_ephemeron);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (struct ephemeron, &lrecord_ephemeron);
eph->key = Qnil;
eph->cons_chain = Qnil;
1.36 +2 -10 XEmacs/xemacs/src/database.c
Index: database.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/database.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- database.c 2005/04/08 23:11:21 1.35
+++ database.c 2005/10/24 10:07:35 1.36
＠＠ -98,11 +98,7 ＠＠ typedef struct
struct Lisp_Database
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object fname;
int mode;
int access_;
＠＠ -135,11 +131,7 ＠＠ struct Lisp_Database
static Lisp_Database *
allocate_database (void)
{
-#ifdef MC_ALLOC
- Lisp_Database *db = alloc_lrecord_type (Lisp_Database, &lrecord_database);
-#else /* not MC_ALLOC */
- Lisp_Database *db = alloc_lcrecord_type (Lisp_Database, &lrecord_database);
-#endif /* not MC_ALLOC */
+ Lisp_Database *db = ALLOC_LCRECORD_TYPE (Lisp_Database, &lrecord_database);
db->fname = Qnil;
db->live_p = 0;
1.6 +1 -5 XEmacs/xemacs/src/device-impl.h
Index: device-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-impl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- device-impl.h 2005/04/08 23:11:21 1.5
+++ device-impl.h 2005/10/24 10:07:35 1.6
＠＠ -71,11 +71,7 ＠＠ struct pixel_to_glyph_translation_cache
struct device
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
/* Methods for this device's console. This can also be retrieved
through device->console, but it's faster this way. */
1.58 +1 -5 XEmacs/xemacs/src/device-msw.c
Index: device-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-msw.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- device-msw.c 2005/04/08 23:11:22 1.57
+++ device-msw.c 2005/10/24 10:07:35 1.58
＠＠ -1188,11 +1188,7 ＠＠ allocate_devmode (DEVMODEW* src_devmode,
{
Lisp_Devmode *dm;
-#ifdef MC_ALLOC
- dm = alloc_lrecord_type (Lisp_Devmode, &lrecord_devmode);
-#else /* not MC_ALLOC */
- dm = alloc_lcrecord_type (Lisp_Devmode, &lrecord_devmode);
-#endif /* not MC_ALLOC */
+ dm = ALLOC_LCRECORD_TYPE (Lisp_Devmode, &lrecord_devmode);
if (d)
dm->device = wrap_device (d);
1.35 +2 -10 XEmacs/xemacs/src/device.c
Index: device.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- device.c 2005/04/08 23:11:22 1.34
+++ device.c 2005/10/24 10:07:35 1.35
＠＠ -187,11 +187,7 ＠＠ Return a list of valid device classes.
static void
nuke_all_device_slots (struct device *d, Lisp_Object zap)
{
-#ifdef MC_ALLOC
- zero_lrecord (d);
-#else /* not MC_ALLOC */
- zero_lcrecord (d);
-#endif /* not MC_ALLOC */
+ ZERO_LCRECORD (d);
#define MARKED_SLOT(x) d->x = zap;
#include "devslots.h"
＠＠ -201,11 +197,7 ＠＠ static struct device *
allocate_device (Lisp_Object console)
{
Lisp_Object device;
-#ifdef MC_ALLOC
- struct device *d = alloc_lrecord_type (struct device, &lrecord_device);
-#else /* not MC_ALLOC */
- struct device *d = alloc_lcrecord_type (struct device, &lrecord_device);
-#endif /* not MC_ALLOC */
+ struct device *d = ALLOC_LCRECORD_TYPE (struct device, &lrecord_device);
struct gcpro gcpro1;
device = wrap_device (d);
1.34 +1 -6 XEmacs/xemacs/src/dialog-msw.c
Index: dialog-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dialog-msw.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- dialog-msw.c 2005/04/08 23:11:22 1.33
+++ dialog-msw.c 2005/10/24 10:07:35 1.34
＠＠ -751,13 +751,8 ＠＠ handle_question_dialog_box (struct frame
Lisp_Object dialog_data;
int i;
struct mswindows_dialog_id *did =
-#ifdef MC_ALLOC
- alloc_lrecord_type (struct mswindows_dialog_id,
- &lrecord_mswindows_dialog_id);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (struct mswindows_dialog_id,
+ ALLOC_LCRECORD_TYPE (struct mswindows_dialog_id,
&lrecord_mswindows_dialog_id);
-#endif /* not MC_ALLOC */
dialog_data = wrap_mswindows_dialog_id (did);
1.43 +4 -18 XEmacs/xemacs/src/elhash.c
Index: elhash.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/elhash.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- elhash.c 2005/04/08 23:11:23 1.42
+++ elhash.c 2005/10/24 10:07:35 1.43
＠＠ -102,11 +102,7 ＠＠ typedef struct htentry
struct Lisp_Hash_Table
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Elemcount size;
Elemcount count;
Elemcount rehash_count;
＠＠ -554,11 +550,7 ＠＠ make_general_lisp_hash_table (hash_table
enum hash_table_weakness weakness)
{
Lisp_Object hash_table;
-#ifdef MC_ALLOC
- Lisp_Hash_Table *ht = alloc_lrecord_type (Lisp_Hash_Table, &lrecord_hash_table);
-#else /* not MC_ALLOC */
- Lisp_Hash_Table *ht = alloc_lcrecord_type (Lisp_Hash_Table, &lrecord_hash_table);
-#endif /* not MC_ALLOC */
+ Lisp_Hash_Table *ht = ALLOC_LCRECORD_TYPE (Lisp_Hash_Table, &lrecord_hash_table);
ht->test_function = test_function;
ht->hash_function = hash_function;
＠＠ -975,14 +967,8 ＠＠ The keys and values will not themselves
(hash_table))
{
const Lisp_Hash_Table *ht_old = xhash_table (hash_table);
-#ifdef MC_ALLOC
- Lisp_Hash_Table *ht = alloc_lrecord_type (Lisp_Hash_Table, &lrecord_hash_table);
-
- copy_lrecord (ht, ht_old);
-#else /* not MC_ALLOC */
- Lisp_Hash_Table *ht = alloc_lcrecord_type (Lisp_Hash_Table, &lrecord_hash_table);
- copy_lcrecord (ht, ht_old);
-#endif /* not MC_ALLOC */
+ Lisp_Hash_Table *ht = ALLOC_LCRECORD_TYPE (Lisp_Hash_Table, &lrecord_hash_table);
+ COPY_LCRECORD (ht, ht_old);
ht->hentries = xnew_array (htentry, ht_old->size + 1);
memcpy (ht->hentries, ht_old->hentries, (ht_old->size + 1) * sizeof (htentry));
1.42 +2 -10 XEmacs/xemacs/src/events.h
Index: events.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/events.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- events.h 2005/06/26 18:05:05 1.41
+++ events.h 2005/10/24 10:07:36 1.42
＠＠ -660,11 +660,7 ＠＠ DECLARE_LRECORD (magic_data, Lisp_Magic_
struct Lisp_Timeout
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
int id; /* Id we use to identify the timeout over its lifetime */
int interval_id; /* Id for this particular interval; this may
be different each time the timeout is
＠＠ -1113,11 +1109,7 ＠＠ void event_stream_unixoid_delete_io_stre
*/
struct command_builder
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object console; /* back pointer to the console this command
builder is for */
#if 0
1.3 +2 -10 XEmacs/xemacs/src/extents-impl.h
Index: extents-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/extents-impl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- extents-impl.h 2005/04/08 23:11:24 1.2
+++ extents-impl.h 2005/10/24 10:07:36 1.3
＠＠ -103,11 +103,7 ＠＠ struct extent
typedef struct extent_auxiliary extent_auxiliary;
struct extent_auxiliary
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object begin_glyph;
Lisp_Object end_glyph;
＠＠ -133,11 +129,7 ＠＠ extern struct extent_auxiliary extent_au
struct extent_info
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
struct extent_list *extents;
struct stack_of_extents *soe;
1.61 +5 -25 XEmacs/xemacs/src/extents.c
Index: extents.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/extents.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- extents.c 2005/08/01 16:28:21 1.60
+++ extents.c 2005/10/24 10:07:36 1.61
＠＠ -986,17 +986,9 ＠＠ void
allocate_extent_auxiliary (EXTENT ext)
{
Lisp_Object extent_aux;
-#ifdef MC_ALLOC
struct extent_auxiliary *data =
- alloc_lrecord_type (struct extent_auxiliary, &lrecord_extent_auxiliary);
-
- copy_lrecord (data, &extent_auxiliary_defaults);
-#else /* not MC_ALLOC */
- struct extent_auxiliary *data =
- alloc_lcrecord_type (struct extent_auxiliary, &lrecord_extent_auxiliary);
-
- copy_lcrecord (data, &extent_auxiliary_defaults);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (struct extent_auxiliary, &lrecord_extent_auxiliary);
+ COPY_LCRECORD (data, &extent_auxiliary_defaults);
extent_aux = wrap_extent_auxiliary (data);
ext->plist = Fcons (extent_aux, ext->plist);
ext->flags.has_aux = 1;
＠＠ -1174,11 +1166,7 ＠＠ allocate_extent_info (void)
{
Lisp_Object extent_info;
struct extent_info *data =
-#ifdef MC_ALLOC
- alloc_lrecord_type (struct extent_info, &lrecord_extent_info);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (struct extent_info, &lrecord_extent_info);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (struct extent_info, &lrecord_extent_info);
extent_info = wrap_extent_info (data);
data->extents = allocate_extent_list ();
＠＠ -3909,19 +3897,11 ＠＠ copy_extent (EXTENT original, Bytexpos f
/* also need to copy the aux struct. It won't work for
this extent to share the same aux struct as the original
one. */
-#ifdef MC_ALLOC
- struct extent_auxiliary *data =
- alloc_lrecord_type (struct extent_auxiliary,
- &lrecord_extent_auxiliary);
-
- copy_lrecord (data, XEXTENT_AUXILIARY (XCAR (original->plist)));
-#else /* not MC_ALLOC */
struct extent_auxiliary *data =
- alloc_lcrecord_type (struct extent_auxiliary,
+ ALLOC_LCRECORD_TYPE (struct extent_auxiliary,
&lrecord_extent_auxiliary);
- copy_lcrecord (data, XEXTENT_AUXILIARY (XCAR (original->plist)));
-#endif /* not MC_ALLOC */
+ COPY_LCRECORD (data, XEXTENT_AUXILIARY (XCAR (original->plist)));
XCAR (e->plist) = wrap_extent_auxiliary (data);
}
1.48 +1 -5 XEmacs/xemacs/src/faces.c
Index: faces.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/faces.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- faces.c 2005/07/20 07:36:41 1.47
+++ faces.c 2005/10/24 10:07:36 1.48
＠＠ -373,11 +373,7 ＠＠ reset_face (Lisp_Face *f)
static Lisp_Face *
allocate_face (void)
{
-#ifdef MC_ALLOC
- Lisp_Face *result = alloc_lrecord_type (Lisp_Face, &lrecord_face);
-#else /* not MC_ALLOC */
- Lisp_Face *result = alloc_lcrecord_type (Lisp_Face, &lrecord_face);
-#endif /* not MC_ALLOC */
+ Lisp_Face *result = ALLOC_LCRECORD_TYPE (Lisp_Face, &lrecord_face);
reset_face (result);
return result;
1.14 +1 -5 XEmacs/xemacs/src/faces.h
Index: faces.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/faces.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- faces.h 2005/04/08 23:11:25 1.13
+++ faces.h 2005/10/24 10:07:36 1.14
＠＠ -33,11 +33,7 ＠＠ Boston, MA 02111-1307, USA. */
struct Lisp_Face
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object name;
Lisp_Object doc_string;
1.47 +1 -5 XEmacs/xemacs/src/file-coding.c
Index: file-coding.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- file-coding.c 2005/06/19 21:08:30 1.46
+++ file-coding.c 2005/10/24 10:07:36 1.47
＠＠ -1409,11 +1409,7 ＠＠ Use `define-coding-system-alias' instead
{
Lisp_Coding_System *to = XCODING_SYSTEM (new_coding_system);
Lisp_Coding_System *from = XCODING_SYSTEM (old_coding_system);
-#ifdef MC_ALLOC
- copy_sized_lrecord (to, from, sizeof_coding_system (from));
-#else /* not MC_ALLOC */
- copy_sized_lcrecord (to, from, sizeof_coding_system (from));
-#endif /* not MC_ALLOC */
+ COPY_SIZED_LCRECORD (to, from, sizeof_coding_system (from));
to->name = new_name;
}
return new_coding_system;
1.27 +1 -5 XEmacs/xemacs/src/file-coding.h
Index: file-coding.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- file-coding.h 2005/04/08 23:11:25 1.26
+++ file-coding.h 2005/10/24 10:07:37 1.27
＠＠ -188,11 +188,7 ＠＠ enum eol_type
struct Lisp_Coding_System
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
struct coding_system_methods *methods;
#define CODING_SYSTEM_SLOT_DECLARATION
1.6 +1 -5 XEmacs/xemacs/src/frame-impl.h
Index: frame-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-impl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- frame-impl.h 2005/04/08 23:11:26 1.5
+++ frame-impl.h 2005/10/24 10:07:37 1.6
＠＠ -41,11 +41,7 ＠＠ Boston, MA 02111-1307, USA. */
struct frame
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
/* Methods for this frame's console. This can also be retrieved
through frame->device->console, but it's faster this way. */
1.72 +2 -10 XEmacs/xemacs/src/frame.c
Index: frame.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- frame.c 2005/04/27 09:01:48 1.71
+++ frame.c 2005/10/24 10:07:37 1.72
＠＠ -259,11 +259,7 ＠＠ DEFINE_LRECORD_IMPLEMENTATION ("frame",
static void
nuke_all_frame_slots (struct frame *f)
{
-#ifdef MC_ALLOC
- zero_lrecord (f);
-#else /* not MC_ALLOC */
- zero_lcrecord (f);
-#endif /* not MC_ALLOC */
+ ZERO_LCRECORD (f);
#define MARKED_SLOT(x) f->x = Qnil;
#include "frameslots.h"
＠＠ -279,11 +275,7 ＠＠ allocate_frame_core (Lisp_Object device)
/* This function can GC */
Lisp_Object frame;
Lisp_Object root_window;
-#ifdef MC_ALLOC
- struct frame *f = alloc_lrecord_type (struct frame, &lrecord_frame);
-#else /* not MC_ALLOC */
- struct frame *f = alloc_lcrecord_type (struct frame, &lrecord_frame);
-#endif /* not MC_ALLOC */
+ struct frame *f = ALLOC_LCRECORD_TYPE (struct frame, &lrecord_frame);
nuke_all_frame_slots (f);
frame = wrap_frame (f);
1.54 +3 -15 XEmacs/xemacs/src/glyphs.c
Index: glyphs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- glyphs.c 2005/09/27 05:48:25 1.53
+++ glyphs.c 2005/10/24 10:07:37 1.54
＠＠ -1326,11 +1326,7 ＠＠ allocate_image_instance (Lisp_Object gov
Lisp_Object instantiator)
{
Lisp_Image_Instance *lp =
-#ifdef MC_ALLOC
- alloc_lrecord_type (Lisp_Image_Instance, &lrecord_image_instance);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (Lisp_Image_Instance, &lrecord_image_instance);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (Lisp_Image_Instance, &lrecord_image_instance);
Lisp_Object val;
/* It's not possible to simply keep a record of the domain in which
＠＠ -1997,11 +1993,7 ＠＠ instance is a mono pixmap; otherwise, th
device-specific method to copy the window-system subobject. */
new_ = allocate_image_instance (XIMAGE_INSTANCE_DOMAIN (image_instance),
Qnil, Qnil);
-#ifdef MC_ALLOC
- copy_lrecord (XIMAGE_INSTANCE (new_), XIMAGE_INSTANCE (image_instance));
-#else /* not MC_ALLOC */
- copy_lcrecord (XIMAGE_INSTANCE (new_), XIMAGE_INSTANCE (image_instance));
-#endif /* not MC_ALLOC */
+ COPY_LCRECORD (XIMAGE_INSTANCE (new_), XIMAGE_INSTANCE (image_instance));
/* note that if this method returns non-zero, this method MUST
copy any window-system resources, so that when one image instance is
freed, the other one is not hosed. */
＠＠ -3814,11 +3806,7 ＠＠ allocate_glyph (enum glyph_type type,
{
/* This function can GC */
Lisp_Object obj = Qnil;
-#ifdef MC_ALLOC
- Lisp_Glyph *g = alloc_lrecord_type (Lisp_Glyph, &lrecord_glyph);
-#else /* not MC_ALLOC */
- Lisp_Glyph *g = alloc_lcrecord_type (Lisp_Glyph, &lrecord_glyph);
-#endif /* not MC_ALLOC */
+ Lisp_Glyph *g = ALLOC_LCRECORD_TYPE (Lisp_Glyph, &lrecord_glyph);
g->type = type;
g->image = Fmake_specifier (Qimage); /* This function can GC */
1.40 +2 -10 XEmacs/xemacs/src/glyphs.h
Index: glyphs.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- glyphs.h 2005/04/08 23:11:27 1.39
+++ glyphs.h 2005/10/24 10:07:37 1.40
＠＠ -594,11 +594,7 ＠＠ struct subwindow_image_instance
struct Lisp_Image_Instance
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object domain; /* The domain in which we were cached. */
Lisp_Object device; /* The device of the domain. Recorded
since the domain may get deleted
＠＠ -950,11 +946,7 ＠＠ enum glyph_type
struct Lisp_Glyph
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
enum glyph_type type;
1.31 +1 -5 XEmacs/xemacs/src/gui.c
Index: gui.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gui.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- gui.c 2005/04/08 23:11:27 1.30
+++ gui.c 2005/10/24 10:07:37 1.31
＠＠ -197,11 +197,7 ＠＠ gui_item_init (Lisp_Object gui_item)
Lisp_Object
allocate_gui_item (void)
{
-#ifdef MC_ALLOC
- Lisp_Gui_Item *lp = alloc_lrecord_type (Lisp_Gui_Item, &lrecord_gui_item);
-#else /* not MC_ALLOC */
- Lisp_Gui_Item *lp = alloc_lcrecord_type (Lisp_Gui_Item, &lrecord_gui_item);
-#endif /* not MC_ALLOC */
+ Lisp_Gui_Item *lp = ALLOC_LCRECORD_TYPE (Lisp_Gui_Item, &lrecord_gui_item);
Lisp_Object val;
val = wrap_gui_item (lp);
1.20 +1 -5 XEmacs/xemacs/src/gui.h
Index: gui.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gui.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- gui.h 2005/04/08 23:11:27 1.19
+++ gui.h 2005/10/24 10:07:38 1.20
＠＠ -44,11 +44,7 ＠＠ extern int popup_up_p;
menu item or submenu properties */
struct Lisp_Gui_Item
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object name; /* String */
Lisp_Object callback; /* Symbol or form */
Lisp_Object callback_ex; /* Form taking context arguments */
1.58 +2 -10 XEmacs/xemacs/src/keymap.c
Index: keymap.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/keymap.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- keymap.c 2005/07/17 20:08:48 1.57
+++ keymap.c 2005/10/24 10:07:38 1.58
＠＠ -148,11 +148,7 ＠＠ Boston, MA 02111-1307, USA. */
struct Lisp_Keymap
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object parents; /* Keymaps to be searched after this one.
An ordered list */
Lisp_Object prompt; /* Qnil or a string to print in the minibuffer
＠＠ -760,11 +756,7 ＠＠ static Lisp_Object
make_keymap (Elemcount size)
{
Lisp_Object result;
-#ifdef MC_ALLOC
- Lisp_Keymap *keymap = alloc_lrecord_type (Lisp_Keymap, &lrecord_keymap);
-#else /* not MC_ALLOC */
- Lisp_Keymap *keymap = alloc_lcrecord_type (Lisp_Keymap, &lrecord_keymap);
-#endif /* not MC_ALLOC */
+ Lisp_Keymap *keymap = ALLOC_LCRECORD_TYPE (Lisp_Keymap, &lrecord_keymap);
result = wrap_keymap (keymap);
1.132 +5 -25 XEmacs/xemacs/src/lisp.h
Index: lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- lisp.h 2005/09/27 05:29:45 1.131
+++ lisp.h 2005/10/24 10:07:38 1.132
＠＠ -2372,11 +2372,7 ＠＠ DECLARE_MODULE_API_LRECORD (string, Lisp
struct Lisp_Vector
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
long size;
Lisp_Object contents[1];
};
＠＠ -2413,11 +2409,7 ＠＠ DECLARE_LRECORD (vector, Lisp_Vector);
struct Lisp_Bit_Vector
{
-#ifdef MC_ALLOC
- struct lrecord_header lheader;
-#else /* MC_ALLOC */
- struct lcrecord_header lheader;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER lheader;
Elemcount size;
unsigned long bits[1];
};
＠＠ -2778,11 +2770,7 ＠＠ void define_structure_type_keyword (stru
struct weak_box
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object value;
Lisp_Object next_weak_box; /* don't mark through this! */
＠＠ -2804,11 +2792,7 ＠＠ DECLARE_LRECORD (weak_box, struct weak_b
struct ephemeron
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object key;
＠＠ -2867,11 +2851,7 ＠＠ enum weak_list_type
struct weak_list
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object list; /* don't mark through this! */
enum weak_list_type type;
Lisp_Object next_weak; /* don't mark through this! */
1.40 +29 -23 XEmacs/xemacs/src/lrecord.h
Index: lrecord.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lrecord.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- lrecord.h 2005/10/14 01:22:00 1.39
+++ lrecord.h 2005/10/24 10:07:38 1.40
＠＠ -1,6 +1,6 ＠＠
/* The "lrecord" structure (header of a compound lisp object).
Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
- Copyright (C) 1996, 2001, 2002, 2004 Ben Wing.
+ Copyright (C) 1996, 2001, 2002, 2004, 2005 Ben Wing.
This file is part of XEmacs.
＠＠ -659,11 +659,7 ＠＠ void dec_lrecord_stats (Bytecount size_i
struct Lisp_Hash_Table
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else
- struct lcrecord_header header;
-#endif
+ struct LCRECORD_HEADER header;
Elemcount size;
Elemcount count;
Elemcount rehash_count;
＠＠ -728,11 +724,7 ＠＠ void dec_lrecord_stats (Bytecount size_i
struct Lisp_Specifier
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else
- struct lcrecord_header header;
-#endif
+ struct LCRECORD_HEADER header;
struct specifier_methods *methods;
...
＠＠ -1206,11 +1198,7 ＠＠ extern MODULE_API Lisp_Object (*lrecord_
1. Declare the struct for your object in a header file somewhere.
Remember that it must begin with
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else
- struct lcrecord_header header;
-#endif
+ struct LCRECORD_HEADER header;
2. Put the "standard junk" (DECLARE_RECORD()/XFOO/etc.) below the
struct definition -- see below.
＠＠ -1244,11 +1232,7 ＠＠ An example:
struct toolbar_button
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else
- struct lcrecord_header header;
-#endif
+ struct LCRECORD_HEADER header;
Lisp_Object next;
Lisp_Object frame;
＠＠ -1618,6 +1602,7 ＠＠ void free_managed_lcrecord (Lisp_Object
MODULE_API void *
alloc_automanaged_lcrecord (Bytecount size,
const struct lrecord_implementation *);
+
#define alloc_lcrecord_type(type, lrecord_implementation) \
((type *) alloc_automanaged_lcrecord (sizeof (type), lrecord_implementation))
＠＠ -1681,14 +1666,14 ＠＠ void free_lrecord (Lisp_Object rec);
#define copy_lrecord(dst, src) copy_sized_lrecord (dst, src, sizeof (*(dst)))
+#endif /* MC_ALLOC */
+
#define zero_sized_lrecord(lcr, size) \
memset ((char *) (lcr) + sizeof (struct lrecord_header), 0, \
(size) - sizeof (struct lrecord_header))
#define zero_lrecord(lcr) zero_sized_lrecord (lcr, sizeof (*(lcr)))
-#endif /* MC_ALLOC */
-
DECLARE_INLINE_HEADER (
Bytecount
detagged_lisp_object_size (const struct lrecord_header *h)
＠＠ -1708,6 +1693,27 ＠＠ lisp_object_size (Lisp_Object o)
{
return detagged_lisp_object_size (XRECORD_LHEADER (o));
}
+
+#ifdef MC_ALLOC
+#define ALLOC_LCRECORD_TYPE alloc_lrecord_type
+#define COPY_SIZED_LCRECORD copy_sized_lrecord
+#define COPY_LCRECORD copy_lrecord
+#define MALLOCED_STORAGE_SIZE(ptr, size, stats) \
+ mc_alloced_storage_size (size, stats)
+#define ZERO_LCRECORD zero_lrecord
+#define LCRECORD_HEADER lrecord_header
+#define BASIC_ALLOC_LCRECORD alloc_lrecord
+#define FREE_LCRECORD free_lrecord
+#else
+#define ALLOC_LCRECORD_TYPE alloc_lcrecord_type
+#define COPY_SIZED_LCRECORD copy_sized_lcrecord
+#define COPY_LCRECORD copy_lcrecord
+#define MALLOCED_STORAGE_SIZE malloced_storage_size
+#define ZERO_LCRECORD zero_lcrecord
+#define LCRECORD_HEADER lcrecord_header
+#define BASIC_ALLOC_LCRECORD basic_alloc_lcrecord
+#define FREE_LCRECORD free_lcrecord
+#endif
/************************************************************************/
1.35 +1 -0 XEmacs/xemacs/src/lstream.c
Index: lstream.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lstream.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- lstream.c 2005/04/08 23:11:29 1.34
+++ lstream.c 2005/10/24 10:07:38 1.35
＠＠ -220,6 +220,7 ＠＠ Lstream_new (const Lstream_implementatio
}
p = XLSTREAM (alloc_managed_lcrecord (Vlstream_free_list[i]));
+#define COPY_SIZED_LCRECORD copy_sized_lcrecord
#endif /* not MC_ALLOC */
/* Zero it out, except the header. */
memset ((char *) p + sizeof (p->header), '\0',
1.20 +1 -5 XEmacs/xemacs/src/lstream.h
Index: lstream.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lstream.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- lstream.h 2005/04/08 23:11:29 1.19
+++ lstream.h 2005/10/24 10:07:38 1.20
＠＠ -230,11 +230,7 ＠＠ typedef struct lstream_implementation
struct lstream
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
const Lstream_implementation *imp; /* methods for this stream */
Lstream_buffering buffering; /* type of buffering in use */
Bytecount buffering_size; /* number of bytes buffered */
1.44 +2 -10 XEmacs/xemacs/src/mule-charset.c
Index: mule-charset.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-charset.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- mule-charset.c 2005/05/15 16:38:13 1.43
+++ mule-charset.c 2005/10/24 10:07:39 1.44
＠＠ -197,11 +197,7 ＠＠ make_charset (int id, Lisp_Object name,
if (!overwrite)
{
-#ifdef MC_ALLOC
- cs = alloc_lrecord_type (Lisp_Charset, &lrecord_charset);
-#else /* not MC_ALLOC */
- cs = alloc_lcrecord_type (Lisp_Charset, &lrecord_charset);
-#endif /* not MC_ALLOC */
+ cs = ALLOC_LCRECORD_TYPE (Lisp_Charset, &lrecord_charset);
obj = wrap_charset (cs);
if (final)
＠＠ -884,11 +880,7 ＠＠ compute_charset_usage (Lisp_Object chars
{
struct Lisp_Charset *c = XCHARSET (charset);
xzero (*stats);
-#ifdef MC_ALLOC
- stats->other += mc_alloced_storage_size (sizeof (*c), ovstats);
-#else /* not MC_ALLOC */
- stats->other += malloced_storage_size (c, sizeof (*c), ovstats);
-#endif /* not MC_ALLOC */
+ stats->other += MALLOCED_STORAGE_SIZE (c, sizeof (*c), ovstats);
stats->from_unicode += compute_from_unicode_table_size (charset, ovstats);
stats->to_unicode += compute_to_unicode_table_size (charset, ovstats);
}
1.5 +2 -10 XEmacs/xemacs/src/objects-impl.h
Index: objects-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-impl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- objects-impl.h 2005/04/08 23:11:30 1.4
+++ objects-impl.h 2005/10/24 10:07:39 1.5
＠＠ -99,11 +99,7 ＠＠ extern Lisp_Object Qface_boolean;
struct Lisp_Color_Instance
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object name;
Lisp_Object device;
＠＠ -123,11 +119,7 ＠＠ struct Lisp_Color_Instance
struct Lisp_Font_Instance
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object name; /* the instantiator used to create the font instance */
Lisp_Object truename; /* used by the device-specific methods; we need to
call them to get the truename (#### in reality,
1.29 +4 -20 XEmacs/xemacs/src/objects.c
Index: objects.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- objects.c 2005/04/08 23:11:30 1.28
+++ objects.c 2005/10/24 10:07:39 1.29
＠＠ -178,11 +178,7 ＠＠ is deallocated as well.
CHECK_STRING (name);
device = wrap_device (decode_device (device));
-#ifdef MC_ALLOC
- c = alloc_lrecord_type (Lisp_Color_Instance, &lrecord_color_instance);
-#else /* not MC_ALLOC */
- c = alloc_lcrecord_type (Lisp_Color_Instance, &lrecord_color_instance);
-#endif /* not MC_ALLOC */
+ c = ALLOC_LCRECORD_TYPE (Lisp_Color_Instance, &lrecord_color_instance);
c->name = name;
c->device = device;
c->data = 0;
＠＠ -391,11 +387,7 ＠＠ these objects are GCed, the underlying X
device = wrap_device (decode_device (device));
-#ifdef MC_ALLOC
- f = alloc_lrecord_type (Lisp_Font_Instance, &lrecord_font_instance);
-#else /* not MC_ALLOC */
- f = alloc_lcrecord_type (Lisp_Font_Instance, &lrecord_font_instance);
-#endif /* not MC_ALLOC */
+ f = ALLOC_LCRECORD_TYPE (Lisp_Font_Instance, &lrecord_font_instance);
f->name = name;
f->truename = Qnil;
f->device = device;
＠＠ -1206,11 +1198,7 ＠＠ reinit_vars_of_objects (void)
staticpro_nodump (&Vthe_null_color_instance);
{
Lisp_Color_Instance *c =
-#ifdef MC_ALLOC
- alloc_lrecord_type (Lisp_Color_Instance, &lrecord_color_instance);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (Lisp_Color_Instance, &lrecord_color_instance);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (Lisp_Color_Instance, &lrecord_color_instance);
c->name = Qnil;
c->device = Qnil;
c->data = 0;
＠＠ -1221,11 +1209,7 ＠＠ reinit_vars_of_objects (void)
staticpro_nodump (&Vthe_null_font_instance);
{
Lisp_Font_Instance *f =
-#ifdef MC_ALLOC
- alloc_lrecord_type (Lisp_Font_Instance, &lrecord_font_instance);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (Lisp_Font_Instance, &lrecord_font_instance);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (Lisp_Font_Instance, &lrecord_font_instance);
f->name = Qnil;
f->truename = Qnil;
f->device = Qnil;
1.21 +1 -5 XEmacs/xemacs/src/opaque.c
Index: opaque.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/opaque.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- opaque.c 2005/04/08 23:11:30 1.20
+++ opaque.c 2005/10/24 10:07:39 1.21
＠＠ -75,11 +75,7 ＠＠ Lisp_Object
make_opaque (const void *data, Bytecount size)
{
Lisp_Opaque *p = (Lisp_Opaque *)
-#ifdef MC_ALLOC
- alloc_lrecord (aligned_sizeof_opaque (size), &lrecord_opaque);
-#else /* not MC_ALLOC */
- basic_alloc_lcrecord (aligned_sizeof_opaque (size), &lrecord_opaque);
-#endif /* not MC_ALLOC */
+ BASIC_ALLOC_LCRECORD (aligned_sizeof_opaque (size), &lrecord_opaque);
p->size = size;
if (data == OPAQUE_CLEAR)
1.11 +2 -10 XEmacs/xemacs/src/opaque.h
Index: opaque.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/opaque.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- opaque.h 2005/04/08 23:11:30 1.10
+++ opaque.h 2005/10/24 10:07:39 1.11
＠＠ -28,11 +28,7 ＠＠ Boston, MA 02111-1307, USA. */
typedef struct Lisp_Opaque
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Bytecount size;
max_align_t data[1];
} Lisp_Opaque;
＠＠ -58,11 +54,7 ＠＠ Lisp_Object make_opaque (const void *dat
typedef struct Lisp_Opaque_Ptr
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
void *ptr;
} Lisp_Opaque_Ptr;
1.55 +1 -7 XEmacs/xemacs/src/print.c
Index: print.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/print.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- print.c 2005/04/14 09:44:27 1.54
+++ print.c 2005/10/24 10:07:39 1.55
＠＠ -1453,13 +1453,7 ＠＠ static void
default_object_printer (Lisp_Object obj, Lisp_Object printcharfun,
int UNUSED (escapeflag))
{
-#ifdef MC_ALLOC
- struct lrecord_header *header =
- (struct lrecord_header *) XPNTR (obj);
-#else /* not MC_ALLOC */
- struct lcrecord_header *header =
- (struct lcrecord_header *) XPNTR (obj);
-#endif /* not MC_ALLOC */
+ struct LCRECORD_HEADER *header = (struct LCRECORD_HEADER *) XPNTR (obj);
if (print_readably)
printing_unreadable_object
1.68 +1 -5 XEmacs/xemacs/src/process.c
Index: process.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- process.c 2005/04/08 23:11:31 1.67
+++ process.c 2005/10/24 10:07:39 1.68
＠＠ -483,11 +483,7 ＠＠ make_process_internal (Lisp_Object name)
{
Lisp_Object val, name1;
int i;
-#ifdef MC_ALLOC
- Lisp_Process *p = alloc_lrecord_type (Lisp_Process, &lrecord_process);
-#else /* not MC_ALLOC */
- Lisp_Process *p = alloc_lcrecord_type (Lisp_Process, &lrecord_process);
-#endif /* not MC_ALLOC */
+ Lisp_Process *p = ALLOC_LCRECORD_TYPE (Lisp_Process, &lrecord_process);
#define MARKED_SLOT(x) p->x = Qnil;
#include "process-slots.h"
1.14 +1 -5 XEmacs/xemacs/src/procimpl.h
Index: procimpl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/procimpl.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- procimpl.h 2005/04/08 23:11:31 1.13
+++ procimpl.h 2005/10/24 10:07:39 1.14
＠＠ -94,11 +94,7 ＠＠ extern struct process_methods the_proces
struct Lisp_Process
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
/* Exit code if process has terminated,
signal which stopped/interrupted process
1.25 +2 -11 XEmacs/xemacs/src/rangetab.c
Index: rangetab.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/rangetab.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- rangetab.c 2005/09/26 08:29:31 1.24
+++ rangetab.c 2005/10/24 10:07:40 1.25
＠＠ -328,13 +328,8 ＠＠ Range tables allow you to efficiently se
*/
(type))
{
-#ifdef MC_ALLOC
- Lisp_Range_Table *rt = alloc_lrecord_type (Lisp_Range_Table,
- &lrecord_range_table);
-#else /* not MC_ALLOC */
- Lisp_Range_Table *rt = alloc_lcrecord_type (Lisp_Range_Table,
+ Lisp_Range_Table *rt = ALLOC_LCRECORD_TYPE (Lisp_Range_Table,
&lrecord_range_table);
-#endif /* not MC_ALLOC */
rt->entries = Dynarr_new (range_table_entry);
rt->type = range_table_symbol_to_type (type);
return wrap_range_table (rt);
＠＠ -352,11 +347,7 ＠＠ The values will not themselves be copied
CHECK_RANGE_TABLE (range_table);
rt = XRANGE_TABLE (range_table);
-#ifdef MC_ALLOC
- rtnew = alloc_lrecord_type (Lisp_Range_Table, &lrecord_range_table);
-#else /* not MC_ALLOC */
- rtnew = alloc_lcrecord_type (Lisp_Range_Table, &lrecord_range_table);
-#endif /* not MC_ALLOC */
+ rtnew = ALLOC_LCRECORD_TYPE (Lisp_Range_Table, &lrecord_range_table);
rtnew->entries = Dynarr_new (range_table_entry);
rtnew->type = rt->type;
1.8 +1 -5 XEmacs/xemacs/src/rangetab.h
Index: rangetab.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/rangetab.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rangetab.h 2005/04/08 23:11:31 1.7
+++ rangetab.h 2005/10/24 10:07:40 1.8
＠＠ -49,11 +49,7 ＠＠ enum range_table_type
struct Lisp_Range_Table
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
range_table_entry_dynarr *entries;
enum range_table_type type;
};
1.18 +1 -5 XEmacs/xemacs/src/scrollbar-gtk.c
Index: scrollbar-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-gtk.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- scrollbar-gtk.c 2005/04/08 23:11:31 1.17
+++ scrollbar-gtk.c 2005/10/24 10:07:40 1.18
＠＠ -484,11 +484,7 ＠＠ gtk_compute_scrollbar_instance_usage (st
struct gtk_scrollbar_data *data =
(struct gtk_scrollbar_data *) inst->scrollbar_data;
-#ifdef MC_ALLOC
- total += mc_alloced_storage_size (sizeof (*data), ovstats);
-#else /* not MC_ALLOC */
- total += malloced_storage_size (data, sizeof (*data), ovstats);
-#endif /* not MC_ALLOC */
+ total += MALLOCED_STORAGE_SIZE (data, sizeof (*data), ovstats);
inst = inst->next;
}
1.30 +1 -5 XEmacs/xemacs/src/scrollbar-msw.c
Index: scrollbar-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-msw.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- scrollbar-msw.c 2005/04/08 23:11:32 1.29
+++ scrollbar-msw.c 2005/10/24 10:07:40 1.30
＠＠ -433,11 +433,7 ＠＠ mswindows_compute_scrollbar_instance_usa
struct mswindows_scrollbar_data *data =
(struct mswindows_scrollbar_data *) inst->scrollbar_data;
-#ifdef MC_ALLOC
- total += mc_alloced_storage_size (sizeof (*data), ovstats);
-#else /* not MC_ALLOC */
- total += malloced_storage_size (data, sizeof (*data), ovstats);
-#endif /* not MC_ALLOC */
+ total += MALLOCED_STORAGE_SIZE (data, sizeof (*data), ovstats);
inst = inst->next;
}
1.30 +2 -7 XEmacs/xemacs/src/scrollbar-x.c
Index: scrollbar-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-x.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- scrollbar-x.c 2005/04/08 23:11:32 1.29
+++ scrollbar-x.c 2005/10/24 10:07:40 1.30
＠＠ -703,14 +703,9 ＠＠ x_compute_scrollbar_instance_usage (stru
struct x_scrollbar_data *data =
(struct x_scrollbar_data *) inst->scrollbar_data;
-#ifdef MC_ALLOC
- total += mc_alloced_storage_size (sizeof (*data), ovstats);
- total += mc_alloced_storage_size (1 + strlen (data->name), ovstats);
-#else /* not MC_ALLOC */
- total += malloced_storage_size (data, sizeof (*data), ovstats);
- total += malloced_storage_size (data->name, 1 + strlen (data->name),
+ total += MALLOCED_STORAGE_SIZE (data, sizeof (*data), ovstats);
+ total += MALLOCED_STORAGE_SIZE (data->name, 1 + strlen (data->name),
ovstats);
-#endif /* not MC_ALLOC */
inst = inst->next;
}
1.35 +2 -11 XEmacs/xemacs/src/scrollbar.c
Index: scrollbar.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- scrollbar.c 2005/04/08 23:11:32 1.34
+++ scrollbar.c 2005/10/24 10:07:40 1.35
＠＠ -199,13 +199,8 ＠＠ create_scrollbar_instance (struct frame
{
struct device *d = XDEVICE (f->device);
struct scrollbar_instance *instance =
-#ifdef MC_ALLOC
- alloc_lrecord_type (struct scrollbar_instance,
- &lrecord_scrollbar_instance);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (struct scrollbar_instance,
+ ALLOC_LCRECORD_TYPE (struct scrollbar_instance,
&lrecord_scrollbar_instance);
-#endif /* not MC_ALLOC */
MAYBE_DEVMETH (d, create_scrollbar_instance, (f, vertical, instance));
＠＠ -277,11 +272,7 ＠＠ compute_scrollbar_instance_usage (struct
while (inst)
{
-#ifdef MC_ALLOC
- total += mc_alloced_storage_size (sizeof (*inst), ovstats);
-#else /* not MC_ALLOC */
- total += malloced_storage_size (inst, sizeof (*inst), ovstats);
-#endif /* not MC_ALLOC */
+ total += MALLOCED_STORAGE_SIZE (inst, sizeof (*inst), ovstats);
inst = inst->next;
}
1.7 +1 -5 XEmacs/xemacs/src/scrollbar.h
Index: scrollbar.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- scrollbar.h 2005/04/08 23:11:32 1.6
+++ scrollbar.h 2005/10/24 10:07:40 1.7
＠＠ -27,11 +27,7 ＠＠ Boston, MA 02111-1307, USA. */
struct scrollbar_instance
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
/* Used by the frame caches. */
struct scrollbar_instance *next;
1.42 +1 -6 XEmacs/xemacs/src/specifier.c
Index: specifier.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/specifier.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- specifier.c 2005/09/26 08:41:51 1.41
+++ specifier.c 2005/10/24 10:07:40 1.42
＠＠ -493,13 +493,8 ＠＠ make_specifier_internal (struct specifie
{
Lisp_Object specifier;
Lisp_Specifier *sp = (Lisp_Specifier *)
-#ifdef MC_ALLOC
- alloc_lrecord (aligned_sizeof_specifier (data_size),
- &lrecord_specifier);
-#else /* not MC_ALLOC */
- basic_alloc_lcrecord (aligned_sizeof_specifier (data_size),
+ BASIC_ALLOC_LCRECORD (aligned_sizeof_specifier (data_size),
&lrecord_specifier);
-#endif /* not MC_ALLOC */
sp->methods = spec_meths;
sp->global_specs = Qnil;
1.18 +1 -5 XEmacs/xemacs/src/specifier.h
Index: specifier.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/specifier.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- specifier.h 2005/04/08 23:11:33 1.17
+++ specifier.h 2005/10/24 10:07:41 1.18
＠＠ -216,11 +216,7 ＠＠ struct specifier_methods
struct Lisp_Specifier
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
struct specifier_methods *methods;
/* we keep a chained list of all current specifiers, for GC cleanup
1.53 +4 -24 XEmacs/xemacs/src/symbols.c
Index: symbols.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symbols.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- symbols.c 2005/10/14 01:22:01 1.52
+++ symbols.c 2005/10/24 10:07:41 1.53
＠＠ -2187,13 +2187,8 ＠＠ sets it.
{
struct symbol_value_buffer_local *bfwd
-#ifdef MC_ALLOC
- = alloc_lrecord_type (struct symbol_value_buffer_local,
- &lrecord_symbol_value_buffer_local);
-#else /* not MC_ALLOC */
- = alloc_lcrecord_type (struct symbol_value_buffer_local,
+ = ALLOC_LCRECORD_TYPE (struct symbol_value_buffer_local,
&lrecord_symbol_value_buffer_local);
-#endif /* not MC_ALLOC */
Lisp_Object foo;
bfwd->magic.type = SYMVAL_BUFFER_LOCAL;
＠＠ -2300,13 +2295,8 ＠＠ Use `make-local-hook' instead.
}
/* Make sure variable is set up to hold per-buffer values */
-#ifdef MC_ALLOC
- bfwd = alloc_lrecord_type (struct symbol_value_buffer_local,
- &lrecord_symbol_value_buffer_local);
-#else /* not MC_ALLOC */
- bfwd = alloc_lcrecord_type (struct symbol_value_buffer_local,
+ bfwd = ALLOC_LCRECORD_TYPE (struct symbol_value_buffer_local,
&lrecord_symbol_value_buffer_local);
-#endif /* not MC_ALLOC */
bfwd->magic.type = SYMVAL_SOME_BUFFER_LOCAL;
bfwd->current_buffer = Qnil;
＠＠ -3025,13 +3015,8 ＠＠ pity, thereby invalidating your code.
valcontents = XSYMBOL (variable)->value;
if (!SYMBOL_VALUE_LISP_MAGIC_P (valcontents))
{
-#ifdef MC_ALLOC
- bfwd = alloc_lrecord_type (struct symbol_value_lisp_magic,
- &lrecord_symbol_value_lisp_magic);
-#else /* MC_ALLOC */
- bfwd = alloc_lcrecord_type (struct symbol_value_lisp_magic,
+ bfwd = ALLOC_LCRECORD_TYPE (struct symbol_value_lisp_magic,
&lrecord_symbol_value_lisp_magic);
-#endif /* not MC_ALLOC */
bfwd->magic.type = SYMVAL_LISP_MAGIC;
for (i = 0; i < MAGIC_HANDLER_MAX; i++)
{
＠＠ -3166,13 +3151,8 ＠＠ has a buffer-local value in any buffer,
invalid_change ("Variable is magic and cannot be aliased", variable);
reject_constant_symbols (variable, Qunbound, 0, Qt);
-#ifdef MC_ALLOC
- bfwd = alloc_lrecord_type (struct symbol_value_varalias,
- &lrecord_symbol_value_varalias);
-#else /* not MC_ALLOC */
- bfwd = alloc_lcrecord_type (struct symbol_value_varalias,
+ bfwd = ALLOC_LCRECORD_TYPE (struct symbol_value_varalias,
&lrecord_symbol_value_varalias);
-#endif /* not MC_ALLOC */
bfwd->magic.type = SYMVAL_VARALIAS;
bfwd->aliasee = alias;
bfwd->shadowed = valcontents;
1.15 +1 -5 XEmacs/xemacs/src/symeval.h
Index: symeval.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symeval.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- symeval.h 2005/06/16 19:59:35 1.14
+++ symeval.h 2005/10/24 10:07:41 1.15
＠＠ -77,11 +77,7 ＠＠ typedef EMACS_INT Fixnum;
struct symbol_value_magic
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header lcheader;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
void *value;
enum symbol_value_type type;
};
1.36 +1 -5 XEmacs/xemacs/src/toolbar.c
Index: toolbar.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- toolbar.c 2005/04/08 23:11:34 1.35
+++ toolbar.c 2005/10/24 10:07:41 1.36
＠＠ -303,11 +303,7 ＠＠ update_toolbar_button (struct frame *f,
if (!tb)
{
-#ifdef MC_ALLOC
- tb = alloc_lrecord_type (struct toolbar_button, &lrecord_toolbar_button);
-#else /* not MC_ALLOC */
- tb = alloc_lcrecord_type (struct toolbar_button, &lrecord_toolbar_button);
-#endif /* not MC_ALLOC */
+ tb = ALLOC_LCRECORD_TYPE (struct toolbar_button, &lrecord_toolbar_button);
tb->next = Qnil;
tb->frame = wrap_frame (f);
tb->up_glyph = Qnil;
1.15 +1 -5 XEmacs/xemacs/src/toolbar.h
Index: toolbar.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- toolbar.h 2005/04/08 23:11:34 1.14
+++ toolbar.h 2005/10/24 10:07:41 1.15
＠＠ -38,11 +38,7 ＠＠ Boston, MA 02111-1307, USA. */
struct toolbar_button
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object next;
Lisp_Object frame;
1.35 +4 -20 XEmacs/xemacs/src/tooltalk.c
Index: tooltalk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/tooltalk.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- tooltalk.c 2005/06/28 11:32:15 1.34
+++ tooltalk.c 2005/10/24 10:07:41 1.35
＠＠ -147,11 +147,7 ＠＠ Lisp_Object Qtooltalk_messagep;
struct Lisp_Tooltalk_Message
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object plist_sym, callback;
Tt_message m;
};
＠＠ -195,11 +191,7 ＠＠ make_tooltalk_message (Tt_message m)
{
Lisp_Object val;
Lisp_Tooltalk_Message *msg =
-#ifdef MC_ALLOC
- alloc_lrecord_type (Lisp_Tooltalk_Message, &lrecord_tooltalk_message);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (Lisp_Tooltalk_Message, &lrecord_tooltalk_message);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (Lisp_Tooltalk_Message, &lrecord_tooltalk_message);
msg->m = m;
msg->callback = Qnil;
＠＠ -233,11 +225,7 ＠＠ Lisp_Object Qtooltalk_patternp;
struct Lisp_Tooltalk_Pattern
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
Lisp_Object plist_sym, callback;
Tt_pattern p;
};
＠＠ -280,11 +268,7 ＠＠ static Lisp_Object
make_tooltalk_pattern (Tt_pattern p)
{
Lisp_Tooltalk_Pattern *pat =
-#ifdef MC_ALLOC
- alloc_lrecord_type (Lisp_Tooltalk_Pattern, &lrecord_tooltalk_pattern);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (Lisp_Tooltalk_Pattern, &lrecord_tooltalk_pattern);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (Lisp_Tooltalk_Pattern, &lrecord_tooltalk_pattern);
Lisp_Object val;
pat->p = p;
1.24 +3 -17 XEmacs/xemacs/src/ui-gtk.c
Index: ui-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ui-gtk.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ui-gtk.c 2005/04/08 23:11:34 1.23
+++ ui-gtk.c 2005/10/24 10:07:41 1.24
＠＠ -280,11 +280,7 ＠＠ import_gtk_type (GtkType t)
static emacs_ffi_data *
allocate_ffi_data (void)
{
-#ifdef MC_ALLOC
- emacs_ffi_data *data = alloc_lrecord_type (emacs_ffi_data, &lrecord_emacs_ffi);
-#else /* not MC_ALLOC */
- emacs_ffi_data *data = alloc_lcrecord_type (emacs_ffi_data, &lrecord_emacs_ffi);
-#endif /* not MC_ALLOC */
+ emacs_ffi_data *data = ALLOC_LCRECORD_TYPE (emacs_ffi_data, &lrecord_emacs_ffi);
data->return_type = GTK_TYPE_NONE;
data->n_args = 0;
＠＠ -948,13 +944,8 ＠＠ DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS
static emacs_gtk_object_data *
allocate_emacs_gtk_object_data (void)
{
-#ifdef MC_ALLOC
- emacs_gtk_object_data *data = alloc_lrecord_type (emacs_gtk_object_data,
- &lrecord_emacs_gtk_object);
-#else /* not MC_ALLOC */
- emacs_gtk_object_data *data = alloc_lcrecord_type (emacs_gtk_object_data,
+ emacs_gtk_object_data *data = ALLOC_LCRECORD_TYPE (emacs_gtk_object_data,
&lrecord_emacs_gtk_object);
-#endif /* not MC_ALLOC */
data->object = NULL;
data->alive_p = FALSE;
＠＠ -1162,13 +1153,8 ＠＠ DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS
static emacs_gtk_boxed_data *
allocate_emacs_gtk_boxed_data (void)
{
-#ifdef MC_ALLOC
- emacs_gtk_boxed_data *data = alloc_lrecord_type (emacs_gtk_boxed_data,
- &lrecord_emacs_gtk_boxed);
-#else /* not MC_ALLOC */
- emacs_gtk_boxed_data *data = alloc_lcrecord_type (emacs_gtk_boxed_data,
+ emacs_gtk_boxed_data *data = ALLOC_LCRECORD_TYPE (emacs_gtk_boxed_data,
&lrecord_emacs_gtk_boxed);
-#endif /* not MC_ALLOC */
data->object = NULL;
data->object_type = GTK_TYPE_INVALID;
1.7 +3 -15 XEmacs/xemacs/src/ui-gtk.h
Index: ui-gtk.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ui-gtk.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ui-gtk.h 2005/04/08 23:11:34 1.6
+++ ui-gtk.h 2005/10/24 10:07:41 1.7
＠＠ -21,11 +21,7 ＠＠ typedef void (*ffi_marshalling_function)
#define MAX_GTK_ARGS 100
typedef struct {
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
GtkType return_type;
GtkType args[MAX_GTK_ARGS];
gint n_args;
＠＠ -43,11 +39,7 ＠＠ DECLARE_LRECORD (emacs_ffi, emacs_ffi_da
/* Encapsulate a GtkObject in Lisp */
typedef struct {
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
gboolean alive_p;
GtkObject *object;
Lisp_Object plist;
＠＠ -64,11 +56,7 ＠＠ extern Lisp_Object build_gtk_object (Gtk
/* Encapsulate a GTK_TYPE_BOXED in lisp */
typedef struct {
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
GtkType object_type;
void *object;
} emacs_gtk_boxed_data;
1.29 +2 -12 XEmacs/xemacs/src/unicode.c
Index: unicode.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unicode.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- unicode.c 2005/04/08 23:11:34 1.28
+++ unicode.c 2005/10/24 10:07:42 1.29
＠＠ -548,15 +548,10 ＠＠ compute_from_unicode_table_size_1 (void
}
}
-#ifdef MC_ALLOC
- size += mc_alloced_storage_size (256 * (level == 1 ? sizeof (short) :
- sizeof (void *)), stats);
-#else /* not MC_ALLOC */
- size += malloced_storage_size (table,
+ size += MALLOCED_STORAGE_SIZE (table,
256 * (level == 1 ? sizeof (short) :
sizeof (void *)),
stats);
-#endif /* not MC_ALLOC */
return size;
}
＠＠ -578,15 +573,10 ＠＠ compute_to_unicode_table_size_1 (void *t
}
}
-#ifdef MC_ALLOC
- size += mc_alloced_storage_size (96 * (level == 1 ? sizeof (int) :
- sizeof (void *)), stats);
-#else /* not MC_ALLOC */
- size += malloced_storage_size (table,
+ size += MALLOCED_STORAGE_SIZE (table,
96 * (level == 1 ? sizeof (int) :
sizeof (void *)),
stats);
-#endif /* not MC_ALLOC */
return size;
}
1.3 +2 -10 XEmacs/xemacs/src/window-impl.h
Index: window-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/window-impl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- window-impl.h 2005/04/08 23:11:35 1.2
+++ window-impl.h 2005/10/24 10:07:42 1.3
＠＠ -84,11 +84,7 ＠＠ the window configuration. */
struct window
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
/* The upper left corner coordinates of this window,
as integers (pixels) relative to upper left corner of frame = 0, 0 */
＠＠ -172,11 +168,7 ＠＠ struct window
struct window_mirror
{
-#ifdef MC_ALLOC
- struct lrecord_header header;
-#else /* MC_ALLOC */
- struct lcrecord_header header;
-#endif /* MC_ALLOC */
+ struct LCRECORD_HEADER header;
/* Frame this mirror is on. */
struct frame *frame;
1.86 +6 -31 XEmacs/xemacs/src/window.c
Index: window.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/window.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- window.c 2005/05/15 16:38:14 1.85
+++ window.c 2005/10/24 10:07:42 1.86
＠＠ -346,11 +346,7 ＠＠ DEFINE_LRECORD_IMPLEMENTATION ("window",
Lisp_Object
allocate_window (void)
{
-#ifdef MC_ALLOC
- struct window *p = alloc_lrecord_type (struct window, &lrecord_window);
-#else /* not MC_ALLOC */
- struct window *p = alloc_lcrecord_type (struct window, &lrecord_window);
-#endif /* not MC_ALLOC */
+ struct window *p = ALLOC_LCRECORD_TYPE (struct window, &lrecord_window);
Lisp_Object val = wrap_window (p);
#define WINDOW_SLOT(slot) p->slot = Qnil;
＠＠ -487,11 +483,7 ＠＠ static struct window_mirror *
new_window_mirror (struct frame *f)
{
struct window_mirror *t =
-#ifdef MC_ALLOC
- alloc_lrecord_type (struct window_mirror, &lrecord_window_mirror);
-#else /* not MC_ALLOC */
- alloc_lcrecord_type (struct window_mirror, &lrecord_window_mirror);
-#endif /* not MC_ALLOC */
+ ALLOC_LCRECORD_TYPE (struct window_mirror, &lrecord_window_mirror);
t->frame = f;
t->current_display_lines = Dynarr_new (display_line);
＠＠ -3810,18 +3802,10 ＠＠ make_dummy_parent (Lisp_Object window)
{
Lisp_Object new;
struct window *o = XWINDOW (window);
-#ifdef MC_ALLOC
- struct window *p = alloc_lrecord_type (struct window, &lrecord_window);
-#else /* not MC_ALLOC */
- struct window *p = alloc_lcrecord_type (struct window, &lrecord_window);
-#endif /* not MC_ALLOC */
+ struct window *p = ALLOC_LCRECORD_TYPE (struct window, &lrecord_window);
new = wrap_window (p);
-#ifdef MC_ALLOC
- copy_lrecord (p, o);
-#else /* MC_ALLOC */
- copy_lcrecord (p, o);
-#endif /* MC_ALLOC */
+ COPY_LCRECORD (p, o);
/* Don't copy the pointers to the line start cache or the face
instances. */
＠＠ -5112,13 +5096,8 ＠＠ compute_window_mirror_usage (struct wind
{
if (!mir)
return;
-#ifdef MC_ALLOC
- stats->other += mc_alloced_storage_size (sizeof (struct window_mirror),
- ovstats);
-#else /* not MC_ALLOC */
- stats->other += malloced_storage_size (mir, sizeof (struct window_mirror),
+ stats->other += MALLOCED_STORAGE_SIZE (mir, sizeof (struct window_mirror),
ovstats);
-#endif /* not MC_ALLOC */
#ifdef HAVE_SCROLLBARS
{
struct device *d = XDEVICE (FRAME_DEVICE (mir->frame));
＠＠ -5142,11 +5121,7 ＠＠ compute_window_usage (struct window *w,
struct overhead_stats *ovstats)
{
xzero (*stats);
-#ifdef MC_ALLOC
- stats->other += mc_alloced_storage_size (sizeof (struct window), ovstats);
-#else /* not MC_ALLOC */
- stats->other += malloced_storage_size (w, sizeof (struct window), ovstats);
-#endif /* not MC_ALLOC */
+ stats->other += MALLOCED_STORAGE_SIZE (w, sizeof (struct window), ovstats);
stats->face += compute_face_cachel_usage (w->face_cachels, ovstats);
stats->glyph += compute_glyph_cachel_usage (w->glyph_cachels, ovstats);
stats->line_start +=
- 1 participants
- 0 comments