--- a/lisp/ChangeLog	Wed Feb 04 12:41:14 2009 +0000
+++ b/lisp/ChangeLog	Wed Feb 04 20:52:24 2009 +0000
@@ -1,3 +1,10 @@
+2009-02-04  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* help.el: 
+	(describe-function-1): 
+	* byte-optimize.el: 
+	Remove any reference to mocklisp as an active technology.
+
 2009-02-04  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* coding.el (force-coding-system-equivalency): 

--- a/lisp/byte-optimize.el	Wed Feb 04 12:41:14 2009 +0000
+++ b/lisp/byte-optimize.el	Wed Feb 04 20:52:24 2009 +0000
@@ -56,7 +56,6 @@
 ;;   (put 'debug-on-error 'binding-is-magic t)
 ;;   (put 'debug-on-abort 'binding-is-magic t)
 ;;   (put 'debug-on-next-call 'binding-is-magic t)
-;;   (put 'mocklisp-arguments 'binding-is-magic t)
 ;;   (put 'inhibit-quit 'binding-is-magic t)
 ;;   (put 'quit-flag 'binding-is-magic t)
 ;;   (put 't 'binding-is-magic t)

--- a/lisp/help.el	Wed Feb 04 12:41:14 2009 +0000
+++ b/lisp/help.el	Wed Feb 04 20:52:24 2009 +0000
@@ -1164,10 +1164,6 @@
 ;(gettext "an interactive Lisp function")
 ;(gettext "a Lisp macro")
 ;(gettext "an interactive Lisp macro")
-;(gettext "a mocklisp function")
-;(gettext "an interactive mocklisp function")
-;(gettext "a mocklisp macro")
-;(gettext "an interactive mocklisp macro")
 ;(gettext "an autoloaded Lisp function")
 ;(gettext "an interactive autoloaded Lisp function")
 ;(gettext "an autoloaded Lisp macro")
@@ -1420,8 +1416,6 @@
              (funcall int "compiled Lisp" nil macrop))
             ((eq (car-safe fndef) 'lambda)
              (funcall int "Lisp" nil macrop))
-            ((eq (car-safe fndef) 'mocklisp)
-             (funcall int "mocklisp" nil macrop))
             ((eq (car-safe def) 'autoload)
 	     (funcall int "autoloaded Lisp" t (elt def 4)))
 	    ((and (symbolp def) (not (fboundp def)))

--- a/man/ChangeLog	Wed Feb 04 12:41:14 2009 +0000
+++ b/man/ChangeLog	Wed Feb 04 20:52:24 2009 +0000
@@ -1,3 +1,13 @@
+2009-02-04  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* xemacs/xemacs.texi (Top): 
+	* xemacs/misc.texi (Emulation): 
+	* xemacs/building.texi (Lisp Libraries): 
+	(Compiling Libraries): 
+	Remove any reference to mocklisp as an active technology.
+	Also remove documentation of the related #'set-gosmacs-bindings,
+	which is no longer available.
+
 2008-10-04  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* xemacs-faq.texi (Q5.0.7): Fix broken instructions on use of

--- a/man/xemacs/building.texi	Wed Feb 04 12:41:14 2009 +0000
+++ b/man/xemacs/building.texi	Wed Feb 04 20:52:24 2009 +0000
@@ -167,7 +167,6 @@
 @menu
 * Loading::		Loading libraries of Lisp code into Emacs for use.
 * Compiling Libraries:: Compiling a library makes it load and run faster.
-* Mocklisp::		Converting Mocklisp to Lisp so XEmacs can run it.
 @end menu
 
 @node Loading, Compiling Libraries, Lisp Libraries, Lisp Libraries
@@ -266,7 +265,7 @@
 is normally called.  An error in @code{forms} does not undo the load, but
 it does prevent execution of the rest of the @code{forms}.
 
-@node Compiling Libraries, Mocklisp, Loading, Lisp Libraries
+@node Compiling Libraries, , Loading, Lisp Libraries
 @subsection Compiling Libraries
 
 @cindex byte code
@@ -337,21 +336,6 @@
 window in symbolic form, one instruction per line.  If the instruction
 refers to a variable or constant, that is shown, too.
 
-@node Mocklisp,,Compiling Libraries,Lisp Libraries
-@subsection Converting Mocklisp to Lisp
-
-@cindex mocklisp
-@findex convert-mocklisp-buffer
-  XEmacs can run Mocklisp files by converting them to Emacs Lisp first.
-To convert a Mocklisp file, visit it and then type @kbd{M-x
-convert-mocklisp-buffer}.  Then save the resulting buffer of Lisp file in a
-file whose name ends in @file{.el} and use the new file as a Lisp library.
-
-  You cannot currently byte-compile converted Mocklisp code.
-The reason is that converted Mocklisp code uses some special Lisp features
-to deal with Mocklisp's incompatible ideas of how arguments are evaluated
-and which values signify ``true'' or ``false''.
-
 @node Lisp Eval, Lisp Debug, Lisp Libraries, Running
 @section Evaluating Emacs-Lisp Expressions
 @cindex Emacs-Lisp mode

--- a/man/xemacs/misc.texi	Wed Feb 04 12:41:14 2009 +0000
+++ b/man/xemacs/misc.texi	Wed Feb 04 20:52:24 2009 +0000
@@ -769,16 +769,4 @@
 are done in the global keymap, so there is no problem switching
 buffers or major modes while in EDT emulation.
 
-@item Gosling Emacs
-@findex set-gosmacs-bindings
-@findex set-gnu-bindings
-Turn on emulation of Gosling Emacs (aka Unipress Emacs) with @kbd{M-x
-set-gosmacs-bindings}.  This redefines many keys, mostly on the
-@kbd{C-x} and @kbd{ESC} prefixes, to work as they do in Gosmacs.
-@kbd{M-x set-gnu-bindings} returns to normal XEmacs by rebinding
-the same keys to the definitions they had at the time @kbd{M-x
-set-gosmacs-bindings} was done.
-
-It is also possible to run Mocklisp code written for Gosling Emacs.
-@xref{Mocklisp}.
 @end table

--- a/man/xemacs/xemacs.texi	Wed Feb 04 12:41:14 2009 +0000
+++ b/man/xemacs/xemacs.texi	Wed Feb 04 20:52:24 2009 +0000
@@ -522,7 +522,6 @@
 
 * Loading::		Loading libraries of Lisp code into XEmacs for use.
 * Compiling Libraries:: Compiling a library makes it load and run faster.
-* Mocklisp::		Converting Mocklisp to Lisp so XEmacs can run it.
 
 Abbrevs