* play/doctor.el: Remove reference to obsolete website.

(make-doctor-variables): Correct grammar mistake (Bug#2633).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b9871323aa32f7162cc08ada596ac8818b9dc29..3e761d07530405c6ead46f83ef27cab4309af8ec 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-27  Chong Yidong  <cyd@stupidchicken.com>
+
+       * play/doctor.el: Remove reference to obsolete website.
+       (make-doctor-variables): Correct grammar mistake (Bug#2633).
+
 2009-06-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
        Remove find-file-not-found-hook VC method.  (Bug#2757)

diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index 50911fc9098cd1be034dd61250de8cafe66a7480..2d4ebd75edefc2f9a35345140455f076ca2c739f 100644 (file)
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -27,21 +27,6 @@
 ;; phrase-production techniques similar to the classic ELIZA demonstration
 ;; of pseudo-AI.
 
-;; This file was for a while censored by the Communications Decency Act.
-;; Some of its features were removed.  The law was promoted as a ban
-;; on pornography, but it bans far more than that.  The doctor program
-;; did not contain pornography, but part of it was prohibited
-;; nonetheless.
-
-;; The Supreme Court overturned the Communications Decency Act, but
-;; Congress is sure to look for some other way to try to end free speech.
-;; For information on US government censorship of the Internet, and
-;; what you can do to protect freedom of the press, see the web
-;; site http://www.vtw.org/
-;; See also the file etc/CENSORSHIP in the Emacs distribution
-;; for a discussion of why and how this file was censored, and the
-;; political implications of the issue.
-
 ;;; Code:
 
 (defvar **mad**)        (defvar *debug*)      (defvar *print-space*)
@@ -67,11 +52,11 @@
 (defvar sent)           (defvar sexlst)       (defvar shortbeclst)
 (defvar shortlst)       (defvar something)    (defvar sportslst)
 (defvar stallmanlst)    (defvar states)       (defvar subj)
-(defvar suicide-flag)   (defvar sure)         (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 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)
 
 (defun doc// (x) x)
 
@@ -300,24 +285,19 @@ reads the sentence before point, and prints the Doctor's answer."
        '((something)
          (more)
          (how you feel)))
+  (make-local-variable 'thing)
+  (setq thing
+       '((your life)
+         (your sex life)))
   (make-local-variable 'things)
   (setq things
-       '(;(your interests in computers)   ;; let's make this less computer oriented
-         ;(the machines you use)
-         (your plans)
-         ;(your use of computers)
-         (your life)
-         ;(other machines you use)
+       '((your plans)
          (the people you hang around with)
-         ;(computers you like)
          (problems at school)
          (any hobbies you have)
-         ;(other computers you use)
-         (your sex life)
          (hangups you have)
          (your inhibitions)
          (some problems in your childhood)
-         ;(knowledge of computers)
          (some problems at home)))
   (make-local-variable 'describe)
   (setq describe
@@ -407,6 +387,7 @@ reads the sentence before point, and prints the Doctor's answer."
                      ((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) \? )