(doctor-doc): Add 2 question words.

(doctor-getnoun): Parse and save the complete object phrase.

2 files changed, 44 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19cb7aef4a0..6bf40c777b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,40 @@
+2002-09-23  Richard M. Stallman  <rms@gnu.org>
+
+        * ielm.el (*1): Fix previous change.
+
+2002-09-22  Oliver Scholz  <alkibiades@gmx.de>
+
+        * play/gamegrid.el (gamegrid-face): new variable to emulate a
+        buffer-local default face.
+        (gamegrid-xbm): new variable; XBM image as a replacement for
+        `gamegrid-xpm' on Emacsen compiled without XPM-support.
+        (gamegrid-colorize-glyph): Ported XEmacs-code for the generation
+        of images to Emacs.
+        (gamegrid-match-spec): Call `gamegrid-make-image-from-vector' to
+        convert XEmacs-type image descriptors.
+        (gamegrid-color-display-p): Removed. (Use `display-colors-p'
+        instead.)
+        (gamegrid-make-image-from-vector): New function. Convert XEmacs'
+        image descriptors.
+        (gamegrid-display-type): Use Emacs' standard `display-.*-p'
+        functions to check for display capabilities. Fix the recognition
+        of image-support in Emacs 21 by this way.
+        (gamegrid-hide-cursor): Removed.
+        (gamegrid-setup-default-font): Ported the code from XEmacs to
+        Emacs: create a new face and assign the variable `gamegrid-face'
+        to it. Make sure that the face is not higher than the smallest
+        image used by the game.
+        (gamegrid-initialize-display): Use `(setq cursor-type nil)'
+        instead of `gamegrid-hide-cursor'.
+        (gamegrid-set-face): If `gamegrid-display-mode' is 'glyph, put an
+        image in the buffer, instead of applying a face. [This is because
+        Emacs display-tables are not as capable as the display-tables in
+        XEmacs. Maybe this function should be renamed to reflect the
+        change?]
+        (gamegrid-init-buffer): If `gamegrid-display-mode' is 'glyph, put
+        the face held by `gamegrid-face' in an overlay over the whole
+        buffer to emulate a buffer-local default-face.
+
 2002-09-23  Juanma Barranquero  <lektu@terra.es>
 
         * net/tramp.el (tramp-unified-filenames): Autoload it.
@@ -8,6 +45,9 @@
 
 2002-09-22  Richard M. Stallman  <rms@gnu.org>
 
+        * play/doctor.el (doctor-doc): Add 2 question words.
+        (doctor-getnoun): Parse and save the complete object phrase.
+
         * international/mule-cmds.el (select-safe-coding-system): Cope if
         default-coding-system gives nil which was then used in `min'.
 
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index 4254a99f27e..2f00b9dfb3a 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -905,7 +905,7 @@ Otherwise call the Doctor to parse preceding sentence."
                         'sentence 'used 'was
                         "..."
                         '(doc// bak))))
-   ((memq (car sent) '(do has have how when where who why))
+   ((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)
@@ -1166,7 +1166,9 @@ the subject noun, and return the portion of the sentence following it."
                                                    (car x) (car x))))))
                                      " ")
                        (doctor-getnoun (cdr x))))
-        (t (setq object (car x))) ))
+        (t (setq object (car x))
+           (doctor-build (doctor-build (car x) " ") (doctor-getnoun (cdr x))))
+        ))
 
 (defun doctor-modifierp (x)
   (or (doctor-adjectivep x)