diff -r d656b7e454fb -r abbe2bd8ee35 ChangeLog
--- a/ChangeLog	Sat Sep 03 14:49:28 2011 +0200
+++ b/ChangeLog	Sat Aug 17 17:20:29 2013 +0900
@@ -1,3 +1,9 @@
+2013-08-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* doctor.el (//): Rename to #'identity and defun if not fboundp.
+	($): Rename to #'doctor-$.
+	(doctor-$): rename to #'doctor-$-internal.
+
 2009-01-13  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.22 released.
diff -r d656b7e454fb -r abbe2bd8ee35 doctor.el
--- a/doctor.el	Sat Sep 03 14:49:28 2011 +0200
+++ b/doctor.el	Sat Aug 17 17:20:29 2013 +0900
@@ -48,14 +48,20 @@
 (defun doctor-caddr (x) (car (cdr (cdr x))))
 (defun doctor-cddr (x) (cdr (cdr x)))
 
-(defun // (x) x)
+;; // and $ were renamed to identity and doctor-$ respectively
+;; to clean the namespace.
+;; We demand packages!!!
+;; #'identity appears to go back to at least 2000.Mein fuehrer!!
 
-(defmacro $ (what)
-  "quoted arg form of doctor-$"
-  (list 'doctor-$ (list 'quote what)))
+(if (not (fboundp 'identity))
+    (defun identity (x) x))
 
-(defun doctor-$ (what)
+(defmacro doctor-$ (what)
   "Return the car of a list, rotating the list each time"
+  (list 'doctor-$-internal (list 'quote what)))
+
+(defun doctor-$-internal (what)
+  "unquoted arg form of doctor-$"
   (let* ((vv (symbol-value what))
 	(first (car vv))
 	(ww (append (cdr vv) (list first))))
@@ -82,7 +88,7 @@
   (setq mode-name "Doctor")
   (turn-on-auto-fill)
   (doctor-type '(i am the psychotherapist \.
-		 ($ please) ($ describe) your ($ problems) \.
+		 (doctor-$ please) (doctor-$ describe) your (doctor-$ problems) \.
 		 each time you are finished talking, type \R\E\T twice \.))
   (insert "\n"))
 
@@ -143,9 +149,9 @@
 	  (some experiences you have had with)
 	  (how you feel about)))
   (make-local-variable 'fears)
-  (setq fears '( (($ whysay) you are ($ afraidof) (// feared) \?)
-		 (you seem terrified by (// feared) \.)
-		 (when did you first feel ($ afraidof) (// feared) \?) ))
+  (setq fears '( ((doctor-$ whysay) you are (doctor-$ afraidof) (identity feared) \?)
+		 (you seem terrified by (identity feared) \.)
+		 (when did you first feel (doctor-$ afraidof) (identity feared) \?) ))
   (make-local-variable 'sure)
   (setq sure '((sure)(positive)(certain)(absolutely sure)))
   (make-local-variable 'afraidof)
@@ -160,9 +166,9 @@
 		     (could have caused)(could be the reason for) (are caused by)
 		     (are because of)))
   (make-local-variable 'moods)
-  (setq moods '( (($ areyou)(// found) often \?)
-		 (what causes you to be (// found) \?)
-		 (($ whysay) you are (// found) \?) ))
+  (setq moods '( ((doctor-$ areyou)(identity found) often \?)
+		 (what causes you to be (identity found) \?)
+		 ((doctor-$ whysay) you are (identity found) \?) ))
   (make-local-variable 'maybe)
   (setq maybe
 	'((maybe)
@@ -177,22 +183,22 @@
 	'((how do you do \?) (hello \.) (howdy!) (hello \.) (hi \.) (hi there \.)))
   (make-local-variable 'drnk)
   (setq drnk
-	'((do you drink a lot of (// found) \?)
+	'((do you drink a lot of (identity found) \?)
 	  (do you get drunk often \?)
-	  (($ describe) your drinking habits \.) )) 
+	  ((doctor-$ describe) your drinking habits \.) )) 
   (make-local-variable 'drugs)
-  (setq drugs '( (do you use (// found) often \?)(($ areyou)
-						 addicted to (// found) \?)(do you realize that drugs can
-						 be very harmful \?)(($ maybe) you should try to quit using (// found)
+  (setq drugs '( (do you use (identity found) often \?)((doctor-$ areyou)
+						 addicted to (identity found) \?)(do you realize that drugs can
+						 be very harmful \?)((doctor-$ maybe) you should try to quit using (identity found)
 						 \.)))
   (make-local-variable 'whywant)
-  (setq whywant '( (($ whysay) (// subj) might ($ want) (// obj) \?)
+  (setq whywant '( ((doctor-$ whysay) (identity subj) might (doctor-$ want) (identity obj) \?)
 		   (how does it feel to want \?)
-		   (why should (// subj) get (// obj) \?)
-		   (when did (// subj) first ($ want) (// obj) \?)
-		   (($ areyou) obsessed with (// obj) \?)
-		   (why should i give (// obj) to (// subj) \?)
-		   (have you ever gotten (// obj) \?) ))
+		   (why should (identity subj) get (identity obj) \?)
+		   (when did (identity subj) first (doctor-$ want) (identity obj) \?)
+		   ((doctor-$ areyou) obsessed with (identity obj) \?)
+		   (why should i give (identity obj) to (identity subj) \?)
+		   (have you ever gotten (identity obj) \?) ))
   (make-local-variable 'canyou)
   (setq canyou '((of course i can \.)
 		 (why should i \?)
@@ -209,32 +215,32 @@
   (make-local-variable 'shortlst)
   (setq shortlst
 	'((can you elaborate on that \?)
-	  (($ please) continue \.)
+	  ((doctor-$ please) continue \.)
 	  (go on\, don\'t be afraid \.)
 	  (i need a little more detail please \.)
-	  (you\'re being a bit brief\, ($ please) go into detail \.)
+	  (you\'re being a bit brief\, (doctor-$ please) go into detail \.)
 	  (can you be more explicit \?)
 	  (and \?)
-	  (($ please) go into more detail \?)
+	  ((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 \?)))
 
   (make-local-variable 'famlst)
   (setq famlst
-	'((tell me ($ something) about (// owner) family \.)
-	  (you seem to dwell on (// owner) family \.)
-	  (($ areyou) hung up on (// owner) family \?)))
+	'((tell me (doctor-$ something) about (identity owner) family \.)
+	  (you seem to dwell on (identity owner) family \.)
+	  ((doctor-$ areyou) hung up on (identity owner) family \?)))
   (make-local-variable 'huhlst)
   (setq huhlst
-	'((($ whysay)(// sent) \?)
-	  (is it because of ($ things) that you say (// sent) \?) ))
+	'(((doctor-$ whysay)(identity sent) \?)
+	  (is it because of (doctor-$ things) that you say (identity sent) \?) ))
   (make-local-variable 'longhuhlst)
   (setq longhuhlst
-	'((($ whysay) that \?)
+	'(((doctor-$ whysay) that \?)
 	  (i don\'t understand \.)
-	  (($ thlst))
-	  (($ areyou) ($ afraidof) that \?)))
+	  ((doctor-$ thlst))
+	  ((doctor-$ areyou) (doctor-$ afraidof) that \?)))
   (make-local-variable 'feelings-about)
   (setq feelings-about
 	'((feelings about)
@@ -336,92 +342,92 @@
 	  (are you satisfied with the fact that)))
   (make-local-variable 'machlst)
   (setq machlst 
-	'((you have your mind on (// found) \, it seems \.)
-	  (you think too much about  (// found) \.)
-	  (you should try taking your mind off of (// found)\.)
+	'((you have your mind on (identity found) \, it seems \.)
+	  (you think too much about  (identity found) \.)
+	  (you should try taking your mind off of (identity 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 \.)
-	  (($ please) allow me to do the questioning \.)
+	  ((doctor-$ please) allow me to do the questioning \.)
 	  (i have asked myself that question many times \.)
-	  (($ please) try to answer that question yourself \.)))
+	  ((doctor-$ please) try to answer that question yourself \.)))
   (make-local-variable 'elist)
   (setq elist
-	'((($ please) try to calm yourself \.)
-	  (you seem very excited \. relax \. ($ please) ($ describe) ($ things)
+	'(((doctor-$ please) try to calm yourself \.)
+	  (you seem very excited \. relax \. (doctor-$ please) (doctor-$ describe) (doctor-$ things)
 	       \.)
 	  (you\'re being very emotional \. calm down \.)))
   (make-local-variable 'foullst)
   (setq foullst
-	'((($ please) watch your tongue!)
-	  (($ please) avoid such unwholesome thoughts \.)
-	  (($ please) get your mind out of the gutter \.)
+	'(((doctor-$ please) watch your tongue!)
+	  ((doctor-$ please) avoid such unwholesome thoughts \.)
+	  ((doctor-$ 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 \.)
-	  (($ bother) you\, too\, may die someday \?)
+	  ((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 \?))
 	)
   (make-local-variable 'sexlst)
   (setq sexlst 
-	'((($ areyou) ($ afraidof) sex \?)
-	  (($ describe)($ something) about your sexual history \.)
-	  (($ please)($ describe) your sex life \.\.\.)
-	  (($ describe) your ($ feelings-about) your sexual partner \.)
-	  (($ describe) your most ($ random-adjective) sexual experience \.)
-	  (($ areyou) satisfied with (// lover) \.\.\. \?)))
+	'(((doctor-$ areyou) (doctor-$ afraidof) sex \?)
+	  ((doctor-$ describe)(doctor-$ something) about your sexual history \.)
+	  ((doctor-$ please)(doctor-$ describe) your sex life \.\.\.)
+	  ((doctor-$ describe) your (doctor-$ feelings-about) your sexual partner \.)
+	  ((doctor-$ describe) your most (doctor-$ random-adjective) sexual experience \.)
+	  ((doctor-$ areyou) satisfied with (identity lover) \.\.\. \?)))
   (make-local-variable 'neglst)
   (setq neglst
 	'((why not \?)
-	  (($ bother) i ask that \?)
+	  ((doctor-$ bother) i ask that \?)
 	  (why not \?)
 	  (why not \?)
 	  (how come \?)
-	  (($ bother) i ask that \?)))
+	  ((doctor-$ bother) i ask that \?)))
   (make-local-variable 'beclst)
   (setq beclst '(
-		 (is it because (// sent) that you came to me \?)
-		 (($ bother)(// sent) \?)
-		 (when did you first know that (// sent) \?)
-		 (is the fact that (// sent) the real reason \?)
-		 (does the fact that (// sent) explain anything else \?)
-		 (($ areyou)($ sure)(// sent) \? ) ))
+		 (is it because (identity sent) that you came to me \?)
+		 ((doctor-$ bother)(identity sent) \?)
+		 (when did you first know that (identity sent) \?)
+		 (is the fact that (identity sent) the real reason \?)
+		 (does the fact that (identity sent) explain anything else \?)
+		 ((doctor-$ areyou)(doctor-$ sure)(identity sent) \? ) ))
   (make-local-variable 'shortbeclst)
   (setq shortbeclst '(
-		      (($ bother) i ask you that \?)
+		      ((doctor-$ bother) i ask you that \?)
 		      (that\'s not much of an answer!)
-		      (($ inter) why won\'t you talk about it \?)
+		      ((doctor-$ inter) why won\'t you talk about it \?)
 		      (speak up!)
-		      (($ areyou) ($ afraidof) talking about it \?)
-		      (don\'t be ($ afraidof) elaborating \.)
-		      (($ please) go into more detail \.)))
+		      ((doctor-$ areyou) (doctor-$ afraidof) talking about it \?)
+		      (don\'t be (doctor-$ afraidof) elaborating \.)
+		      ((doctor-$ please) go into more detail \.)))
   (make-local-variable 'thlst)
   (setq thlst '(
-		(($ maybe)($ things)($ arerelated) this \.)
-		(is it because of ($ things) that you are going through all this \?)
-		(how do you reconcile ($ things) \? )
-		(($ maybe) this ($ isrelated)($ things) \?) ))
+		((doctor-$ maybe)(doctor-$ things)(doctor-$ arerelated) this \.)
+		(is it because of (doctor-$ things) that you are going through all this \?)
+		(how do you reconcile (doctor-$ things) \? )
+		((doctor-$ maybe) this (doctor-$ isrelated)(doctor-$ things) \?) ))
   (make-local-variable 'remlst)
-  (setq remlst '( (earlier you said ($ history) \?)
-		  (you mentioned that ($ history) \?)
-		  (($ whysay)($ history) \? ) ))
+  (setq remlst '( (earlier you said (doctor-$ history) \?)
+		  (you mentioned that (doctor-$ history) \?)
+		  ((doctor-$ whysay)(doctor-$ history) \? ) ))
   (make-local-variable 'toklst)
   (setq toklst
 	'((is this how you relax \?)
 	  (how long have you been smoking	grass \?)
-	  (($ areyou) ($ afraidof) of being drawn to using harder stuff \?)))
+	  ((doctor-$ areyou) (doctor-$ afraidof) of being drawn to using harder stuff \?)))
   (make-local-variable 'states)
   (setq states
-	'((do you get (// found) often \?)
-	  (do you enjoy being (// found) \?)
-	  (what makes you (// found) \?)
-	  (how often ($ areyou)(// found) \?)
-	  (when were you last (// found) \?)))
+	'((do you get (identity found) often \?)
+	  (do you enjoy being (identity found) \?)
+	  (what makes you (identity found) \?)
+	  (how often (doctor-$ areyou)(identity found) \?)
+	  (when were you last (identity found) \?)))
   (make-local-variable 'replist)
   (setq replist 
 	'((i . (you))
@@ -475,50 +481,50 @@
 	  (hasn\'t . (has not))))
   (make-local-variable 'stallmanlst)
   (setq stallmanlst '(
-		      (($ describe) your ($ feelings-about) him \.)
-		      (($ areyou) a friend of Stallman \?)
-		      (($ bother) Stallman is ($ random-adjective) \?)
-		      (($ ibelieve) you are ($ afraidof) him \.)))
+		      ((doctor-$ describe) your (doctor-$ feelings-about) him \.)
+		      ((doctor-$ areyou) a friend of Stallman \?)
+		      ((doctor-$ bother) Stallman is (doctor-$ random-adjective) \?)
+		      ((doctor-$ ibelieve) you are (doctor-$ afraidof) him \.)))
   (make-local-variable 'schoollst)
   (setq schoollst '(
-		    (($ describe) your (// found) \.)
-		    (($ bother) your grades could ($ improve) \?)
-		    (($ areyou) ($ afraidof) (// found) \?)
-		    (($ maybe) this ($ isrelated) to your attitude \.)
-		    (($ areyou) absent often \?)
-		    (($ maybe) you should study ($ something) \.)))
+		    ((doctor-$ describe) your (identity found) \.)
+		    ((doctor-$ bother) your grades could (doctor-$ improve) \?)
+		    ((doctor-$ areyou) (doctor-$ afraidof) (identity found) \?)
+		    ((doctor-$ maybe) this (doctor-$ isrelated) to your attitude \.)
+		    ((doctor-$ areyou) absent often \?)
+		    ((doctor-$ maybe) you should study (doctor-$ something) \.)))
   (make-local-variable 'improve)
   (setq improve '((improve) (be better) (be improved) (be higher)))
   (make-local-variable 'elizalst)
   (setq elizalst '(
-		   (($ areyou) ($ sure) \?)
-		   (($ ibelieve) you have ($ problems) with (// found) \.)
-		   (($ whysay) (// sent) \?)))
+		   ((doctor-$ areyou) (doctor-$ sure) \?)
+		   ((doctor-$ ibelieve) you have (doctor-$ problems) with (identity found) \.)
+		   ((doctor-$ whysay) (identity sent) \?)))
   (make-local-variable 'sportslst)
   (setq sportslst '(
-		    (tell me ($ something) about (// found) \.)
-		    (($ describe) ($ relation) (// found) \.)
-		    (do you find (// found) ($ random-adjective) \?)))
+		    (tell me (doctor-$ something) about (identity found) \.)
+		    ((doctor-$ describe) (doctor-$ relation) (identity found) \.)
+		    (do you find (identity found) (doctor-$ random-adjective) \?)))
   (make-local-variable 'mathlst)
   (setq mathlst '(
-		  (($ describe) ($ something) about math \.)
-		  (($ maybe) your ($ problems) ($ arerelated) (// found) \.)
-		  (i do\'nt know much (// found) \, but ($ continue)
+		  ((doctor-$ describe) (doctor-$ something) about math \.)
+		  ((doctor-$ maybe) your (doctor-$ problems) (doctor-$ arerelated) (identity found) \.)
+		  (i do\'nt know much (identity found) \, but (doctor-$ continue)
 		     anyway \.)))
   (make-local-variable 'zippylst)
   (setq zippylst '(
-		   (($ areyou) Zippy \?)
-		   (($ ibelieve) you have some serious ($ problems) \.)
-		   (($ bother) you are a pinhead \?)))
+		   ((doctor-$ areyou) Zippy \?)
+		   ((doctor-$ ibelieve) you have some serious (doctor-$ problems) \.)
+		   ((doctor-$ bother) you are a pinhead \?)))
   (make-local-variable 'chatlst)
   (setq chatlst '(
-		  (($ maybe) we could chat \.)
-		  (($ please) ($ describe) ($ something) about chat mode \.)
-		  (($ bother) our discussion is so ($ random-adjective) \?)))
+		  ((doctor-$ maybe) we could chat \.)
+		  ((doctor-$ please) (doctor-$ describe) (doctor-$ something) about chat mode \.)
+		  ((doctor-$ bother) our discussion is so (doctor-$ random-adjective) \?)))
   (make-local-variable 'abuselst)
   (setq abuselst '(
-		   (($ please) try to be less abusive \.)
-		   (($ describe) why you call me (// found) \.)
+		   ((doctor-$ please) try to be less abusive \.)
+		   ((doctor-$ describe) why you call me (identity found) \.)
 		   (i\'ve had enough of you!)))
   (make-local-variable 'abusewords)
   (setq abusewords '(boring bozo clown clumsy cretin dumb dummy
@@ -894,19 +900,19 @@
 (defun doctor-doc (sent)
   (cond
    ((equal sent '(foo))
-    (doctor-type '(bar! ($ please)($ continue) \.)))
+    (doctor-type '(bar! (doctor-$ please)(doctor-$ continue) \.)))
    ((member sent howareyoulst)
-    (doctor-type '(i\'m ok \.  ($ describe) yourself \.)))
+    (doctor-type '(i\'m ok \.  (doctor-$ describe) yourself \.)))
    ((or (member sent '((good bye) (see you later) (i quit) (so long)
 		       (go away) (get lost)))
 	(memq (car sent)
 	      '(bye halt break quit done exit goodbye 
 		    bye\, stop pause goodbye\, stop pause)))
-    (doctor-type ($ bye)))
+    (doctor-type (doctor-$ bye)))
    ((and (eq (car sent) 'you)
 	 (memq (doctor-cadr sent) abusewords))
     (setq found (doctor-cadr sent))
-    (doctor-type ($ abuselst)))
+    (doctor-type (doctor-$ abuselst)))
    ((eq (car sent) 'whatmeans)
     (doctor-def (doctor-cadr sent)))
    ((equal sent '(parse))
@@ -920,11 +926,11 @@
 			'is owner "\n"
 			'sentence 'used 'was
 			"..."
-			'(// bak))))
+			'(identity bak))))
    ;;   ((eq (car sent) 'forget)
    ;;    (set (doctor-cadr sent) nil)
-   ;;    (doctor-type '(($ isee)($ please)
-   ;;     ($ continue)\.)))
+   ;;    (doctor-type '((doctor-$ isee)(doctor-$ please)
+   ;;     (doctor-$ continue)\.)))
    (t
     (if (doctor-defq sent) (doctor-define sent found))
     (if (> (length sent) 12)(doctor-shorten sent))
@@ -943,13 +949,13 @@
 	   (setq sent (doctor-fixup sent))
 	   (if (and (eq (car sent) 'do) (eq (doctor-cadr sent) 'not))
 	       (cond ((zerop (random 3))
-		      (doctor-type '(are you ($ afraidof) that \?)))
+		      (doctor-type '(are you (doctor-$ afraidof) that \?)))
 		     ((zerop (random 2))
 		      (doctor-type '(don\'t tell me what to do \. i am the
 					    psychiatrist here!))
 		      (doctor-rthing))
 		     (t
-		      (doctor-type '(($ whysay) that i shouldn\'t
+		      (doctor-type '((doctor-$ whysay) that i shouldn\'t
 				     (doctor-cddr sent)
 				     \?))))
 	     (doctor-go (doctor-wherego sent))))))))
@@ -1333,7 +1339,7 @@
 	  sent)))
 
 (defun doctor-wherego (sent)
-  (cond ((null sent)($ whereoutp))
+  (cond ((null sent)(doctor-$ whereoutp))
 	((null (doctor-meaning (car sent)))
 	 (doctor-wherego (cond ((zerop (random 2))
 				(reverse (cdr sent)))
@@ -1435,31 +1441,31 @@
   (funcall (intern (concat "doctor-" (doctor-make-string destination)))))
 
 (defun doctor-desire1 ()
-  (doctor-go ($ whereoutp)))
+  (doctor-go (doctor-$ whereoutp)))
 
 (defun doctor-huh ()
-  (cond ((< (length sent) 9) (doctor-type ($ huhlst)))
-	(t (doctor-type ($ longhuhlst)))))
+  (cond ((< (length sent) 9) (doctor-type (doctor-$ huhlst)))
+	(t (doctor-type (doctor-$ longhuhlst)))))
 
-(defun doctor-rthing () (doctor-type ($ thlst)))
+(defun doctor-rthing () (doctor-type (doctor-$ thlst)))
 
 (defun doctor-remem () (cond ((null history)(doctor-huh))
-			     ((doctor-type ($ remlst)))))
+			     ((doctor-type (doctor-$ remlst)))))
 
 (defun doctor-howdy ()
   (cond ((not howdyflag)
-	 (doctor-type '(($ hello) what brings you to see me \?))
+	 (doctor-type '((doctor-$ hello) what brings you to see me \?))
 	 (setq howdyflag t))
 	(t
-	 (doctor-type '(($ ibelieve) we\'ve introduced ourselves already \.))
-	 (doctor-type '(($ please) ($ describe) ($ things) \.)))))
+	 (doctor-type '((doctor-$ ibelieve) we\'ve introduced ourselves already \.))
+	 (doctor-type '((doctor-$ please) (doctor-$ describe) (doctor-$ things) \.)))))
 
 (defun doctor-when ()
   (cond ((< (length (memq found sent)) 3)(doctor-short))
 	(t
 	 (setq sent (cdr (memq found sent)))
 	 (setq sent (doctor-fixup sent))
-	 (doctor-type '(($ whatwhen)(// sent) \?)))))
+	 (doctor-type '((doctor-$ whatwhen)(identity sent) \?)))))
 
 (defun doctor-conj ()
   (cond ((< (length (memq found sent)) 4)(doctor-short))
@@ -1467,11 +1473,11 @@
 	 (setq sent (cdr (memq found sent)))
 	 (setq sent (doctor-fixup sent))
 	 (cond ((eq (car sent) 'of)
-		(doctor-type '(are you ($ sure) that is the real reason \?))
+		(doctor-type '(are you (doctor-$ sure) that is the real reason \?))
 		(setq things (cons (cdr sent) things)))
 	       (t
 		(doctor-remember sent)
-		(doctor-type ($ beclst)))))))
+		(doctor-type (doctor-$ beclst)))))))
 
 (defun doctor-short ()
   (cond ((= (car repetitive-shortness) (1- lincount))
@@ -1482,7 +1488,7 @@
   (rplaca repetitive-shortness lincount)
   (cond ((> (cdr repetitive-shortness) 6)
 	 (cond ((not **mad**)
-		(doctor-type '(($ areyou)
+		(doctor-type '((doctor-$ areyou)
 			       just trying to see what kind of things
 			       i have in my vocabulary \? please try to
 			       carry on a reasonable conversation!))
@@ -1494,14 +1500,14 @@
 		)))
 	(t
 	 (cond ((equal sent (doctor-assm '(yes)))
-		(doctor-type '(($ isee) ($ inter) ($ whysay) this is so \?)))
+		(doctor-type '((doctor-$ isee) (doctor-$ inter) (doctor-$ whysay) this is so \?)))
 	       ((equal sent (doctor-assm '(because)))
-		(doctor-type ($ shortbeclst)))
+		(doctor-type (doctor-$ shortbeclst)))
 	       ((equal sent (doctor-assm '(no)))
-		(doctor-type ($ neglst)))
-	       (t (doctor-type ($ shortlst)))))))
+		(doctor-type (doctor-$ neglst)))
+	       (t (doctor-type (doctor-$ shortlst)))))))
 	   
-(defun doctor-alcohol () (doctor-type ($ drnk)))
+(defun doctor-alcohol () (doctor-type (doctor-$ drnk)))
 
 (defun doctor-desire ()
   (let ((foo (memq found sent)))
@@ -1511,41 +1517,41 @@
 	   (rplacd foo (append '(to have) (cdr foo)))
 	   (doctor-svo sent found 1 nil)
 	   (doctor-remember (list subj 'would 'like obj))
-	   (doctor-type ($ whywant)))
+	   (doctor-type (doctor-$ whywant)))
 	  ((not (eq (doctor-cadr foo) 'to))
 	   (doctor-go (doctor-build (doctor-meaning found) 1)))
 	  (t
 	   (doctor-svo sent found 1 nil)
 	   (doctor-remember (list subj 'would 'like obj))
-	   (doctor-type ($ whywant))))))
+	   (doctor-type (doctor-$ whywant))))))
 
 (defun doctor-drug ()
-  (doctor-type ($ drugs))
+  (doctor-type (doctor-$ drugs))
   (doctor-remember (list 'you 'used found)))
 
 (defun doctor-toke ()
-  (doctor-type ($ toklst)))
+  (doctor-type (doctor-$ toklst)))
 
 (defun doctor-state ()
-  (doctor-type ($ states))(doctor-remember (list 'you 'were found)))
+  (doctor-type (doctor-$ states))(doctor-remember (list 'you 'were found)))
 
 (defun doctor-mood ()
-  (doctor-type ($ moods))(doctor-remember (list 'you 'felt found)))
+  (doctor-type (doctor-$ moods))(doctor-remember (list 'you 'felt found)))
 
 (defun doctor-fear ()
   (setq feared (doctor-setprep sent found))
-  (doctor-type ($ fears))
+  (doctor-type (doctor-$ fears))
   (doctor-remember (list 'you 'were 'afraid 'of 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 (// verb)(// obj) \?)))
-	(t (doctor-type '(($ whysay)(list subj verb obj))))))
+	 (doctor-type '(why do you (identity verb)(identity obj) \?)))
+	(t (doctor-type '((doctor-$ whysay)(list subj verb obj))))))
 
 (defun doctor-symptoms ()
-  (doctor-type '(($ maybe) you should consult a doctor of medicine\,
+  (doctor-type '((doctor-$ maybe) you should consult a doctor of medicine\,
 		 i am a psychiatrist \.)))
 
 (defun doctor-hates ()
@@ -1553,14 +1559,14 @@
   (doctor-hates1))
 
 (defun doctor-hates1 ()
-  (doctor-type '(($ whysay)(list subj verb obj))))
+  (doctor-type '((doctor-$ whysay)(list subj verb obj))))
 
 (defun doctor-loves ()
   (doctor-svo sent found 1 t)
   (doctor-qloves))
 
 (defun doctor-qloves ()
-  (doctor-type '(($ bother)(list subj verb obj) \?)))
+  (doctor-type '((doctor-$ bother)(list subj verb obj) \?)))
 
 (defun doctor-love ()
   (doctor-svo sent found 1 t)
@@ -1575,10 +1581,10 @@
 		       (setq lover '(your partner))
 		       (doctor-forget)
 		       (doctor-type '(with whom are you in love \?)))
-		      ((doctor-type '(($ please)
-				      ($ describe)
-				      ($ relation)
-				      (// lover)
+		      ((doctor-type '((doctor-$ please)
+				      (doctor-$ describe)
+				      (doctor-$ relation)
+				      (identity lover)
 				      \.)))))
 	       ((equal subj 'i)
 		(doctor-txtype '(we were discussing you!)))
@@ -1589,49 +1595,49 @@
 
 (defun doctor-mach ()
   (setq found (doctor-plural found))
-  (doctor-type ($ machlst)))
+  (doctor-type (doctor-$ machlst)))
 
 (defun doctor-sexnoun () (doctor-sexverb))
 
 (defun doctor-sexverb ()
   (if (or (memq 'me sent)(memq 'myself sent)(memq 'i sent))
       (doctor-foul)
-    (doctor-type ($ sexlst))))
+    (doctor-type (doctor-$ sexlst))))
 
-(defun doctor-death () (doctor-type ($ deathlst)))
+(defun doctor-death () (doctor-type (doctor-$ deathlst)))
 
 (defun doctor-foul ()
-  (doctor-type ($ foullst)))
+  (doctor-type (doctor-$ foullst)))
 
 (defun doctor-family ()
   (doctor-possess sent found)
-  (doctor-type ($ famlst)))
+  (doctor-type (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 ($ stallmanlst)))
+  (cond (rms-flag (doctor-type (doctor-$ stallmanlst)))
 	(t (setq rms-flag t) (doctor-type '(do you know Stallman \?)))))
 
-(defun doctor-school nil (doctor-type ($ schoollst)))
+(defun doctor-school nil (doctor-type (doctor-$ schoollst)))
 
 (defun doctor-eliza ()
-  (cond (eliza-flag (doctor-type ($ elizalst)))
+  (cond (eliza-flag (doctor-type (doctor-$ elizalst)))
 	(t (setq eliza-flag t)
-	   (doctor-type '((// found) \? hah !
-			  ($ please) ($ continue) \.)))))
+	   (doctor-type '((identity found) \? hah !
+			  (doctor-$ please) (doctor-$ continue) \.)))))
 	   
-(defun doctor-sports ()  (doctor-type ($ sportslst)))
+(defun doctor-sports ()  (doctor-type (doctor-$ sportslst)))
 
-(defun doctor-math () (doctor-type ($ mathlst)))
+(defun doctor-math () (doctor-type (doctor-$ mathlst)))
 
 (defun doctor-zippy ()
-  (cond (zippy-flag (doctor-type ($ zippylst)))
+  (cond (zippy-flag (doctor-type (doctor-$ zippylst)))
 	(t (setq zippy-flag t)
 	   (doctor-type '(yow! are we interactive yet \?)))))
 
 
-(defun doctor-chat () (doctor-type ($ chatlst)))
+(defun doctor-chat () (doctor-type (doctor-$ chatlst)))
 
 (defun doctor-strangelove ()
   (interactive)
@@ -1639,3 +1645,4 @@
   (doctor-read-print))
 
 ;;; doctor.el ends here
+