Mercurial > hg > xemacs-beta

changeset 58:8b0bdfdf0cf0 r19-16-pre4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-16-pre4
author cvs
date Mon, 13 Aug 2007 08:58:37 +0200
parents 14ab9e17efe0
children 37115eea810c
files CHANGES-beta configure configure.in etc/JOKES etc/celibacy.1 etc/condom.1 etc/sex.6 lisp/prim/about.el lisp/version.el man/internals/internals.texi src/doprnt.c src/s/decosf4-0.h src/s/irix6-0.h src/unexelfsgi.c
diffstat 14 files changed, 967 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES-beta	Mon Aug 13 08:58:21 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 08:58:37 2007 +0200
@@ -1,4 +1,8 @@
 							-*- indented-text -*-
+to 19.16 pre4 -- "Bronx"
+-- etc/Joke files restored
+-- Various build patches from Darrell Kindred
+
 to 19.16 pre3 -- "Manhattan"
 -- NEWS file updated
 -- a couple of synchs with XEmacs 20.2
--- a/configure	Mon Aug 13 08:58:21 2007 +0200
+++ b/configure	Mon Aug 13 08:58:37 2007 +0200
@@ -1606,6 +1606,7 @@
   ## XEmacs: Add switch for Digital Unix version 4 (srivasta@pilgrim.umass.edu)
   alpha-dec-osf4* )
     machine=alpha opsys=decosf4-0
+    NON_GNU_CPP="/lib/cpp"
   ;;
 
   alpha-*-linux* )
--- a/configure.in	Mon Aug 13 08:58:21 2007 +0200
+++ b/configure.in	Mon Aug 13 08:58:37 2007 +0200
@@ -1612,6 +1612,7 @@
   ## XEmacs: Add switch for Digital Unix version 4 (srivasta@pilgrim.umass.edu)
   alpha-dec-osf4* )
     machine=alpha opsys=decosf4-0
