Mercurial > emacs

--- a/lisp/ChangeLog	Fri Nov 05 00:34:45 2010 -0700
+++ b/lisp/ChangeLog	Fri Nov 05 00:41:47 2010 -0700
@@ -1,5 +1,8 @@
 2010-11-05  Glenn Morris  <rgm@gnu.org>

+	* play/doctor.el: Give all local variables a prefix.  Update callers.
+	(doc$, doctor-put-meaning): Use backquote.
+
 	* emacs-lisp/cl-macs.el (loop): Give local variable args a prefix.
 	(cl-parse-loop-clause, cl-loop-handle-accum): Update for above change.
--- a/lisp/play/doctor.el	Fri Nov 05 00:34:45 2010 -0700
+++ b/lisp/play/doctor.el	Fri Nov 05 00:41:47 2010 -0700
@@ -29,40 +29,94 @@

 ;;; Code:

-(defvar **mad**)        (defvar *debug*)      (defvar *print-space*)
-(defvar *print-upcase*) (defvar abuselst)     (defvar abusewords)
-(defvar account)        (defvar afraidof)     (defvar arerelated)
-(defvar areyou)         (defvar bak)          (defvar beclst)
-(defvar bother)         (defvar bye)          (defvar canyou)
-(defvar chatlst)        (defvar continue)     (defvar deathlst)
-(defvar describe)       (defvar drnk)         (defvar drugs)
-(defvar eliza-flag)     (defvar elizalst)     (defvar famlst)
-(defvar feared)         (defvar fears)        (defvar feelings-about)
-(defvar foullst)        (defvar found)        (defvar hello)
-(defvar history)        (defvar howareyoulst) (defvar howdyflag)
-(defvar huhlst)         (defvar ibelieve)     (defvar improve)
-(defvar inter)          (defvar isee)         (defvar isrelated)
-(defvar lincount)       (defvar longhuhlst)   (defvar lover)
-(defvar machlst)        (defvar mathlst)      (defvar maybe)
-(defvar moods)          (defvar neglst)       (defvar obj)
-(defvar object)         (defvar owner)        (defvar please)
-(defvar problems)       (defvar qlist)        (defvar random-adjective)
-(defvar relation)       (defvar remlst)       (defvar repetitive-shortness)
-(defvar replist)        (defvar rms-flag)     (defvar schoollst)
-(defvar sent)           (defvar sexlst)       (defvar shortbeclst)
-(defvar shortlst)       (defvar something)    (defvar sportslst)
-(defvar stallmanlst)    (defvar states)       (defvar subj)
-(defvar suicide-flag)   (defvar sure)         (defvar thing)
-(defvar things)         (defvar thlst)        (defvar toklst)
-(defvar typos)          (defvar verb)         (defvar want)
-(defvar whatwhen)       (defvar whereoutp)    (defvar whysay)
-(defvar whywant)        (defvar zippy-flag)   (defvar zippylst)
+(defvar doctor--**mad**)
+(defvar doctor--*print-space*)
+(defvar doctor--*print-upcase*)
+(defvar doctor--abuselst)
+(defvar doctor--abusewords)
+(defvar doctor--afraidof)
+(defvar doctor--arerelated)
+(defvar doctor--areyou)
+(defvar doctor--bak)
+(defvar doctor--beclst)
+(defvar doctor--bother)
+(defvar doctor--bye)
+(defvar doctor--canyou)			; unused?
+(defvar doctor--chatlst)
+(defvar doctor--continue)
+(defvar doctor--deathlst)
+(defvar doctor--describe)
+(defvar doctor--drnk)
+(defvar doctor--drugs)
+(defvar doctor--eliza-flag)
+(defvar doctor--elizalst)
+(defvar doctor--famlst)
+(defvar doctor--feared)
+(defvar doctor--fears)
+(defvar doctor--feelings-about)
+(defvar doctor--foullst)
+(defvar doctor-found)
+(defvar doctor--hello)
+(defvar doctor--history)
+(defvar doctor--howareyoulst)
+(defvar doctor--howdyflag)
+(defvar doctor--huhlst)
+(defvar doctor--ibelieve)
+(defvar doctor--improve)
+(defvar doctor--inter)
+(defvar doctor--isee)
+(defvar doctor--isrelated)
+(defvar doctor--lincount)
+(defvar doctor--longhuhlst)
+(defvar doctor--lover)
+(defvar doctor--machlst)
+(defvar doctor--mathlst)
+(defvar doctor--maybe)
+(defvar doctor--moods)
+(defvar doctor--neglst)
+(defvar doctor-obj)
+(defvar doctor-object)
+(defvar doctor-owner)
+(defvar doctor--please)
+(defvar doctor--problems)
+(defvar doctor--qlist)
+(defvar doctor--random-adjective)
+(defvar doctor--relation)
+(defvar doctor--remlst)
+(defvar doctor--repetitive-shortness)
+(defvar doctor--replist)
+(defvar doctor--rms-flag)
+(defvar doctor--schoollst)
+(defvar doctor-sent)
+(defvar doctor--sexlst)
+(defvar doctor--shortbeclst)
+(defvar doctor--shortlst)
+(defvar doctor--something)
+(defvar doctor--sportslst)
+(defvar doctor--stallmanlst)
+(defvar doctor--states)
+(defvar doctor-subj)
+(defvar doctor--suicide-flag)
+(defvar doctor--sure)
+(defvar doctor--thing)
+(defvar doctor--things)
+(defvar doctor--thlst)
+(defvar doctor--toklst)
+(defvar doctor--typos)
+(defvar doctor-verb)
+(defvar doctor--want)
+(defvar doctor--whatwhen)
+(defvar doctor--whereoutp)
+(defvar doctor--whysay)
+(defvar doctor--whywant)
+(defvar doctor--zippy-flag)
+(defvar doctor--zippylst)

 (defun doc// (x) x)

 (defmacro doc$ (what)
   "quoted arg form of doctor-$"
-  (list 'doctor-$ (list 'quote what)))
+  `(doctor-$ ',what))

 (defun doctor-$ (what)
   "Return the car of a list, rotating the list each time"
@@ -86,484 +140,411 @@
   (make-doctor-variables)
   (turn-on-auto-fill)
   (doctor-type '(i am the psychotherapist \.
-		 (doc$ please) (doc$ describe) your (doc$ problems) \.
+		 (doc$ doctor--please) (doc$ doctor--describe) your (doc$ doctor--problems) \.
 		 each time you are finished talking, type \R\E\T twice \.))
   (insert "\n"))

 (defun make-doctor-variables ()
-  (make-local-variable 'typos)
-  (setq typos
-	(mapcar (function (lambda (x)
-			    (put (car x) 'doctor-correction  (cadr x))
-			    (put (cadr x) 'doctor-expansion (car (cddr x)))
-			    (car x)))
-		'((theyll they\'ll (they will))
-		  (theyre they\'re (they are))
-		  (hes he\'s (he is))
-		  (he7s he\'s (he is))
-		  (im i\'m (you are))
-		  (i7m i\'m (you are))
-		  (isa is\ a (is a))
-		  (thier their (their))
-		  (dont don\'t (do not))
-		  (don7t don\'t (do not))
-		  (you7re you\'re (i am))
-		  (you7ve you\'ve (i have))
-		  (you7ll you\'ll (i will)))))
-  (make-local-variable 'found)
-  (setq found nil)
-  (make-local-variable 'owner)
-  (setq owner nil)
-  (make-local-variable 'history)
-  (setq history nil)
-  (make-local-variable '*debug*)
-  (setq *debug* nil)
-  (make-local-variable 'inter)
-  (setq inter
-	'((well\,)
-	  (hmmm \.\.\.\ so\,)
-	  (so)
-	  (\.\.\.and)
-	  (then)))
-  (make-local-variable 'continue)
-  (setq continue
-	'((continue)
-	  (proceed)
-	  (go on)
-	  (keep going) ))
-  (make-local-variable 'relation)
-  (setq relation
-	'((your relationship with)
-	  (something you remember about)
-	  (your feelings toward)
-	  (some experiences you have had with)
-	  (how you feel about)))
-  (make-local-variable 'fears)
-  (setq fears '( ((doc$ whysay) you are (doc$ afraidof) (doc// feared) \?)
-		 (you seem terrified by (doc// feared) \.)
-		 (when did you first feel (doc$ afraidof) (doc// feared) \?) ))
-  (make-local-variable 'sure)
-  (setq sure '((sure)(positive)(certain)(absolutely sure)))
-  (make-local-variable 'afraidof)
-  (setq afraidof '( (afraid of) (frightened by) (scared of) ))
-  (make-local-variable 'areyou)
-  (setq areyou '( (are you)(have you been)(have you been) ))
-  (make-local-variable 'isrelated)
-  (setq isrelated '( (has something to do with)(is related to)
-		     (could be the reason for) (is caused by)(is because of)))
-  (make-local-variable 'arerelated)
-  (setq arerelated '((have something to do with)(are related to)
-		     (could have caused)(could be the reason for) (are caused by)
-		     (are because of)))
-  (make-local-variable 'moods)
-  (setq moods '( ((doc$ areyou)(doc// found) often \?)
-		 (what causes you to be (doc// found) \?)
-		 ((doc$ whysay) you are (doc// found) \?) ))
-  (make-local-variable 'maybe)
-  (setq maybe
-	'((maybe)
-	  (perhaps)
-	  (possibly)))
-  (make-local-variable 'whatwhen)
-  (setq whatwhen
-	'((what happened when)
-	  (what would happen if)))
-  (make-local-variable 'hello)
-  (setq hello
-	'((how do you do \?) (hello \.) (howdy!) (hello \.) (hi \.) (hi there \.)))
-  (make-local-variable 'drnk)
-  (setq drnk
-	'((do you drink a lot of (doc// found) \?)
-	  (do you get drunk often \?)
-	  ((doc$ describe) your drinking habits \.) ))
-  (make-local-variable 'drugs)
-  (setq drugs '( (do you use (doc// found) often \?)((doc$ areyou)
-						 addicted to (doc// found) \?)(do you realize that drugs can
-						 be very harmful \?)((doc$ maybe) you should try to quit using (doc// found)
-						 \.)))
-  (make-local-variable 'whywant)
-  (setq whywant '( ((doc$ whysay) (doc// subj) might (doc$ want) (doc// obj) \?)
-		   (how does it feel to want \?)
-		   (why should (doc// subj) get (doc// obj) \?)
-		   (when did (doc// subj) first (doc$ want) (doc// obj) \?)
-		   ((doc$ areyou) obsessed with (doc// obj) \?)
-		   (why should i give (doc// obj) to (doc// subj) \?)
-		   (have you ever gotten (doc// obj) \?) ))
-  (make-local-variable 'canyou)
-  (setq canyou '((of course i can \.)
-		 (why should i \?)
-		 (what makes you think i would even want to \?)
-		 (i am the doctor\, i can do anything i damn please \.)
-		 (not really\, it\'s not up to me \.)
-		 (depends\, how important is it \?)
-		 (i could\, but i don\'t think it would be a wise thing to do \.)
-		 (can you \?)
-		 (maybe i can\, maybe i can\'t \.\.\.)
-		 (i don\'t think i should do that \.)))
-  (make-local-variable 'want)
-  (setq want '( (want) (desire) (wish) (want) (hope) ))
-  (make-local-variable 'shortlst)
-  (setq shortlst
-	'((can you elaborate on that \?)
-	  ((doc$ please) continue \.)
-	  (go on\, don\'t be afraid \.)
-	  (i need a little more detail please \.)
-	  (you\'re being a bit brief\, (doc$ please) go into detail \.)
-	  (can you be more explicit \?)
-	  (and \?)
-	  ((doc$ please) go into more detail \?)
-	  (you aren\'t being very talkative today\!)
-	  (is that all there is to it \?)
-	  (why must you respond so briefly \?)))
-
-  (make-local-variable 'famlst)
-  (setq famlst
-	'((tell me (doc$ something) about (doc// owner) family \.)
-	  (you seem to dwell on (doc// owner) family \.)
-	  ((doc$ areyou) hung up on (doc// owner) family \?)))
-  (make-local-variable 'huhlst)
-  (setq huhlst
-	'(((doc$ whysay)(doc// sent) \?)
-	  (is it because of (doc$ things) that you say (doc// sent) \?) ))
-  (make-local-variable 'longhuhlst)
-  (setq longhuhlst
-	'(((doc$ whysay) that \?)
-	  (i don\'t understand \.)
-	  ((doc$ thlst))
-	  ((doc$ areyou) (doc$ afraidof) that \?)))
-  (make-local-variable 'feelings-about)
-  (setq feelings-about
-	'((feelings about)
-	  (apprehensions toward)
-	  (thoughts on)
-	  (emotions toward)))
-  (make-local-variable 'random-adjective)
-  (setq random-adjective
-	'((vivid)
-	  (emotionally stimulating)
-	  (exciting)
-	  (boring)
-	  (interesting)
-	  (recent)
-	  (random)   ;How can we omit this?
-	  (unusual)
-	  (shocking)
-	  (embarrassing)))
-  (make-local-variable 'whysay)
-  (setq whysay
-	'((why do you say)
-	  (what makes you believe)
-	  (are you sure that)
-	  (do you really think)
-	  (what makes you think) ))
-  (make-local-variable 'isee)
-  (setq isee
-	'((i see \.\.\.)
-	  (yes\,)
-	  (i understand \.)
-	  (oh \.) ))
-  (make-local-variable 'please)
-  (setq please
-	'((please\,)
-	  (i would appreciate it if you would)
-	  (perhaps you could)
-	  (please\,)
-	  (would you please)
-	  (why don\'t you)
-	  (could you)))
-  (make-local-variable 'bye)
-  (setq bye
-	'((my secretary will send you a bill \.)
-	  (bye bye \.)
-	  (see ya \.)
-	  (ok\, talk to you some other time \.)
-	  (talk to you later \.)
-	  (ok\, have fun \.)
-	  (ciao \.)))
-  (make-local-variable 'something)
-  (setq something
-	'((something)
-	  (more)
-	  (how you feel)))
-  (make-local-variable 'thing)
-  (setq thing
-	'((your life)
-	  (your sex life)))
-  (make-local-variable 'things)
-  (setq things
-	'((your plans)
-	  (the people you hang around with)
-	  (problems at school)
-	  (any hobbies you have)
-	  (hangups you have)
-	  (your inhibitions)
-	  (some problems in your childhood)
-	  (some problems at home)))
-  (make-local-variable 'describe)
-  (setq describe
-	'((describe)
-	  (tell me about)
-	  (talk about)
-	  (discuss)
-	  (tell me more about)
-	  (elaborate on)))
-  (make-local-variable 'ibelieve)
-  (setq ibelieve
-	'((i believe) (i think) (i have a feeling) (it seems to me that)
-	  (it looks like)))
-  (make-local-variable 'problems)
-  (setq problems '( (problems)
-		    (inhibitions)
-		    (hangups)
-		    (difficulties)
-		    (anxieties)
-		    (frustrations) ))
-  (make-local-variable 'bother)
-  (setq bother
-	'((does it bother you that)
-	  (are you annoyed that)
-	  (did you ever regret)
-	  (are you sorry)
-	  (are you satisfied with the fact that)))
-  (make-local-variable 'machlst)
-  (setq machlst
-	'((you have your mind on (doc// found) \, it seems \.)
-	  (you think too much about  (doc// found) \.)
-	  (you should try taking your mind off of (doc// found)\.)
-	  (are you a computer hacker \?)))
-  (make-local-variable 'qlist)
-  (setq qlist
-	'((what do you think \?)
-	  (i\'ll ask the questions\, if you don\'t mind!)
-	  (i could ask the same thing myself \.)
-	  ((doc$ please) allow me to do the questioning \.)
-	  (i have asked myself that question many times \.)
-	  ((doc$ please) try to answer that question yourself \.)))
-  (make-local-variable 'foullst)
-  (setq foullst
-	'(((doc$ please) watch your tongue!)
-	  ((doc$ please) avoid such unwholesome thoughts \.)
-	  ((doc$ please) get your mind out of the gutter \.)
-	  (such lewdness is not appreciated \.)))
-  (make-local-variable 'deathlst)
-  (setq deathlst
-	'((this is not a healthy way of thinking \.)
-	  ((doc$ bother) you\, too\, may die someday \?)
-	  (i am worried by your obsession with this topic!)
-	  (did you watch a lot of crime and violence on television as a child \?))
-	)
-  (make-local-variable 'sexlst)
-  (setq sexlst
-	'(((doc$ areyou) (doc$ afraidof) sex \?)
-	  ((doc$ describe)(doc$ something) about your sexual history \.)
-	  ((doc$ please)(doc$ describe) your sex life \.\.\.)
-	  ((doc$ describe) your (doc$ feelings-about) your sexual partner \.)
-	  ((doc$ describe) your most (doc$ random-adjective) sexual experience \.)
-	  ((doc$ areyou) satisfied with (doc// lover) \.\.\. \?)))
-  (make-local-variable 'neglst)
-  (setq neglst
-	'((why not \?)
-	  ((doc$ bother) i ask that \?)
-	  (why not \?)
-	  (why not \?)
-	  (how come \?)
-	  ((doc$ bother) i ask that \?)))
-  (make-local-variable 'beclst)
-  (setq beclst '(
-		 (is it because (doc// sent) that you came to me \?)
-		 ((doc$ bother)(doc// sent) \?)
-		 (when did you first know that (doc// sent) \?)
-		 (is the fact that (doc// sent) the real reason \?)
-		 (does the fact that (doc// sent) explain anything else \?)
-		 ((doc$ areyou)(doc$ sure)(doc// sent) \? ) ))
-  (make-local-variable 'shortbeclst)
-  (setq shortbeclst '(
-		      ((doc$ bother) i ask you that \?)
-		      (that\'s not much of an answer!)
-		      ((doc$ inter) why won\'t you talk about it \?)
-		      (speak up!)
-		      ((doc$ areyou) (doc$ afraidof) talking about it \?)
-		      (don\'t be (doc$ afraidof) elaborating \.)
-		      ((doc$ please) go into more detail \.)))
-  (make-local-variable 'thlst)
-  (setq thlst '(
-		((doc$ maybe)(doc$ thing)(doc$ isrelated) this \.)
-		((doc$ maybe)(doc$ things)(doc$ arerelated) this \.)
-		(is it because of (doc$ things) that you are going through all this \?)
-		(how do you reconcile (doc$ things) \? )
-		((doc$ maybe) this (doc$ isrelated)(doc$ things) \?) ))
-  (make-local-variable 'remlst)
-  (setq remlst '( (earlier you said (doc$ history) \?)
-		  (you mentioned that (doc$ history) \?)
-		  ((doc$ whysay)(doc$ history) \? ) ))
-  (make-local-variable 'toklst)
-  (setq toklst
-	'((is this how you relax \?)
-	  (how long have you been smoking	grass \?)
-	  ((doc$ areyou) (doc$ afraidof) of being drawn to using harder stuff \?)))
-  (make-local-variable 'states)
-  (setq states
-	'((do you get (doc// found) often \?)
-	  (do you enjoy being (doc// found) \?)
-	  (what makes you (doc// found) \?)
-	  (how often (doc$ areyou)(doc// found) \?)
-	  (when were you last (doc// found) \?)))
-  (make-local-variable 'replist)
-  (setq replist
-	'((i . (you))
-	  (my . (your))
-	  (me . (you))
-	  (you . (me))
-	  (your . (my))
-	  (mine . (yours))
-	  (yours . (mine))
-	  (our . (your))
-	  (ours . (yours))
-	  (we . (you))
-	  (dunno . (do not know))
-;;	  (yes . ())
-	  (no\, . ())
-	  (yes\, . ())
-	  (ya . (i))
-	  (aint . (am not))
-	  (wanna . (want to))
-	  (gimme . (give me))
-	  (gotta . (have to))
-	  (gonna . (going to))
-	  (never . (not ever))
-	  (doesn\'t . (does not))
-	  (don\'t . (do not))
-	  (aren\'t . (are not))
-	  (isn\'t . (is not))
-	  (won\'t . (will not))
-	  (can\'t . (cannot))
-	  (haven\'t . (have not))
-	  (i\'m . (you are))
-	  (ourselves . (yourselves))
-	  (myself . (yourself))
-	  (yourself . (myself))
-	  (you\'re . (i am))
-	  (you\'ve . (i have))
-	  (i\'ve . (you have))
-	  (i\'ll . (you will))
-	  (you\'ll . (i shall))
-	  (i\'d . (you would))
-	  (you\'d . (i would))
-	  (here . (there))
-	  (please . ())
-	  (eh\, . ())
-	  (eh . ())
-	  (oh\, . ())
-	  (oh . ())
-	  (shouldn\'t . (should not))
-	  (wouldn\'t . (would not))
-	  (won\'t . (will not))
-	  (hasn\'t . (has not))))
-  (make-local-variable 'stallmanlst)
-  (setq stallmanlst '(
-		      ((doc$ describe) your (doc$ feelings-about) him \.)
-		      ((doc$ areyou) a friend of Stallman \?)
-		      ((doc$ bother) Stallman is (doc$ random-adjective) \?)
-		      ((doc$ ibelieve) you are (doc$ afraidof) him \.)))
-  (make-local-variable 'schoollst)
-  (setq schoollst '(
-		    ((doc$ describe) your (doc// found) \.)
-		    ((doc$ bother) your grades could (doc$ improve) \?)
-		    ((doc$ areyou) (doc$ afraidof) (doc// found) \?)
-		    ((doc$ maybe) this (doc$ isrelated) to your attitude \.)
-		    ((doc$ areyou) absent often \?)
-		    ((doc$ maybe) you should study (doc$ something) \.)))
-  (make-local-variable 'improve)
-  (setq improve '((improve) (be better) (be improved) (be higher)))
-  (make-local-variable 'elizalst)
-  (setq elizalst '(
-		   ((doc$ areyou) (doc$ sure) \?)
-		   ((doc$ ibelieve) you have (doc$ problems) with (doc// found) \.)
-		   ((doc$ whysay) (doc// sent) \?)))
-  (make-local-variable 'sportslst)
-  (setq sportslst '(
-		    (tell me (doc$ something) about (doc// found) \.)
-		    ((doc$ describe) (doc$ relation) (doc// found) \.)
-		    (do you find (doc// found) (doc$ random-adjective) \?)))
-  (make-local-variable 'mathlst)
-  (setq mathlst '(
-		  ((doc$ describe) (doc$ something) about math \.)
-		  ((doc$ maybe) your (doc$ problems) (doc$ arerelated) (doc// found) \.)
-		  (i don\'t know much (doc// found) \, but (doc$ continue)
-		     anyway \.)))
-  (make-local-variable 'zippylst)
-  (setq zippylst '(
-		   ((doc$ areyou) Zippy \?)
-		   ((doc$ ibelieve) you have some serious (doc$ problems) \.)
-		   ((doc$ bother) you are a pinhead \?)))
-  (make-local-variable 'chatlst)
-  (setq chatlst '(
-		  ((doc$ maybe) we could chat \.)
-		  ((doc$ please) (doc$ describe) (doc$ something) about chat mode \.)
-		  ((doc$ bother) our discussion is so (doc$ random-adjective) \?)))
-  (make-local-variable 'abuselst)
-  (setq abuselst '(
-		   ((doc$ please) try to be less abusive \.)
-		   ((doc$ describe) why you call me (doc// found) \.)
-		   (i\'ve had enough of you!)))
-  (make-local-variable 'abusewords)
-  (setq abusewords '(boring bozo clown clumsy cretin dumb dummy
-			    fool foolish gnerd gnurd idiot jerk
-			    lose loser louse lousy luse luser
-			    moron nerd nurd oaf oafish reek
-			    stink stupid tool toolish twit))
-  (make-local-variable 'howareyoulst)
-  (setq howareyoulst  '((how are you) (hows it going) (hows it going eh)
-			(how\'s it going) (how\'s it going eh) (how goes it)
-			(whats up) (whats new) (what\'s up) (what\'s new)
-			(howre you) (how\'re you) (how\'s everything)
-			(how is everything) (how do you do)
-			(how\'s it hanging) (que pasa)
-			(how are you doing) (what do you say)))
-  (make-local-variable 'whereoutp)
-  (setq whereoutp '( huh remem rthing ) )
-  (make-local-variable 'subj)
-  (setq subj nil)
-  (make-local-variable 'verb)
-  (setq verb nil)
-  (make-local-variable 'obj)
-  (setq obj nil)
-  (make-local-variable 'feared)
-  (setq feared nil)
-  (make-local-variable 'repetitive-shortness)
-  (setq repetitive-shortness '(0 . 0))
-  (make-local-variable '**mad**)
-  (setq **mad** nil)
-  (make-local-variable 'rms-flag)
-  (setq rms-flag nil)
-  (make-local-variable 'eliza-flag)
-  (setq eliza-flag nil)
-  (make-local-variable 'zippy-flag)
-  (setq zippy-flag nil)
-  (make-local-variable 'suicide-flag)
-  (setq suicide-flag nil)
-  (make-local-variable 'lover)
-  (setq lover '(your partner))
-  (make-local-variable 'bak)
-  (setq bak nil)
-  (make-local-variable 'lincount)
-  (setq lincount 0)
-  (make-local-variable '*print-upcase*)
-  (setq *print-upcase* nil)
-  (make-local-variable '*print-space*)
-  (setq *print-space* nil)
-  (make-local-variable 'howdyflag)
-  (setq howdyflag nil)
-  (make-local-variable 'object)
-  (setq object nil))
+  (set (make-local-variable 'doctor--typos)
+       (mapcar (lambda (x)
+		 (put (car x) 'doctor-correction  (cadr x))
+		 (put (cadr x) 'doctor-expansion (car (cddr x)))
+		 (car x))
+	       '((theyll they\'ll (they will))
+		 (theyre they\'re (they are))
+		 (hes he\'s (he is))
+		 (he7s he\'s (he is))
+		 (im i\'m (you are))
+		 (i7m i\'m (you are))
+		 (isa is\ a (is a))
+		 (thier their (their))
+		 (dont don\'t (do not))
+		 (don7t don\'t (do not))
+		 (you7re you\'re (i am))
+		 (you7ve you\'ve (i have))
+		 (you7ll you\'ll (i will)))))
+  (set (make-local-variable 'doctor-found) nil)
+  (set (make-local-variable 'doctor-owner) nil)
+  (set (make-local-variable 'doctor--history) nil)
+  (set (make-local-variable 'doctor--inter) '((well\,)
+				      (hmmm \.\.\.\ so\,)
+				      (so)
+				      (\.\.\.and)
+				      (then)))
+  (set (make-local-variable 'doctor--continue) '((continue)
+						 (proceed)
+						 (go on)
+						 (keep going)))
+  (set (make-local-variable 'doctor--relation)
+       '((your relationship with)
+	 (something you remember about)
+	 (your feelings toward)
+	 (some experiences you have had with)
+	 (how you feel about)))
+  (set (make-local-variable 'doctor--fears)
+       '(((doc$ doctor--whysay) you are (doc$ doctor--afraidof) (doc// doctor--feared) \?)
+	 (you seem terrified by (doc// doctor--feared) \.)
+	 (when did you first feel (doc$ doctor--afraidof) (doc// doctor--feared) \?)))
+  (set (make-local-variable 'doctor--sure) '((sure)
+					     (positive)
+					     (certain)
+					     (absolutely sure)))
+  (set (make-local-variable 'doctor--afraidof) '((afraid of)
+					 (frightened by)
+					 (scared of)))
+  (set (make-local-variable 'doctor--areyou) '((are you)
+				       (have you been)
+				       (have you been)))
+  (set (make-local-variable 'doctor--isrelated)
+       '((has something to do with)
+	 (is related to)
+	 (could be the reason for)
+	 (is caused by)
+	 (is because of)))
+  (set (make-local-variable 'doctor--arerelated) '((have something to do with)
+					   (are related to)
+					   (could have caused)
+					   (could be the reason for)
+					   (are caused by)
+					   (are because of)))
+  (set (make-local-variable 'doctor--moods)
+       '(((doc$ doctor--areyou) (doc// doctor-found) often \?)
+	 (what causes you to be (doc// doctor-found) \?)
+	 ((doc$ doctor--whysay) you are (doc// doctor-found) \?)))
+  (set (make-local-variable 'doctor--maybe) '((maybe)
+				      (perhaps)
+				      (possibly)))
+  (set (make-local-variable 'doctor--whatwhen) '((what happened when)
+						 (what would happen if)))
+  (set (make-local-variable 'doctor--hello) '((how do you do \?)
+				      (hello \.)
+				      (howdy!)
+				      (hello \.)
+				      (hi \.)
+				      (hi there \.)))
+  (set (make-local-variable 'doctor--drnk)
+       '((do you drink a lot of (doc// doctor-found) \?)
+	 (do you get drunk often \?)
+	 ((doc$ doctor--describe) your drinking habits \.)))
+  (set (make-local-variable 'doctor--drugs)
+       '((do you use (doc// doctor-found) often \?)
+	 ((doc$ doctor--areyou) addicted to (doc// doctor-found) \?)
+	 (do you realize that drugs can be very harmful \?)
+	 ((doc$ doctor--maybe) you should try to quit using (doc// doctor-found) \.)))
+  (set (make-local-variable 'doctor--whywant)
+       '(((doc$ doctor--whysay) (doc// doctor-subj) might (doc$ doctor--want) (doc// doctor-obj) \?)
+	 (how does it feel to want \?)
+	 (why should (doc// doctor-subj) get (doc// doctor-obj) \?)
+	 (when did (doc// doctor-subj) first (doc$ doctor--want) (doc// doctor-obj) \?)
+	 ((doc$ doctor--areyou) obsessed with (doc// doctor-obj) \?)
+	 (why should i give (doc// doctor-obj) to (doc// doctor-subj) \?)
+	 (have you ever gotten (doc// doctor-obj) \?)))
+  (set (make-local-variable 'doctor--canyou)
+       '((of course i can \.)
+	 (why should i \?)
+	 (what makes you think i would even want to \?)
+	 (i am the doctor\, i can do anything i damn please \.)
+	 (not really\, it\'s not up to me \.)
+	 (depends\, how important is it \?)
+	 (i could\, but i don\'t think it would be a wise thing to do \.)
+	 (can you \?)
+	 (maybe i can\, maybe i can\'t \.\.\.)
+	 (i don\'t think i should do that \.)))
+  (set (make-local-variable 'doctor--want) '((want) (desire) (wish) (want) (hope)))
+  (set (make-local-variable 'doctor--shortlst)
+       '((can you elaborate on that \?)
+	 ((doc$ doctor--please) continue \.)
+	 (go on\, don\'t be afraid \.)
+	 (i need a little more detail please \.)
+	 (you\'re being a bit brief\, (doc$ doctor--please) go into detail \.)
+	 (can you be more explicit \?)
+	 (and \?)
+	 ((doc$ doctor--please) go into more detail \?)
+	 (you aren\'t being very talkative today\!)
+	 (is that all there is to it \?)
+	 (why must you respond so briefly \?)))
+  (set (make-local-variable 'doctor--famlst)
+       '((tell me (doc$ doctor--something) about (doc// doctor-owner) family \.)
+	 (you seem to dwell on (doc// doctor-owner) family \.)
+	 ((doc$ doctor--areyou) hung up on (doc// doctor-owner) family \?)))
+  (set (make-local-variable 'doctor--huhlst)
+       '(((doc$ doctor--whysay)(doc// doctor-sent) \?)
+	 (is it because of (doc$ doctor--things) that you say (doc// doctor-sent) \?)))
+  (set (make-local-variable 'doctor--longhuhlst)
+       '(((doc$ doctor--whysay) that \?)
+	 (i don\'t understand \.)
+	 ((doc$ doctor--thlst))
+	 ((doc$ doctor--areyou) (doc$ doctor--afraidof) that \?)))
+  (set (make-local-variable 'doctor--feelings-about) '((feelings about)
+					       (apprehensions toward)
+					       (thoughts on)
+					       (emotions toward)))
+  (set (make-local-variable 'doctor--random-adjective)
+       '((vivid)
+	 (emotionally stimulating)
+	 (exciting)
+	 (boring)
+	 (interesting)
+	 (recent)
+	 (random) ; how can we omit this?
+	 (unusual)
+	 (shocking)
+	 (embarrassing)))
+  (set (make-local-variable 'doctor--whysay) '((why do you say)
+				       (what makes you believe)
+				       (are you sure that)
+				       (do you really think)
+				       (what makes you think)))
+  (set (make-local-variable 'doctor--isee) '((i see \.\.\.)
+				     (yes\,)
+				     (i understand \.)
+				     (oh \.) ))
+  (set (make-local-variable 'doctor--please) '((please\,)
+				       (i would appreciate it if you would)
+				       (perhaps you could)
+				       (please\,)
+				       (would you please)
+				       (why don\'t you)
+				       (could you)))
+  (set (make-local-variable 'doctor--bye)
+       '((my secretary will send you a bill \.)
+	 (bye bye \.)
+	 (see ya \.)
+	 (ok\, talk to you some other time \.)
+	 (talk to you later \.)
+	 (ok\, have fun \.)
+	 (ciao \.)))
+  (set (make-local-variable 'doctor--something) '((something)
+						  (more)
+						  (how you feel)))
+  (set (make-local-variable 'doctor--thing) '((your life)
+				      (your sex life)))
+  (set (make-local-variable 'doctor--things) '((your plans)
+				       (the people you hang around with)
+				       (problems at school)
+				       (any hobbies you have)
+				       (hangups you have)
+				       (your inhibitions)
+				       (some problems in your childhood)
+				       (some problems at home)))
+  (set (make-local-variable 'doctor--describe) '((describe)
+					 (tell me about)
+					 (talk about)
+					 (discuss)
+					 (tell me more about)
+					 (elaborate on)))
+  (set (make-local-variable 'doctor--ibelieve)
+       '((i believe) (i think) (i have a feeling) (it seems to me that)
+	 (it looks like)))
+  (set (make-local-variable 'doctor--problems) '((problems)
+					 (inhibitions)
+					 (hangups)
+					 (difficulties)
+					 (anxieties)
+					 (frustrations)))
+  (set (make-local-variable 'doctor--bother) '((does it bother you that)
+				       (are you annoyed that)
+				       (did you ever regret)
+				       (are you sorry)
+				       (are you satisfied with the fact that)))
+  (set (make-local-variable 'doctor--machlst)
+       '((you have your mind on (doc// doctor-found) \, it seems \.)
+	 (you think too much about  (doc// doctor-found) \.)
+	 (you should try taking your mind off of (doc// doctor-found)\.)
+	 (are you a computer hacker \?)))
+  (set (make-local-variable 'doctor--qlist)
+       '((what do you think \?)
+	 (i\'ll ask the questions\, if you don\'t mind!)
+	 (i could ask the same thing myself \.)
+	 ((doc$ doctor--please) allow me to do the questioning \.)
+	 (i have asked myself that question many times \.)
+	 ((doc$ doctor--please) try to answer that question yourself \.)))
+  (set (make-local-variable 'doctor--foullst)
+       '(((doc$ doctor--please) watch your tongue!)
+	 ((doc$ doctor--please) avoid such unwholesome thoughts \.)
+	 ((doc$ doctor--please) get your mind out of the gutter \.)
+	 (such lewdness is not appreciated \.)))
+  (set (make-local-variable 'doctor--deathlst)
+       '((this is not a healthy way of thinking \.)
+	 ((doc$ doctor--bother) you\, too\, may die someday \?)
+	 (i am worried by your obsession with this topic!)
+	 (did you watch a lot of crime and violence on television as a child \?)))
+  (set (make-local-variable 'doctor--sexlst)
+       '(((doc$ doctor--areyou) (doc$ doctor--afraidof) sex \?)
+	 ((doc$ doctor--describe)(doc$ doctor--something) about your sexual history \.)
+	 ((doc$ doctor--please)(doc$ doctor--describe) your sex life \.\.\.)
+	 ((doc$ doctor--describe) your (doc$ doctor--feelings-about) your sexual partner \.)
+	 ((doc$ doctor--describe) your most (doc$ doctor--random-adjective) sexual experience \.)
+	 ((doc$ doctor--areyou) satisfied with (doc// doctor--lover) \.\.\. \?)))
+  (set (make-local-variable 'doctor--neglst) '((why not \?)
+				       ((doc$ doctor--bother) i ask that \?)
+				       (why not \?)
+				       (why not \?)
+				       (how come \?)
+				       ((doc$ doctor--bother) i ask that \?)))
+  (set (make-local-variable 'doctor--beclst)
+       '((is it because (doc// doctor-sent) that you came to me \?)
+	 ((doc$ doctor--bother)(doc// doctor-sent) \?)
+	 (when did you first know that (doc// doctor-sent) \?)
+	 (is the fact that (doc// doctor-sent) the real reason \?)
+	 (does the fact that (doc// doctor-sent) explain anything else \?)
+	 ((doc$ doctor--areyou)(doc$ doctor--sure)(doc// doctor-sent) \? )))
+  (set (make-local-variable 'doctor--shortbeclst)
+   '(((doc$ doctor--bother) i ask you that \?)
+     (that\'s not much of an answer!)
+     ((doc$ doctor--inter) why won\'t you talk about it \?)
+     (speak up!)
+     ((doc$ doctor--areyou) (doc$ doctor--afraidof) talking about it \?)
+     (don\'t be (doc$ doctor--afraidof) elaborating \.)
+     ((doc$ doctor--please) go into more detail \.)))
+  (set (make-local-variable 'doctor--thlst)
+       '(((doc$ doctor--maybe)(doc$ doctor--thing)(doc$ doctor--isrelated) this \.)
+	 ((doc$ doctor--maybe)(doc$ doctor--things)(doc$ doctor--arerelated) this \.)
+	 (is it because of (doc$ doctor--things) that you are going through all this \?)
+	 (how do you reconcile (doc$ doctor--things) \? )
+	 ((doc$ doctor--maybe) this (doc$ doctor--isrelated)(doc$ doctor--things) \?)))
+  (set (make-local-variable 'doctor--remlst)
+       '((earlier you said (doc$ doctor--history) \?)
+	 (you mentioned that (doc$ doctor--history) \?)
+	 ((doc$ doctor--whysay)(doc$ doctor--history) \? )))
+  (set (make-local-variable 'doctor--toklst)
+       '((is this how you relax \?)
+	 (how long have you been smoking	grass \?)
+	 ((doc$ doctor--areyou) (doc$ doctor--afraidof) of being drawn to using harder stuff \?)))
+  (set (make-local-variable 'doctor--states)
+       '((do you get (doc// doctor-found) often \?)
+	 (do you enjoy being (doc// doctor-found) \?)
+	 (what makes you (doc// doctor-found) \?)
+	 (how often (doc$ doctor--areyou)(doc// doctor-found) \?)
+	 (when were you last (doc// doctor-found) \?)))
+  (set (make-local-variable 'doctor--replist) '((i . (you))
+					(my . (your))
+					(me . (you))
+					(you . (me))
+					(your . (my))
+					(mine . (yours))
+					(yours . (mine))
+					(our . (your))
+					(ours . (yours))
+					(we . (you))
+					(dunno . (do not know))
+					;;	  (yes . ())
+					(no\, . ())
+					(yes\, . ())
+					(ya . (i))
+					(aint . (am not))
+					(wanna . (want to))
+					(gimme . (give me))
+					(gotta . (have to))
+					(gonna . (going to))
+					(never . (not ever))
+					(doesn\'t . (does not))
+					(don\'t . (do not))
+					(aren\'t . (are not))
+					(isn\'t . (is not))
+					(won\'t . (will not))
+					(can\'t . (cannot))
+					(haven\'t . (have not))
+					(i\'m . (you are))
+					(ourselves . (yourselves))
+					(myself . (yourself))
+					(yourself . (myself))
+					(you\'re . (i am))
+					(you\'ve . (i have))
+					(i\'ve . (you have))
+					(i\'ll . (you will))
+					(you\'ll . (i shall))
+					(i\'d . (you would))
+					(you\'d . (i would))
+					(here . (there))
+					(please . ())
+					(eh\, . ())
+					(eh . ())
+					(oh\, . ())
+					(oh . ())
+					(shouldn\'t . (should not))
+					(wouldn\'t . (would not))
+					(won\'t . (will not))
+					(hasn\'t . (has not))))
+  (set (make-local-variable 'doctor--stallmanlst)
+       '(((doc$ doctor--describe) your (doc$ doctor--feelings-about) him \.)
+	 ((doc$ doctor--areyou) a friend of Stallman \?)
+	 ((doc$ doctor--bother) Stallman is (doc$ doctor--random-adjective) \?)
+	 ((doc$ doctor--ibelieve) you are (doc$ doctor--afraidof) him \.)))
+  (set (make-local-variable 'doctor--schoollst)
+       '(((doc$ doctor--describe) your (doc// doctor-found) \.)
+	 ((doc$ doctor--bother) your grades could (doc$ doctor--improve) \?)
+	 ((doc$ doctor--areyou) (doc$ doctor--afraidof) (doc// doctor-found) \?)
+	 ((doc$ doctor--maybe) this (doc$ doctor--isrelated) to your attitude \.)
+	 ((doc$ doctor--areyou) absent often \?)
+	 ((doc$ doctor--maybe) you should study (doc$ doctor--something) \.)))
+  (set (make-local-variable 'doctor--improve)
+       '((improve) (be better) (be improved) (be higher)))
+  (set (make-local-variable 'doctor--elizalst)
+       '(((doc$ doctor--areyou) (doc$ doctor--sure) \?)
+	 ((doc$ doctor--ibelieve) you have (doc$ doctor--problems) with (doc// doctor-found) \.)
+	 ((doc$ doctor--whysay) (doc// doctor-sent) \?)))
+  (set (make-local-variable 'doctor--sportslst)
+       '((tell me (doc$ doctor--something) about (doc// doctor-found) \.)
+	 ((doc$ doctor--describe) (doc$ doctor--relation) (doc// doctor-found) \.)
+	 (do you find (doc// doctor-found) (doc$ doctor--random-adjective) \?)))
+  (set (make-local-variable 'doctor--mathlst)
+       '(((doc$ doctor--describe) (doc$ doctor--something) about math \.)
+	 ((doc$ doctor--maybe) your (doc$ doctor--problems) (doc$ doctor--arerelated) (doc// doctor-found) \.)
+	 (i don\'t know much (doc// doctor-found) \, but (doc$ doctor--continue)
+	    anyway \.)))
+  (set (make-local-variable 'doctor--zippylst)
+       '(((doc$ doctor--areyou) Zippy \?)
+	 ((doc$ doctor--ibelieve) you have some serious (doc$ doctor--problems) \.)
+	 ((doc$ doctor--bother) you are a pinhead \?)))
+  (set (make-local-variable 'doctor--chatlst)
+       '(((doc$ doctor--maybe) we could chat \.)
+	 ((doc$ doctor--please) (doc$ doctor--describe) (doc$ doctor--something) about chat mode \.)
+	 ((doc$ doctor--bother) our discussion is so (doc$ doctor--random-adjective) \?)))
+  (set (make-local-variable 'doctor--abuselst)
+       '(((doc$ doctor--please) try to be less abusive \.)
+	 ((doc$ doctor--describe) why you call me (doc// doctor-found) \.)
+	 (i\'ve had enough of you!)))
+  (set (make-local-variable 'doctor--abusewords)
+       '(boring bozo clown clumsy cretin dumb dummy
+		fool foolish gnerd gnurd idiot jerk
+		lose loser louse lousy luse luser
+		moron nerd nurd oaf oafish reek
+		stink stupid tool toolish twit))
+  (set (make-local-variable 'doctor--howareyoulst)
+       '((how are you) (hows it going) (hows it going eh)
+	 (how\'s it going) (how\'s it going eh) (how goes it)
+	 (whats up) (whats new) (what\'s up) (what\'s new)
+	 (howre you) (how\'re you) (how\'s everything)
+	 (how is everything) (how do you do)
+	 (how\'s it hanging) (que pasa)
+	 (how are you doing) (what do you say)))
+  (set (make-local-variable 'doctor--whereoutp) '(huh remem rthing))
+  (set (make-local-variable 'doctor-subj) nil)
+  (set (make-local-variable 'doctor-verb) nil)
+  (set (make-local-variable 'doctor-obj) nil)
+  (set (make-local-variable 'doctor--feared) nil)
+  (set (make-local-variable 'doctor--repetitive-shortness) '(0 . 0))
+  (set (make-local-variable 'doctor--**mad**) nil)
+  (set (make-local-variable 'doctor--rms-flag) nil)
+  (set (make-local-variable 'doctor--eliza-flag) nil)
+  (set (make-local-variable 'doctor--zippy-flag) nil)
+  (set (make-local-variable 'doctor--suicide-flag) nil)
+  (set (make-local-variable 'doctor--lover) '(your partner))
+  (set (make-local-variable 'doctor--bak) nil)
+  (set (make-local-variable 'doctor--lincount) 0)
+  (set (make-local-variable 'doctor--*print-upcase*) nil)
+  (set (make-local-variable 'doctor--*print-space*) nil)
+  (set (make-local-variable 'doctor--howdyflag) nil)
+  (set (make-local-variable 'doctor-object) nil))

 ;; Define equivalence classes of words that get treated alike.

 (defun doctor-meaning (x) (get x 'doctor-meaning))

 (defmacro doctor-put-meaning (symb val)
-    "Store the base meaning of a word on the property list."
-    (list 'put (list 'quote symb) ''doctor-meaning val))
+  "Store the base meaning of a word on the property list."
+  `(put ',symb 'doctor-meaning ,val))

 (doctor-put-meaning howdy 'howdy)
 (doctor-put-meaning hi 'howdy)
@@ -855,10 +836,10 @@
   (interactive)
   (let ((sent (doctor-readin)))
     (insert "\n")
-    (setq lincount (1+ lincount))
+    (setq doctor--lincount (1+ doctor--lincount))
     (doctor-doc sent)
     (insert "\n")
-    (setq bak sent)))
+    (setq doctor--bak sent)))

 (defun doctor-readin nil
   "Read a sentence.  Return it as a list of words."
@@ -878,70 +859,70 @@

 ;; Main processing function for sentences that have been read.

-(defun doctor-doc (sent)
+(defun doctor-doc (doctor-sent)
   (cond
-   ((equal sent '(foo))
-    (doctor-type '(bar! (doc$ please)(doc$ continue) \.)))
-   ((member sent howareyoulst)
-    (doctor-type '(i\'m ok \.  (doc$ describe) yourself \.)))
-   ((or (member sent '((good bye) (see you later) (i quit) (so long)
+   ((equal doctor-sent '(foo))
+    (doctor-type '(bar! (doc$ doctor--please)(doc$ doctor--continue) \.)))
+   ((member doctor-sent doctor--howareyoulst)
+    (doctor-type '(i\'m ok \.  (doc$ doctor--describe) yourself \.)))
+   ((or (member doctor-sent '((good bye) (see you later) (i quit) (so long)
 		       (go away) (get lost)))
-	(memq (car sent)
+	(memq (car doctor-sent)
 	      '(bye halt break quit done exit goodbye
 		    bye\, stop pause goodbye\, stop pause)))
-    (doctor-type (doc$ bye)))
-   ((and (eq (car sent) 'you)
-	 (memq (cadr sent) abusewords))
-    (setq found (cadr sent))
-    (doctor-type (doc$ abuselst)))
-   ((eq (car sent) 'whatmeans)
-    (doctor-def (cadr sent)))
-   ((equal sent '(parse))
-    (doctor-type (list  'subj '= subj ",  "
-			'verb '= verb "\n"
-			'object 'phrase '= obj ","
-			'noun 'form '=  object "\n"
-			'current 'keyword 'is found
+    (doctor-type (doc$ doctor--bye)))
+   ((and (eq (car doctor-sent) 'you)
+	 (memq (cadr doctor-sent) doctor--abusewords))
+    (setq doctor-found (cadr doctor-sent))
+    (doctor-type (doc$ doctor--abuselst)))
+   ((eq (car doctor-sent) 'whatmeans)
+    (doctor-def (cadr doctor-sent)))
+   ((equal doctor-sent '(parse))
+    (doctor-type (list  'subj '= doctor-subj ",  "
+			'verb '= doctor-verb "\n"
+			'object 'phrase '= doctor-obj ","
+			'noun 'form '=  doctor-object "\n"
+			'current 'keyword 'is doctor-found
 			", "
 			'most 'recent 'possessive
-			'is owner "\n"
+			'is doctor-owner "\n"
 			'sentence 'used 'was
 			"..."
-			'(doc// bak))))
-   ((memq (car sent) '(are is do has have how when where who why))
-    (doctor-type (doc$ qlist)))
-   ;;   ((eq (car sent) 'forget)
-   ;;    (set (cadr sent) nil)
-   ;;    (doctor-type '((doc$ isee)(doc$ please)
-   ;;     (doc$ continue)\.)))
+			'(doc// doctor--bak))))
+   ((memq (car doctor-sent) '(are is do has have how when where who why))
+    (doctor-type (doc$ doctor--qlist)))
+   ;;   ((eq (car doctor-sent) 'forget)
+   ;;    (set (cadr doctor-sent) nil)
+   ;;    (doctor-type '((doc$ doctor--isee)(doc$ doctor--please)
+   ;;     (doc$ doctor--continue)\.)))
    (t
-    (if (doctor-defq sent) (doctor-define sent found))
-    (if (> (length sent) 12)(setq sent (doctor-shorten sent)))
-    (setq sent (doctor-correct-spelling (doctor-replace sent replist)))
-    (cond ((and (not (memq 'me sent))(not (memq 'i sent))
-		(memq 'am sent))
-	   (setq sent (doctor-replace sent '((am . (are)))))))
-    (cond ((equal (car sent) 'yow) (doctor-zippy))
-	  ((< (length sent) 2)
-	   (cond ((eq (doctor-meaning (car sent)) 'howdy)
+    (if (doctor-defq doctor-sent) (doctor-define doctor-sent doctor-found))
+    (if (> (length doctor-sent) 12)(setq doctor-sent (doctor-shorten doctor-sent)))
+    (setq doctor-sent (doctor-correct-spelling (doctor-replace doctor-sent doctor--replist)))
+    (cond ((and (not (memq 'me doctor-sent))(not (memq 'i doctor-sent))
+		(memq 'am doctor-sent))
+	   (setq doctor-sent (doctor-replace doctor-sent '((am . (are)))))))
+    (cond ((equal (car doctor-sent) 'yow) (doctor-zippy))
+	  ((< (length doctor-sent) 2)
+	   (cond ((eq (doctor-meaning (car doctor-sent)) 'howdy)
 		  (doctor-howdy))
 		 (t (doctor-short))))
 	  (t
-	   (if (memq 'am sent)
-	       (setq sent (doctor-replace sent '((me . (i))))))
-	   (setq sent (doctor-fixup sent))
-	   (if (and (eq (car sent) 'do) (eq (cadr sent) 'not))
+	   (if (memq 'am doctor-sent)
+	       (setq doctor-sent (doctor-replace doctor-sent '((me . (i))))))
+	   (setq doctor-sent (doctor-fixup doctor-sent))
+	   (if (and (eq (car doctor-sent) 'do) (eq (cadr doctor-sent) 'not))
 	       (cond ((zerop (random 3))
-		      (doctor-type '(are you (doc$ afraidof) that \?)))
+		      (doctor-type '(are you (doc$ doctor--afraidof) that \?)))
 		     ((zerop (random 2))
 		      (doctor-type '(don\'t tell me what to do \. i am the
 					    doctor here!))
 		      (doctor-rthing))
 		     (t
-		      (doctor-type '((doc$ whysay) that i shouldn\'t
-				     (cddr sent)
+		      (doctor-type '((doc$ doctor--whysay) that i shouldn\'t
+				     (cddr doctor-sent)
 				     \?))))
-	     (doctor-go (doctor-wherego sent))))))))
+	     (doctor-go (doctor-wherego doctor-sent))))))))

 ;; Things done to process sentences once read.

@@ -949,8 +930,9 @@
   "Correct the spelling and expand each word in sentence."
   (if sent
       (apply 'append (mapcar (lambda (word)
-				(if (memq word typos)
-				    (get (get word 'doctor-correction) 'doctor-expansion)
+				(if (memq word doctor--typos)
+				    (get (get word 'doctor-correction)
+					 'doctor-expansion)
 				  (list word)))
 			     sent))))

@@ -972,33 +954,32 @@
 (defun doctor-define (sent found)
   (doctor-svo sent found 1 nil)
   (and
-   (doctor-nounp subj)
-   (not (doctor-pronounp subj))
-   subj
-   (doctor-meaning object)
-   (put subj 'doctor-meaning (doctor-meaning object))
+   (doctor-nounp doctor-subj)
+   (not (doctor-pronounp doctor-subj))
+   doctor-subj
+   (doctor-meaning doctor-object)
+   (put doctor-subj 'doctor-meaning (doctor-meaning doctor-object))
    t))

 (defun doctor-defq (sent)
-  "Set global var FOUND to first keyword found in sentence SENT."
-  (setq found nil)
+  "Set global var DOCTOR-FOUND to first keyword found in sentence SENT."
+  (setq doctor-found nil)
   (let ((temp '(means applies mean refers refer related
 		      similar defined associated linked like same)))
     (while temp
 	   (if (memq (car temp) sent)
-	       (setq found (car temp)
+	       (setq doctor-found (car temp)
 		     temp nil)
 	       (setq temp (cdr temp)))))
-  found)
+  doctor-found)

 (defun doctor-def (x)
-  (progn
-   (doctor-type (list 'the 'word x 'means (doctor-meaning x) 'to 'me))
-   nil))
+  (doctor-type (list 'the 'word x 'means (doctor-meaning x) 'to 'me))
+  nil)

 (defun doctor-forget ()
   "Delete the last element of the history list."
-  (setq history (reverse (cdr (reverse history)))))
+  (setq doctor--history (reverse (cdr (reverse doctor--history)))))

 (defun doctor-query (x)
   "Prompt for a line of input from the minibuffer until a noun or verb is seen.
@@ -1026,16 +1007,16 @@

 (defun doctor-subjsearch (sent key type)
   "Search for the subject of a sentence SENT, looking for the noun closest
-to and preceding KEY by at least TYPE words.  Set global variable subj to
+to and preceding KEY by at least TYPE words.  Set global variable doctor-subj to
 the subject noun, and return the portion of the sentence following it."
   (let ((i (- (length sent) (length (memq key sent)) type)))
     (while (and (> i -1) (not (doctor-nounp (nth i sent))))
       (setq i (1- i)))
     (cond ((> i -1)
-	   (setq subj (nth i sent))
+	   (setq doctor-subj (nth i sent))
 	   (nthcdr (1+ i) sent))
 	  (t
-	   (setq subj 'you)
+	   (setq doctor-subj 'you)
 	   nil))))

 (defun doctor-nounp (x)
@@ -1149,12 +1130,12 @@
 	  (t 'something))))

 (defun doctor-getnoun (x)
-  (cond ((null x)(setq object 'something))
-	((atom x)(setq object x))
+  (cond ((null x)(setq doctor-object 'something))
+	((atom x)(setq doctor-object x))
 	((eq (length x) 1)
-	 (setq object (cond
-		       ((doctor-nounp (setq object (car x))) object)
-		       (t (doctor-query object)))))
+	 (setq doctor-object (cond
+		       ((doctor-nounp (setq doctor-object (car x))) doctor-object)
+		       (t (doctor-query doctor-object)))))
 	((eq (car x) 'to)
 	 (doctor-build 'to\  (doctor-getnoun (cdr x))))
 	((doctor-prepp (car x))
@@ -1170,7 +1151,7 @@
 						   (car x) (car x))))))
 				     " ")
 		       (doctor-getnoun (cdr x))))
-	(t (setq object (car x))
+	(t (setq doctor-object (car x))
 	   (doctor-build (doctor-build (car x) " ") (doctor-getnoun (cdr x))))
 	))

@@ -1238,9 +1219,9 @@
 		  under underneath with without)))

 (defun doctor-remember (thing)
-  (cond ((null history)
-	 (setq history (list thing)))
-	(t (setq history (append history (list thing))))))
+  (cond ((null doctor--history)
+	 (setq doctor--history (list thing)))
+	(t (setq doctor--history (append doctor--history (list thing))))))

 (defun doctor-type (x)
   (setq x (doctor-fix-2 x))
@@ -1317,57 +1298,58 @@
 element pair in RLIST."
   (apply 'append
 	 (mapcar
-	  (function
 	   (lambda (x)
 	     (cdr (or (assq x rlist)   ; either find a replacement
-		      (list x x)))))   ; or fake an identity mapping
-	  sent)))
+		      (list x x))))    ; or fake an identity mapping
+	   sent)))

 (defun doctor-wherego (sent)
-  (cond ((null sent)(doc$ whereoutp))
+  (cond ((null sent)(doc$ doctor--whereoutp))
 	((null (doctor-meaning (car sent)))
 	 (doctor-wherego (cond ((zerop (random 2))
 				(reverse (cdr sent)))
 			       (t (cdr sent)))))
 	(t
-	 (setq found (car sent))
+	 (setq doctor-found (car sent))
 	 (doctor-meaning (car sent)))))

 (defun doctor-svo (sent key type mem)
   "Find subject, verb and object in sentence SENT with focus on word KEY.
 TYPE is number of words preceding KEY to start looking for subject.
 MEM is t if results are to be put on Doctor's memory stack.
-Return in the global variables SUBJ, VERB and OBJECT."
+Return in the global variables DOCTOR-SUBJ, DOCTOR-VERB, DOCTOR-OBJECT,
+and DOCTOR-OBJ."
   (let ((foo (doctor-subjsearch sent key type)))
     (or foo
 	(setq foo sent
 	      mem nil))
     (while (and (null (doctor-verbp (car foo))) (cdr foo))
       (setq foo (cdr foo)))
-    (setq verb (car foo))
-    (setq obj (doctor-getnoun (cdr foo)))
-    (cond ((eq object 'i)(setq object 'me))
-	  ((eq subj 'me)(setq subj 'i)))
-    (cond (mem (doctor-remember (list subj verb obj))))))
+    (setq doctor-verb (car foo))
+    (setq doctor-obj (doctor-getnoun (cdr foo)))
+    (cond ((eq doctor-object 'i)(setq doctor-object 'me))
+	  ((eq doctor-subj 'me)(setq doctor-subj 'i)))
+    (cond (mem (doctor-remember (list doctor-subj doctor-verb doctor-obj))))))

 (defun doctor-possess (sent key)
   "Set possessive in SENT for keyword KEY.
-Hack on previous word, setting global variable OWNER to correct result."
+Hack on previous word, setting global variable DOCTOR-OWNER to correct result."
   (let* ((i (- (length sent) (length (memq key sent)) 1))
 	 (prev (if (< i 0) 'your
 		 (nth i sent))))
-    (setq owner (if (or (doctor-possessivepronounp prev)
-			(string-equal "s"
-				      (substring (doctor-make-string prev)
-						 -1)))
-		    prev
-		  'your))))
+    (setq doctor-owner
+	  (if (or (doctor-possessivepronounp prev)
+		  (string-equal "s"
+				(substring (doctor-make-string prev)
+					   -1)))
+	      prev
+	    'your))))

 ;; Output of replies.

 (defun doctor-txtype (ans)
   "Output to buffer a list of symbols or strings as a sentence."
-  (setq *print-upcase* t *print-space* nil)
+  (setq doctor--*print-upcase* t doctor--*print-space* nil)
   (mapc 'doctor-type-symbol ans)
   (insert "\n"))

@@ -1375,20 +1357,18 @@
   "Output a symbol to the buffer with some fancy case and spacing hacks."
   (setq word (doctor-make-string word))
   (if (string-equal word "i") (setq word "I"))
-  (if *print-upcase*
-      (progn
-	(setq word (capitalize word))
-	(if *print-space*
-	    (insert " "))))
+  (when doctor--*print-upcase*
+    (setq word (capitalize word))
+    (if doctor--*print-space* (insert " ")))
   (cond ((or (string-match "^[.,;:?! ]" word)
-	     (not *print-space*))
+	     (not doctor--*print-space*))
 	 (insert word))
 	(t (insert ?\s word)))
   (and auto-fill-function
        (> (current-column) fill-column)
        (apply auto-fill-function nil))
-  (setq *print-upcase* (string-match "[.?!]$" word)
-	*print-space* t))
+  (setq doctor--*print-upcase* (string-match "[.?!]$" word)
+	doctor--*print-space* t))

 (defun doctor-build (str1 str2)
   "Make a symbol out of the concatenation of the two non-list arguments."
@@ -1426,220 +1406,219 @@
   (funcall (intern (concat "doctor-" (doctor-make-string destination)))))

 (defun doctor-desire1 ()
-  (doctor-go (doc$ whereoutp)))
+  (doctor-go (doc$ doctor--whereoutp)))

 (defun doctor-huh ()
-  (cond ((< (length sent) 9) (doctor-type (doc$ huhlst)))
-	(t (doctor-type (doc$ longhuhlst)))))
+  (cond ((< (length doctor-sent) 9) (doctor-type (doc$ doctor--huhlst)))
+	(t (doctor-type (doc$ doctor--longhuhlst)))))

-(defun doctor-rthing () (doctor-type (doc$ thlst)))
+(defun doctor-rthing () (doctor-type (doc$ doctor--thlst)))

-(defun doctor-remem () (cond ((null history)(doctor-huh))
-			     ((doctor-type (doc$ remlst)))))
+(defun doctor-remem () (cond ((null doctor--history)(doctor-huh))
+			     ((doctor-type (doc$ doctor--remlst)))))

 (defun doctor-howdy ()
-  (cond ((not howdyflag)
-	 (doctor-type '((doc$ hello) what brings you to see me \?))
-	 (setq howdyflag t))
+  (cond ((not doctor--howdyflag)
+	 (doctor-type '((doc$ doctor--hello) what brings you to see me \?))
+	 (setq doctor--howdyflag t))
 	(t
-	 (doctor-type '((doc$ ibelieve) we\'ve introduced ourselves already \.))
-	 (doctor-type '((doc$ please) (doc$ describe) (doc$ things) \.)))))
+	 (doctor-type '((doc$ doctor--ibelieve) we\'ve introduced ourselves already \.))
+	 (doctor-type '((doc$ doctor--please) (doc$ doctor--describe) (doc$ doctor--things) \.)))))

 (defun doctor-when ()
-  (cond ((< (length (memq found sent)) 3)(doctor-short))
+  (cond ((< (length (memq doctor-found doctor-sent)) 3)(doctor-short))
 	(t
-	 (setq sent (cdr (memq found sent)))
-	 (setq sent (doctor-fixup sent))
-	 (doctor-type '((doc$ whatwhen)(doc// sent) \?)))))
+	 (setq doctor-sent (cdr (memq doctor-found doctor-sent)))
+	 (setq doctor-sent (doctor-fixup doctor-sent))
+	 (doctor-type '((doc$ doctor--whatwhen)(doc// doctor-sent) \?)))))

 (defun doctor-conj ()
-  (cond ((< (length (memq found sent)) 4)(doctor-short))
+  (cond ((< (length (memq doctor-found doctor-sent)) 4)(doctor-short))
 	(t
-	 (setq sent (cdr (memq found sent)))
-	 (setq sent (doctor-fixup sent))
-	 (cond ((eq (car sent) 'of)
-		(doctor-type '(are you (doc$ sure) that is the real reason \?))
-		(setq things (cons (cdr sent) things)))
+	 (setq doctor-sent (cdr (memq doctor-found doctor-sent)))
+	 (setq doctor-sent (doctor-fixup doctor-sent))
+	 (cond ((eq (car doctor-sent) 'of)
+		(doctor-type '(are you (doc$ doctor--sure) that is the real reason \?))
+		(setq doctor--things (cons (cdr doctor-sent) doctor--things)))
 	       (t
-		(doctor-remember sent)
-		(doctor-type (doc$ beclst)))))))
+		(doctor-remember doctor-sent)
+		(doctor-type (doc$ doctor--beclst)))))))

 (defun doctor-short ()
-  (cond ((= (car repetitive-shortness) (1- lincount))
-	 (rplacd repetitive-shortness
-		 (1+ (cdr repetitive-shortness))))
+  (cond ((= (car doctor--repetitive-shortness) (1- doctor--lincount))
+	 (rplacd doctor--repetitive-shortness
+		 (1+ (cdr doctor--repetitive-shortness))))
 	(t
-	 (rplacd repetitive-shortness 1)))
-  (rplaca repetitive-shortness lincount)
-  (cond ((> (cdr repetitive-shortness) 6)
-	 (cond ((not **mad**)
-		(doctor-type '((doc$ areyou)
+	 (rplacd doctor--repetitive-shortness 1)))
+  (rplaca doctor--repetitive-shortness doctor--lincount)
+  (cond ((> (cdr doctor--repetitive-shortness) 6)
+	 (cond ((not doctor--**mad**)
+		(doctor-type '((doc$ doctor--areyou)
 			       just trying to see what kind of things
 			       i have in my vocabulary \? please try to
 			       carry on a reasonable conversation!))
-		(setq **mad** t))
+		(setq doctor--**mad** t))
 	       (t
 		(doctor-type '(i give up \. you need a lesson in creative
 				 writing \.\.\.))
 		)))
 	(t
-	 (cond ((equal sent (doctor-assm '(yes)))
-		(doctor-type '((doc$ isee) (doc$ inter) (doc$ whysay) this is so \?)))
-	       ((equal sent (doctor-assm '(because)))
-		(doctor-type (doc$ shortbeclst)))
-	       ((equal sent (doctor-assm '(no)))
-		(doctor-type (doc$ neglst)))
-	       (t (doctor-type (doc$ shortlst)))))))
+	 (cond ((equal doctor-sent (doctor-assm '(yes)))
+		(doctor-type '((doc$ doctor--isee) (doc$ doctor--inter) (doc$ doctor--whysay) this is so \?)))
+	       ((equal doctor-sent (doctor-assm '(because)))
+		(doctor-type (doc$ doctor--shortbeclst)))
+	       ((equal doctor-sent (doctor-assm '(no)))
+		(doctor-type (doc$ doctor--neglst)))
+	       (t (doctor-type (doc$ doctor--shortlst)))))))

-(defun doctor-alcohol () (doctor-type (doc$ drnk)))
+(defun doctor-alcohol () (doctor-type (doc$ doctor--drnk)))

 (defun doctor-desire ()
-  (let ((foo (memq found sent)))
+  (let ((foo (memq doctor-found doctor-sent)))
     (cond ((< (length foo) 2)
-	   (doctor-go (doctor-build (doctor-meaning found) 1)))
+	   (doctor-go (doctor-build (doctor-meaning doctor-found) 1)))
 	  ((memq (cadr foo) '(a an))
 	   (rplacd foo (append '(to have) (cdr foo)))
-	   (doctor-svo sent found 1 nil)
-	   (doctor-remember (list subj 'would 'like obj))
-	   (doctor-type (doc$ whywant)))
+	   (doctor-svo doctor-sent doctor-found 1 nil)
+	   (doctor-remember (list doctor-subj 'would 'like doctor-obj))
+	   (doctor-type (doc$ doctor--whywant)))
 	  ((not (eq (cadr foo) 'to))
-	   (doctor-go (doctor-build (doctor-meaning found) 1)))
+	   (doctor-go (doctor-build (doctor-meaning doctor-found) 1)))
 	  (t
-	   (doctor-svo sent found 1 nil)
-	   (doctor-remember (list subj 'would 'like obj))
-	   (doctor-type (doc$ whywant))))))
+	   (doctor-svo doctor-sent doctor-found 1 nil)
+	   (doctor-remember (list doctor-subj 'would 'like doctor-obj))
+	   (doctor-type (doc$ doctor--whywant))))))

 (defun doctor-drug ()
-  (doctor-type (doc$ drugs))
-  (doctor-remember (list 'you 'used found)))
+  (doctor-type (doc$ doctor--drugs))
+  (doctor-remember (list 'you 'used doctor-found)))

 (defun doctor-toke ()
-  (doctor-type (doc$ toklst)))
+  (doctor-type (doc$ doctor--toklst)))

 (defun doctor-state ()
-  (doctor-type (doc$ states))(doctor-remember (list 'you 'were found)))
+  (doctor-type (doc$ doctor--states))(doctor-remember (list 'you 'were doctor-found)))

 (defun doctor-mood ()
-  (doctor-type (doc$ moods))(doctor-remember (list 'you 'felt found)))
+  (doctor-type (doc$ doctor--moods))(doctor-remember (list 'you 'felt doctor-found)))

 (defun doctor-fear ()
-  (setq feared (doctor-setprep sent found))
-  (doctor-type (doc$ fears))
-  (doctor-remember (list 'you 'were 'afraid 'of feared)))
+  (setq doctor--feared (doctor-setprep doctor-sent doctor-found))
+  (doctor-type (doc$ doctor--fears))
+  (doctor-remember (list 'you 'were 'afraid 'of doctor--feared)))

 (defun doctor-hate ()
-  (doctor-svo sent found 1 t)
-  (cond ((memq 'not sent) (doctor-forget) (doctor-huh))
-	((equal subj 'you)
-	 (doctor-type '(why do you (doc// verb)(doc// obj) \?)))
-	(t (doctor-type '((doc$ whysay)(list subj verb obj))))))
+  (doctor-svo doctor-sent doctor-found 1 t)
+  (cond ((memq 'not doctor-sent) (doctor-forget) (doctor-huh))
+	((equal doctor-subj 'you)
+	 (doctor-type '(why do you (doc// doctor-verb)(doc// doctor-obj) \?)))
+	(t (doctor-type '((doc$ doctor--whysay)(list doctor-subj doctor-verb doctor-obj))))))

 (defun doctor-symptoms ()
-  (doctor-type '((doc$ maybe) you should consult a medical doctor\;
+  (doctor-type '((doc$ doctor--maybe) you should consult a medical doctor\;
 		 i am a psychotherapist. \.)))

 (defun doctor-hates ()
-  (doctor-svo sent found 1 t)
+  (doctor-svo doctor-sent doctor-found 1 t)
   (doctor-hates1))

 (defun doctor-hates1 ()
-  (doctor-type '((doc$ whysay)(list subj verb obj) \?)))
+  (doctor-type '((doc$ doctor--whysay)(list doctor-subj doctor-verb doctor-obj) \?)))

 (defun doctor-loves ()
-  (doctor-svo sent found 1 t)
+  (doctor-svo doctor-sent doctor-found 1 t)
   (doctor-qloves))

 (defun doctor-qloves ()
-  (doctor-type '((doc$ bother)(list subj verb obj) \?)))
+  (doctor-type '((doc$ doctor--bother)(list doctor-subj doctor-verb doctor-obj) \?)))

 (defun doctor-love ()
-  (doctor-svo sent found 1 t)
-  (cond ((memq 'not sent) (doctor-forget) (doctor-huh))
-	((memq 'to sent) (doctor-hates1))
+  (doctor-svo doctor-sent doctor-found 1 t)
+  (cond ((memq 'not doctor-sent) (doctor-forget) (doctor-huh))
+	((memq 'to doctor-sent) (doctor-hates1))
 	(t
-	 (cond ((equal object 'something)
-		(setq object '(this person you love))))
-	 (cond ((equal subj 'you)
-		(setq lover obj)
-		(cond ((equal lover '(this person you love))
-		       (setq lover '(your partner))
+	 (cond ((equal doctor-object 'something)
+		(setq doctor-object '(this person you love))))
+	 (cond ((equal doctor-subj 'you)
+		(setq doctor--lover doctor-obj)
+		(cond ((equal doctor--lover '(this person you love))
+		       (setq doctor--lover '(your partner))
 		       (doctor-forget)
 		       (doctor-type '(with whom are you in love \?)))
-		      ((doctor-type '((doc$ please)
-				      (doc$ describe)
-				      (doc$ relation)
-				      (doc// lover)
+		      ((doctor-type '((doc$ doctor--please)
+				      (doc$ doctor--describe)
+				      (doc$ doctor--relation)
+				      (doc// doctor--lover)
 				      \.)))))
-	       ((equal subj 'i)
+	       ((equal doctor-subj 'i)
 		(doctor-txtype '(we were discussing you!)))
 	       (t (doctor-forget)
-		  (setq obj 'someone)
-		  (setq verb (doctor-build verb 's))
+		  (setq doctor-obj 'someone)
+		  (setq doctor-verb (doctor-build doctor-verb 's))
 		  (doctor-qloves))))))

 (defun doctor-mach ()
-  (setq found (doctor-plural found))
-  (doctor-type (doc$ machlst)))
+  (setq doctor-found (doctor-plural doctor-found))
+  (doctor-type (doc$ doctor--machlst)))

 (defun doctor-sexnoun () (doctor-sexverb))

 (defun doctor-sexverb ()
-  (if (or (memq 'me sent)(memq 'myself sent)(memq 'i sent))
+  (if (or (memq 'me doctor-sent)(memq 'myself doctor-sent)(memq 'i doctor-sent))
       (doctor-foul)
-    (doctor-type (doc$ sexlst))))
+    (doctor-type (doc$ doctor--sexlst))))

 (defun doctor-death ()
-  (cond (suicide-flag (doctor-type (doc$ deathlst)))
-	((or (equal found 'suicide)
-             (and (or (equal found 'kill)
-                      (equal found 'killing))
-                  (memq 'yourself sent)))
-	 (setq suicide-flag t)
+  (cond (doctor--suicide-flag (doctor-type (doc$ doctor--deathlst)))
+	((or (equal doctor-found 'suicide)
+             (and (or (equal doctor-found 'kill)
+                      (equal doctor-found 'killing))
+                  (memq 'yourself doctor-sent)))
+	 (setq doctor--suicide-flag t)
 	 (doctor-type '(If you are really suicidal, you might
 			   want to contact the Samaritans via
 			   E-mail: jo@samaritans.org or, at your option,
 			   anonymous E-mail: samaritans@anon.twwells.com\ \.
                            or find a Befrienders crisis center at
 			   http://www.befrienders.org/\ \.
-			   (doc$ please) (doc$ continue) \.)))
-	(t (doctor-type (doc$ deathlst)))))
+			   (doc$ doctor--please) (doc$ doctor--continue) \.)))
+	(t (doctor-type (doc$ doctor--deathlst)))))

 (defun doctor-foul ()
-  (doctor-type (doc$ foullst)))
+  (doctor-type (doc$ doctor--foullst)))

 (defun doctor-family ()
-  (doctor-possess sent found)
-  (doctor-type (doc$ famlst)))
+  (doctor-possess doctor-sent doctor-found)
+  (doctor-type (doc$ doctor--famlst)))

 ;; I did not add this -- rms.
 ;; But he might have removed it.  I put it back.  --roland
 (defun doctor-rms ()
-  (cond (rms-flag (doctor-type (doc$ stallmanlst)))
-	(t (setq rms-flag t) (doctor-type '(do you know Stallman \?)))))
+  (cond (doctor--rms-flag (doctor-type (doc$ doctor--stallmanlst)))
+	(t (setq doctor--rms-flag t) (doctor-type '(do you know Stallman \?)))))

-(defun doctor-school nil (doctor-type (doc$ schoollst)))
+(defun doctor-school nil (doctor-type (doc$ doctor--schoollst)))

 (defun doctor-eliza ()
-  (cond (eliza-flag (doctor-type (doc$ elizalst)))
-	(t (setq eliza-flag t)
-	   (doctor-type '((doc// found) \? hah !
-			  (doc$ please) (doc$ continue) \.)))))
+  (cond (doctor--eliza-flag (doctor-type (doc$ doctor--elizalst)))
+	(t (setq doctor--eliza-flag t)
+	   (doctor-type '((doc// doctor-found) \? hah !
+			  (doc$ doctor--please) (doc$ doctor--continue) \.)))))

-(defun doctor-sports ()  (doctor-type (doc$ sportslst)))
+(defun doctor-sports () (doctor-type (doc$ doctor--sportslst)))

-(defun doctor-math () (doctor-type (doc$ mathlst)))
+(defun doctor-math () (doctor-type (doc$ doctor--mathlst)))

 (defun doctor-zippy ()
-  (cond (zippy-flag (doctor-type (doc$ zippylst)))
-	(t (setq zippy-flag t)
+  (cond (doctor--zippy-flag (doctor-type (doc$ doctor--zippylst)))
+	(t (setq doctor--zippy-flag t)
 	   (doctor-type '(yow! are we interactive yet \?)))))


-(defun doctor-chat () (doctor-type (doc$ chatlst)))
+(defun doctor-chat () (doctor-type (doc$ doctor--chatlst)))

 (random t)

 (provide 'doctor)

-;; arch-tag: 579380f6-4902-4ea5-bccb-6339e30e1257
 ;;; doctor.el ends here