+    NON_GNU_CPP="/lib/cpp"
   ;;
 
   alpha-*-linux* )
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/JOKES	Mon Aug 13 08:58:37 2007 +0200
@@ -0,0 +1,642 @@
+From:  Don Chiasson <G.CHIASSON@DREA-XX.ARPA>
+Subject: Some gnu jokes
+To: jokes@DREA-XX.ARPA, gergely@DREA-XX.ARPA, broome@DREA-XX.ARPA
+cc: G.CHIASSON@DREA-XX.ARPA
+Message-ID: <12329394624.13.G.CHIASSON@DREA-XX.ARPA>
+
+     Richard M. Stallman (RMS, widely known for creating EMACS) is writing
+a UNIX clone called GNU (which means Gnu's Not Unix--a recursive acronym).
+This seems to open the way to a whole gnu class of jokes.  For example:
+
+Q:  What do you call a person who hacks while wearing no clothes?
+A:  A gnudist.
+
+Q:  What do you call an eligible young hacker?
+A:  Gnubile.
+
+Q:  What is a hacker's favorite candy?
+A:  Gnugat.   (Though it contains little gnutrition.)
+
+Q:  What do you call a computer filled with air?
+A:  Gnumatic.
+
+Q:  What do you call a novice hacker who keeps pestering you 
+    with foolish questions?
+A:  A gnuisance.
+
+Q:  What do you call a subtle, clever hack in the favorite language?
+A:  A gnuanCe.
+
+Q:  What do you use a supercomputer for?
+A:  Gnumerical analysis.
+
+Q:  What do you call a hacker who collects coins?
+A:  A gnumismatist.
+
+     Well, there are more, just too gnumerous to tell all at once.  I think
+I'd better go before someone starts firing gnuclear weapons at me.
+		Don
+
+From: patl@athena.mit.edu (Patrick J. LoPresti)
+Message-ID: <1991Jul11.031731.9260@athena.mit.edu>
+Sender: news@athena.mit.edu (News system)
+Subject: The True Path (long)
+Date: 11 Jul 91 03:17:31 GMT
+Path: ai-lab!mintaka!olivea!samsung!zaphod.mps.ohio-state.edu!think.com!snorkelwacker.mit.edu!bloom-picayune.mit.edu!athena.mit.edu!patl
+Newsgroups: alt.religion.emacs,alt.slack
+Organization: Massachusetts Institute of Technology
+Lines: 95
+Xref: ai-lab alt.religion.emacs:244 alt.slack:1935
+
+When I log into my Xenix system with my 110 baud teletype, both vi
+*and* Emacs are just too damn slow.  They print useless messages like,
+'C-h for help' and '"foo" File is read only'.  So I use the editor
+that doesn't waste my VALUABLE time.
+
+Ed, man!  !man ed
+
+ED(1)               UNIX Programmer's Manual                ED(1)
+
+NAME
+     ed - text editor
+
+SYNOPSIS
+     ed [ - ] [ -x ] [ name ]
+DESCRIPTION
+     Ed is the standard text editor.
+---
+
+Computer Scientists love ed, not just because it comes first
+alphabetically, but because it's the standard.  Everyone else loves ed
+because it's ED!
+
+"Ed is the standard text editor."
+
+And ed doesn't waste space on my Timex Sinclair.  Just look:
+
+-rwxr-xr-x  1 root          24 Oct 29  1929 /bin/ed
+-rwxr-xr-t  4 root     1310720 Jan  1  1970 /usr/ucb/vi
+-rwxr-xr-x  1 root  5.89824e37 Oct 22  1990 /usr/bin/emacs
+
+Of course, on the system *I* administrate, vi is symlinked to ed.
+Emacs has been replaced by a shell script which 1) Generates a syslog
+message at level LOG_EMERG; 2) reduces the user's disk quota by 100K;
+and 3) RUNS ED!!!!!!
+
+"Ed is the standard text editor."
+
+Let's look at a typical novice's session with the mighty ed:
+
+golem> ed
+
+?
+help
+?
+?
+?
+quit
+?
+exit
+?
+bye
+?
+hello? 
+?
+eat flaming death
+?
+^C
+?
+^C
+?
+^D
+?
+
+---
+Note the consistent user interface and error reportage.  Ed is
+generous enough to flag errors, yet prudent enough not to overwhelm
+the novice with verbosity.
+
+"Ed is the standard text editor."
+
+Ed, the greatest WYGIWYG editor of all.
+
+ED IS THE TRUE PATH TO NIRVANA!  ED HAS BEEN THE CHOICE OF EDUCATED
+AND IGNORANT ALIKE FOR CENTURIES!  ED WILL NOT CORRUPT YOUR PRECIOUS
+BODILY FLUIDS!!  ED IS THE STANDARD TEXT EDITOR!  ED MAKES THE SUN
+SHINE AND THE BIRDS SING AND THE GRASS GREEN!!
+
+When I use an editor, I don't want eight extra KILOBYTES of worthless
+help screens and cursor positioning code!  I just want an EDitor!!
+Not a "viitor".  Not a "emacsitor".  Those aren't even WORDS!!!! ED!
+ED! ED IS THE STANDARD!!!
+
+TEXT EDITOR.
+
+When IBM, in its ever-present omnipotence, needed to base their
+"edlin" on a UNIX standard, did they mimic vi?  No.  Emacs?  Surely
+you jest.  They chose the most karmic editor of all.  The standard.
+
+Ed is for those who can *remember* what they are working on.  If you
+are an idiot, you should use Emacs.  If you are an Emacs, you should
+not be vi.  If you use ED, you are on THE PATH TO REDEMPTION.  THE
+SO-CALLED "VISUAL" EDITORS HAVE BEEN PLACED HERE BY ED TO TEMPT THE
+FAITHLESS.  DO NOT GIVE IN!!!  THE MIGHTY ED HAS SPOKEN!!!
+
+?
+
+From: The Unknown User <anonymous@nowhere.uucp>
+Subject: EMACS -- What does it mean?
+To: mit-prep!info-gnu-emacs@TOPAZ.RUTGERS.EDU
+
+EMACS belongs in <sys/errno.h>: Editor too big!
+
+
+Escape-Meta-Alt-Control-Shift
+
+
+From: harvard!topaz!BLUE!BRAIL@mit-eddie
+Date: 9 Sep 85 17:25:27 EDT
+Subject: EMACS -- What does it mean?
+To: mit-prep!info-gnu-emacs@TOPAZ.RUTGERS.EDU
+
+	EMACS may stand for "Editing MACroS," but some friends of mine
+suggested some more creative definitions. Here they are. Anyone have
+any additions?
+
+--------
+Eight
+Megabytes
+And
+Constantly
+Swapping
+
+Even a
+Master of
+Arts
+Comes 
+Simpler
+
+Emacs
+Manuals
+Are 
+Cryptic and
+Surreal
+
+Energetic
+Merchants
+Always
+Cultivate
+Sales
+
+Each
+Manual's
+Audience is
+Completely
+Stupified
+
+Emacs
+Means
+A
+Crappy
+Screen
+
+Eventually
+Munches
+All
+Computer
+Storage
+
+Even 
+My 
+Aunt
+Crashes the
+System
+
+Eradication of 
+Memory
+Accomplished with
+Complete
+Simplicity
+
+Elsewhere
+Maybe
+Alternative
+Civilizations
+Survive
+
+Egregious
+Managers
+Actively
+Court
+Stallman
+
+Esoteric
+Malleability
+Always
+Considered
+Silly
+
+Emacs
+Manuals
+Always
+Cause
+Senility
+
+Easily
+Maintained with the
+Assistance of
+Chemical
+Solutions
+
+EMACS
+MACRO
+ACTED
+CREDO
+SODOM
+
+Edwardian
+Manifestation of
+All
+Colonial
+Sins
+
+Generally
+Not
+Used
+
+Except by
+Middle
+Aged
+Computer
+Scientists
+
+Extended
+Macros
+Are
+Considered
+Superfluous
+
+Every
+Mode
+Accelerates
+Creation of
+Software
+
+Elsewhere
+Maybe
+All
+Commands are
+Simple
+
+Emacs
+May
+Allow
+Customised
+Screwups
+
+Excellent
+Manuals
+Are
+Clearly
+Suppressed
+
+Emetic
+Macros
+Assault
+Core and
+Segmentation
+
+Embarrassed
+Manual-Writer
+Accused of
+Communist
+Subversion
+
+Extensibility and 
+Modifiability
+Aggravate
+Confirmed
+Simpletons
+
+Emacs
+May
+Annihilate
+Command
+Structures
+
+Easily
+Mangles,
+Aborts,
+Crashes and
+Stupifies
+
+Extraneous
+Macros
+And
+Commands
+Stink
+
+Exceptionally
+Mediocre
+Algorithm for
+Computer
+Scientists
+
+EMACS
+Makes no
+Allowances
+Considering its
+Stiff price
+
+Equine
+Mammals
+Are
+Considerably
+Smaller
+
+Embarrassingly
+Mundane
+Advertising
+Cuts
+Sales
+
+Every
+Moron
+Assumes
+CCA is
+Superior
+
+Exceptionally
+Mediocre
+Autocratic
+Control
+System
+
+EMACS
+May
+Alienate
+Clients and
+Supporters
+
+Excavating
+Mayan
+Architecture
+Comes
+Simpler
+
+Erasing 
+Minds
+Allows 
+Complete
+Submission
+
+Every
+Male
+Adolescent
+Craves
+Sex
+
+Elephantine
+Memory
+Absolutely
+Considered
+Sine que non
+
+Emacs 
+Makers
+Are
+Crazy
+Sickos
+
+Eenie-Meenie-Miney-Mo-
+Macros
+Are
+Completely
+Slow
+
+Experience the
+Mildest
+Ad
+Campaign ever
+Seen
+
+Emacs
+Makefiles
+Annihilate
+C-
+Shells
+
+Eradication of
+Memory
+Accomplished with
+Complete
+Simplicity
+
+Emetic
+Macros
+Assault
+Core and
+Segmentation
+
+Epileptic
+MLisp
+Aggravates
+Compiler
+Seizures
+
+Eleven thousand
+Monkeys
+Asynchronously
+Crank out these
+Slogans
+-------
+
+
+From: ihnss!warren@mit-eddie (Warren Montgomery)
+Newsgroups: net.emacs
+Subject: Re: EMACS -- What does it mean?
+Date: Tue, 10-Sep-85 09:14:24 EDT
+Organization: AT&T Bell Labs, Naperville, IL
+Apparently-To: emacs-netnews-distribution@mit-prep
+
+Someone at a luncheon suggested it meant:
+
+Evenings,
+Mornings,
+And a 
+Couple of
+Saturdays
+
+(In reference to the odd hours that went into the creation of my
+implementation).
+
+-- 
+
+	Warren Montgomery
+	ihnss!warren
+	IH ((312)-979) x2494
+
+Date: Wed, 18 Sep 85 10:11:04 edt
+From: inmet!tower@inmet.inmet (Leonard H. Tower Jr.) <inmet!tower@cca-unix>
+Subject: Re: EMACS -- What does it mean?
+To: tower@MIT-PREP.ARPA
+
+Received: by inmet.uucp (4.12/inmet) id AA02199; Wed, 18 Sep 85 09:10:17 edt
+Date: Wed, 18 Sep 85 09:10:17 edt
+Message-Id: <8509181310.AA02199@inmet.uucp>
+Uucp-Paths: {bellcore,ima,ihnp4}!inmet!tower
+Arpa-Path: ima!inmet!tower@CCA-UNIX.ARPA
+Organization: 	Intermetrics, Inc., Cambridge, MA, USA
+Home: 	36 Porter Street, Somerville, MA  02143, USA   +1 (617) 623-7739
+/* Written  6:48 pm  Sep 14, 1985 by gml@ssc-vax in inmet:net.emacs */
+/* ---------- "Re: EMACS -- What does it mean?" ---------- */
+Pleeeeeeeze!!!  Nice try on the meaning of EMACS.  I believe the
+correct acronym is:
+
+Emacs 
+Makes
+All 
+Computing 
+Simple
+
+Thank you, and Good Night
+/* End of text from inmet:net.emacs */
+
+From: ho95e!wcs@mit-eddie (Bill.Stewart.4K435.x0705)
+Newsgroups: net.emacs
+Subject: Re: EMACS -- What does it mean?
+Date: Thu, 26-Sep-85 21:43:54 EDT
+Organization: AT&T Bell Labs, Holmdel NJ
+Apparently-To: emacs-netnews-distribution@mit-prep
+
+> > very interesting, but what does GNU stand for ?
+> GNU = Gnu's Not UNIX. There is also MINCE, for Mince Is Not a Complete Emacs.
+> More recursive acronyms, anyone?
+Many people have also seen FINE Is Not Emacs, but the one that has
+character is THief Isn't Even Fine.
+-- 
+## Bill Stewart, AT&T Bell Labs, Holmdel NJ 1-201-949-0705 ihnp4!ho95c!wcs
+
+Path: mit-eddie!think!harvard!bbnccv!bbncca!linus!decvax!mcnc!ncsu!uvacs!edison!ta2
+From: edison!ta2@mit-eddie (tom allebrandi)
+Newsgroups: net.emacs
+Subject: Re: Re: EMACS -- What does it mean?
+Date: Sun, 29-Sep-85 18:11:55 EDT
+Organization: General Electric's Mountain Resort
+Apparently-To: emacs-netnews-distribution@mit-prep
+
+> GNU = Gnu's Not UNIX. There is also MINCE, for Mince Is Not a Complete Emacs.
+> 
+> More recursive acronyms, anyone?
+> 
+
+For the DEC-system-10/20: FINE - Fine Is Not Emacs.....
+
+-- 
+...............
+tom allebrandi 2, general electric aco, charlottesville, va
+{decvax,duke}!mcnc!ncsu!uvacs!edison!ta2
+box 8106, charlottesville, va, 22906
+(804) 978-5566
+...............
+
+Date: Wed, 16 Oct 85 01:38:12 edt
+From: inmet!tower (Leonard H. Tower Jr.) <inmet!tower@cca-unix>
+Subject: more names
+To: tower@MIT-PREP.ARPA
+
+Received: by inmet.uucp (4.12/inmet) id AA12997; Tue, 15 Oct 85 22:31:39 edt
+Date: Tue, 15 Oct 85 22:31:39 edt
+Message-Id: <8510160231.AA12997@inmet.uucp>
+Uucp-Paths: {bellcore,ima,ihnp4}!inmet!tower
+Arpa-Path: ima!inmet!tower@CCA-UNIX.ARPA
+Organization: 	Intermetrics, Inc., Cambridge, MA, USA
+Home: 	36 Porter Street, Somerville, MA  02143, USA   +1 (617) 623-7739
+/* Written 12:20 pm  Oct 14, 1985 by rs@mirror.UUCP in inmet:net.emacs */
+
+
+SINE:	Sine Is Not Emacs
+	(MIT Architecture Machine Group)
+
+EINE:	Eine is Not Emacs
+	(MIT Lisp Machine)
+
+ZWEI:	Zwei Was Eine Initially
+	("rev2" of EINE)
+
+--
+Rich $alz	{mit-eddie, ihnp4!inmet, wjh12, cca, datacube} !mirror!rs
+Mirror Systems	2067 Massachusetts Ave.
+617-661-0777	Cambridge, MA, 02140
+/* End of text from inmet:net.emacs */
+
+Path: mit-eddie!genrad!panda!talcott!harvard!seismo!gatech!ulysses!pajb
+From: ulysses!pajb@mit-eddie (Paul Bennett)
+Newsgroups: net.emacs
+Subject: Here we go again ...
+Date: Sat, 19-Oct-85 17:26:49 EDT
+Organization: AT&T Bell Laboratories, Murray Hill
+Apparently-To: emacs-netnews-distribution@mit-prep
+
+
+> EINE:	Eine is Not Emacs
+> 	(MIT Lisp Machine)
+>
+> ZWEI:	Zwei Was Eine Initially
+>	("rev2" of EINE)
+
+DREI:	DREI - Really Emacs Inside
+	(Exists only in my head)
+
+From: friedman@gnu.ai.mit.edu (Noah Friedman)
+Sender: friedman@gnu.ai.mit.edu
+To: jimb@gnu.ai.mit.edu, rms@gnu.ai.mit.edu
+Subject: etc/emacs.names
+Date: Fri, 9 Oct 92 00:54:57 edt
+
+The following should be added:
+
+
+Emacs
+Makes
+A
+Computer
+Slow
+
+From: S_TITZ@iravcl.ira.uka.de (Olaf Titz)
+Newsgroups: alt.religion.emacs
+Subject: Re: what emacs stands for
+Date: 12 Oct 92 19:29:32 GMT
+
+Emacs Masquerades As Comfortable Shell
+Ever Made A Control-key Setup?
+Emacs: My Alternative Computer Story
+Emacs Made Almost Completely Screwed
+       (by extensive use of M-x global-unset-key)
+Emacs Macht Alle Computer Schoen 
+       (deutsch)  (=Emacs makes all computers beautiful)
+Each Mail A Continued Surprise
+Every Mode Acknowledges Customized Strokes 
+       (keystrokes, of course :-)
+Eating Memory And Cycle-Sucking
+Everyday Material Almost Compiled Successfully
+
+now enough bashing for today :-)
+
+
+From: elvis@gnu.ai.mit.edu
+To: emacs-19-bugs@gnu.ai.mit.edu
+Subject: missing from etc/emacs.names
+Date: Thu, 20 May 93 02:21:27 edt
+
+
+Elvis
+Masterminds
+All
+Computer
+Software
+
+Just so you boys know the score.
+
+Thank you very Much,
+The King
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/celibacy.1	Mon Aug 13 08:58:37 2007 +0200
@@ -0,0 +1,12 @@
+CELIBACY(1)              UNIX Programmer's Manual           CELIBACY(1)
+
+
+
+NAME
+     celibacy - don't have sex
+
+SYNOPSIS
+     celibacy
+
+DESCRIPTION
+     Does nothing worth mentioning.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/condom.1	Mon Aug 13 08:58:37 2007 +0200
@@ -0,0 +1,148 @@
+CONDOM(1)	      EUNUCH Programmer's Manual		CONDOM(1)
+
+
+
+NAME
+	condom - Protection against viruses and prevention of child 
+		 processes
+
+SYNOPSIS
+	condom [options] [processid]
+
+DESCRIPTION
+	_condom_ provides protection against System Transmitted
+Viruses (STVs) that may invade your system.  Although the spread of
+such viruses across a network can only be abated by aware and cautious
+users, _condom_ is the only highly-effective means of preventing
+viruses from entering your system (see celibacy(1)).  Any data passed
+to _condom_ by the protected process will be blocked, as specified by
+the value of the -s option (see OPTIONS below).  _condom_ is known to
+defend against the following viruses and other malicious
+afflictions...
+
+	o AIDS
+	o Herpes Simplex (genital varieties)
+	o Syphilis
+	o Crabs
+	o Genital warts
+	o Gonorrhea
+	o Chlamydia
+	o Michelangelo
+	o Jerusalem
+
+	When used alone or in conjunction with pill(1), sponge(1),
+foam(1), and/or setiud(3), _condom_ also prevents the conception of a
+child process.  If invoked from within a synchronous process, _condom_
+has, by default, an 80% chance of preventing the external processes
+from becoming parent processes (see the -s option below).  When other
+process contraceptives are used, the chance of preventing a child
+process from being forked becomes much greater.  See pill(1),
+sponge(1), foam(1), and setiud(3) for more information.
+	If no options are given, the current user's login process (as
+determined by the environment variable USER) is protected with a
+Trojan rough-cut latex condom without a reservoir tip.  The optional
+'processid' argument is an integer specifying the process to protect.
+	NOTE: _condom_ may only be used with a hard disk.  _condom_
+will terminate abnormally with exit code -1 if used with a floppy
+disk (see DIAGNOSTICS below).
+
+OPTIONS
+     The following options may be given to _condom_...
+
+	-b BRAND	BRANDs are as follows...
+
+			trojan (default)
+			ramses
+			sheik
+			goldcoin
+			fourex
+
+	-m MATERIAL	The valid MATERIALs are...
+
+			latex (default)
+			saranwrap
+			membrane -- WARNING!  The membrane option is _not_
+			endorsed by the System Administrator General as an 
+			effective barrier against certain viruses.  It is 
+			supported only for the sake of tradition.
+
+	-f FLAVOR	The following FLAVORs are currently supported...
+
+			plain (default)
+			apple
+			banana
+			cherry
+			cinnamon
+			licorice
+			orange
+			peppermint
+			raspberry
+			spearmint
+			strawberry
+
+	-r		Toggle reservoir tip (default is no reservoir tip)
+
+	-s STRENGTH	STRENGTH is an integer between 20 and 100 specifying
+			the resilience of _condom_ against data passed to
+			_condom_ by the protected process.  Using a larger
+			value of STRENGTH increases _condom_'s protective
+			abilities, but also reduces interprocess communication.
+			A smaller value of STRENGTH increases interprocess
+			communication, but also increases the likelihood of a
+			security breach.  An extremely vigorous process or
+			one passing an enormous amount of data to _condom_ 
+			will increase the chance of _condom_'s failure.  The
+			default STRENGTH is 80%.
+
+	-t TEXTURE	Valid TEXTUREs are...
+
+			rough (default)
+			ribbed
+			bumps
+			lubricated (provides smoother interaction between 
+			            processes)
+
+	WARNING: The use of an external application to _condom_ in
+order to reduce friction between processes has been proven in
+benchmark tests to decrease _condom_'s strength factor!  If execution
+speed is important to your process, use the '-t lubricated' option.
+
+DIAGNOSTICS
+	_condom_ terminates with one of the following exit codes...
+
+	-1	An attempt was made to use _condom_ on a floppy disk.
+
+	 0	_condom_ exited successfully (no data was passed to
+		the synchronous process).
+
+	 1	_condom_ failed and data was allowed through.  The
+		danger of transmission of an STV or the forking of a child 
+		process is inversely proportional to the number of other 
+		protections employed and is directly proportional to 
+		the ages of the processes involved.
+
+BUGS
+	_condom_ is NOT 100% effective at preventing a child process
+from being forked or at deterring the invasion of a virus (although
+the System Administrator General has deemed that _condom_ is the most
+effective means of preventing the spread of system transmitted
+viruses).  See celibacy(1) for information on a 100% effective program
+for preventing these problems.
+	Remember... the use of sex(1) and other related routines
+should only occur between mature, consenting processes.  If you must
+use sex(1), please employ _condom_ to protect your process and your
+synchronous process.  If we are all responsible, we can stop the
+spread of STVs.
+
+AUTHORS and HISTORY
+	The original version of _condom_ was released in Roman times
+and was only marginally effective.  With the advent of modern
+technology, _condom_ now supports many more options and is much more
+effective.
+	The current release of _condom_ was written by Ken Maupin at
+the University of Washington (maupin@cs.washington.edu) and was last
+updated on 10/7/92.
+
+SEE ALSO
+	celibacy(1), sex(1), pill(1), sponge(1), foam(1), and
+setiud(3)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/sex.6	Mon Aug 13 08:58:37 2007 +0200
@@ -0,0 +1,115 @@
+SEX(6)              EUNUCH Programmer's Manual               SEX(6)
+
+
+
+NAME
+     sex - have sex
+
+SYNOPSIS
+     sex [ options ] ...  [ username ] ...
+
+DESCRIPTION
+     _s_e_x allows the invoker to have sex with the user(s) speci-
+     fied in the command line.  If no users are specified, they
+     are taken from the LOVERS environment variable.  Options to
+     make things more interesting are as follows:
+
+     -1   masturbate
+
+     -a   external stimulus (aphrodisiac) option
+
+     -b   buggery
+
+     -B<animal>
+          bestiality with <animal>
+
+     -c   chocolate sauce option
+
+     -C   chaining option (cuffs included) (see also -m -s -W)
+
+     -d<file>
+          get a date with the features described in <file>
+
+     -e   exhibitionism (image sent to all machines on the net)
+
+     -f   foreplay option
+
+     -F   nasal sex with plants
+
+     -i   coitus interruptus (messy!)
+
+     -j   jacuzzi option (California sites only)
+
+     -l   leather option
+
+     -m   masochism (see -s)
+
+     -M   triple parallel (Menage a Trois) option
+
+     -n   necrophilia (if target process is not dead, program
+          kills it)
+
+     -o   oral option
+
+     -O   parallel access (orgy)
+
+     -p   debug option (proposition only)
+
+     -P   pedophilia (must specify a child process)
+
+
+
+Printed 2/15/87              2/15/87                            1
+
+
+
+
+
+
+SEX(6)              EUNUCH Programmer's Manual               SEX(6)
+
+
+
+     -q   quickie (wham, bam, thank you, ma'am)
+
+     -s   sadism (target must set -m)
+
+     -S   sundae option
+
+     -T<number>
+          voice-net sex via standard uucp autodialer facilities;
+          area code prefix of 900 is assumed.
+
+     -v   voyeurism (surveys the entire net)
+
+     -w   whipped cream option
+
+     -W   whips (see also -s, -C, and -m)
+
+ENVIRONMENT
+     LOVERS
+          is a list of default partners which will be used if
+          none are specified in the command line.  If any are
+          specified, the values in LOVERS is ignored.
+
+FILES
+     /usr/lib/sex/animals          animals for bestiality
+
+     /usr/lib/sex/blackbook        possible dates
+
+     /usr/lib/sex/sundaes          sundae recipes
+
+     /usr/lib/sex/s&m         sado-masochistic equipment
+
+
+
+BUGS
+     ^C (quit process) may leave the user very unsatisfied.
+
+     ^Z (stop process) is usually quite messy.
+
+MAN AUTHOR
+     Author prefers to be anonymous.
+
+HISTORY
+     Oldest program ever.
--- a/lisp/prim/about.el	Mon Aug 13 08:58:21 2007 +0200
+++ b/lisp/prim/about.el	Mon Aug 13 08:58:37 2007 +0200
@@ -1137,6 +1137,7 @@
 	  Tore Olsen <toreo@colargol.idb.hist.no>
 	  Greg Onufer <Greg.Onufer@eng.sun.com>
 	  Achim Oppelt <aoppelt@theorie3.physik.uni-erlangen.de>
+	  Rebecca Ore <rebecca.ore@op.net>
 	  Sudeep Kumar Palat <palat@idt.unit.no>
 	  Marc Paquette <Marc.Paquette@Softimage.com>
 	  Jens-U H Petersen <petersen@kurims.kyoto-u.ac.jp>
--- a/lisp/version.el	Mon Aug 13 08:58:21 2007 +0200
+++ b/lisp/version.el	Mon Aug 13 08:58:37 2007 +0200
@@ -55,7 +55,7 @@
   "Non-nil when this is a test (beta) version of XEmacs.
 Warning, this variable did not exist in XEmacs versions prior to 20.3")
 
-(defconst xemacs-codename "Manhattan"
+(defconst xemacs-codename "Bronx"
   "Symbolic name of XEmacs build.
 Warning, this variable did not exist in XEmacs versions prior to 19.16
 and 20.3")
--- a/man/internals/internals.texi	Mon Aug 13 08:58:21 2007 +0200
+++ b/man/internals/internals.texi	Mon Aug 13 08:58:37 2007 +0200
@@ -209,7 +209,7 @@
 Buffers and Textual Representation
 
 * Introduction to Buffers::     A buffer holds a block of text such as a file.
-* A Buffer's Text::             Representation of the text in a buffer.
+* The Text in a Buffer::        Representation of the text in a buffer.
 * Buffer Lists::                Keeping track of all buffers.
 * Markers and Extents::         Tagging locations within a buffer.
 * Bufbytes and Emchars::        Representation of individual characters.
@@ -301,6 +301,7 @@
 * Through Version 18::          Unification prevails.
 * Lucid Emacs::                 One version 19 Emacs.
 * GNU Emacs 19::                The other version 19 Emacs.
+* GNU Emacs 20::                The other version 20 Emacs.
 * XEmacs::                      The continuation of Lucid Emacs.
 @end menu
 
@@ -576,6 +577,21 @@
 working on and using GNU Emacs for a long time (back as far as version
 16 or 17).
 
+@node GNU Emacs 20
+@section GNU Emacs 20
+@cindex GNU Emacs 20
+@cindex FSF Emacs
+
+On February 2, 1997 work began on GNU Emacs to integrate Mule.  The first
+release was made in September of that year.
+
+A timeline for Emacs 20 is
+
+@itemize @bullet
+@item
+version 20.1 released September 17, 1997.
+@end itemize
+
 @node XEmacs
 @section XEmacs
 @cindex XEmacs
@@ -5345,7 +5361,7 @@
 
 @menu
 * Introduction to Buffers::     A buffer holds a block of text such as a file.
-* A Buffer's Text::             Representation of the text in a buffer.
+* The Text in a Buffer::        Representation of the text in a buffer.
 * Buffer Lists::                Keeping track of all buffers.
 * Markers and Extents::         Tagging locations within a buffer.
 * Bufbytes and Emchars::        Representation of individual characters.
@@ -5405,8 +5421,8 @@
 window. (This latter distinction is explained in detail in the section
 on windows.)
 
-@node A Buffer's Text
-@section A Buffer's Text
+@node The Text in a Buffer
+@section The Text in a Buffer
 
   The text in a buffer consists of a sequence of zero or more
 characters.  A @dfn{character} is an integer that logically represents
--- a/src/doprnt.c	Mon Aug 13 08:58:21 2007 +0200
+++ b/src/doprnt.c	Mon Aug 13 08:58:37 2007 +0200
@@ -453,7 +453,7 @@
                  empty string?  -dkindred@cs.cmu.edu 8/1997
 	       */
 	      if (!string)
-		string = "(null)";
+		string = (Bufbyte *) "(null)";
 	      string_len = strlen ((char *) string);
 	    }
 	  else
--- a/src/s/decosf4-0.h	Mon Aug 13 08:58:21 2007 +0200
+++ b/src/s/decosf4-0.h	Mon Aug 13 08:58:37 2007 +0200
@@ -25,8 +25,16 @@
 #define regmatch_t sys_regmatch_t
 
 #define SYSTEM_MALLOC
-#define HAVE_RENAME
+#define HAVE_RENAME 1
 
 /* Digital Unix 4.0 has a realpath, but it's buggy.  And I
    *do* mean buggy. */
 #undef HAVE_REALPATH
+
+/* With -std1 we get more ansified compilation. */
+#undef C_SWITCH_SYSTEM
+#ifdef __GNUC__
+# define C_SWITCH_SYSTEM -D_BSD
+#else
+# define C_SWITCH_SYSTEM -std1 -D_BSD
+#endif 
--- a/src/s/irix6-0.h	Mon Aug 13 08:58:21 2007 +0200
+++ b/src/s/irix6-0.h	Mon Aug 13 08:58:37 2007 +0200
@@ -19,3 +19,9 @@
 
 /* Irix 6.2 doesn't need -lw */
 #undef NEED_LIBW
+
+/* Irix 5 has this defined in inttypes.h, but you can't include
+ * both inttypes.h and sys/types.h.  This is fixed by Irix 6.2. 
+ * This should probably be set by configure.
+ */
+#define HAVE_UINTPTR_T 1
--- a/src/unexelfsgi.c	Mon Aug 13 08:58:21 2007 +0200
+++ b/src/unexelfsgi.c	Mon Aug 13 08:58:37 2007 +0200
@@ -545,6 +545,12 @@
 	   (n)++; } while (0)
 typedef unsigned char byte;
 
+/* IRIX 5 defines this only in inttypes.h, and you can't include both 
+ * inttypes.h and sys/types.h.  This is fixed by IRIX 6.2. */
+#ifndef HAVE_UINTPTR_T
+typedef unsigned long int       uintptr_t;
+#endif
+
 /* Round X up to a multiple of Y.  */
 
 int