2 files changed, 7 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7742823155e..e40d0303778 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2002-01-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
+        * net/eudc.el (top-level): Revert previous change.
+
         * net/net-utils.el (nslookup-font-lock-keywords): Defvar font-lock
         variables to prevent warning from byte-compiler.
 
@@ -5776,7 +5778,7 @@
         * textmodes/reftex-ref.el, textmodes/reftex-sel.el,
         * textmodes/reftex-toc.el, textmodes/reftex-vars.el,
         * textmodes/reftex.el: Some fixes to follow coding
-        conventions in Eshell files with known maintainers.
+        conventions in Elisp files with known maintainers.
 
         * emulation/viper.el: A fix to follow coding conventions.
 
@@ -5790,7 +5792,7 @@
         * eshell/esh-mode.el, eshell/esh-module.el, eshell/esh-opt.el,
         * eshell/esh-proc.el, eshell/esh-test.el, eshell/esh-util.el,
         * eshell/esh-var.el, eshell/eshell.el: Some fixes to follow coding
-        conventions in Eshell files.
+        conventions in Elisp files.
 
         * composite.el, diff.el, emacs-lisp/levents.el,
         * emacs-lisp/lmenu.el, emacs-lisp/lselect.el, emacs-lisp/lucid.el,
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 78076e5ee5f..ba46daad44d 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -4,7 +4,7 @@
 
 ;; Author: Oscar Figueiredo <oscar@xemacs.org>
 ;; Maintainer: Oscar Figueiredo <oscar@xemacs.org>
-;; Keywords: help
+;; Keywords: comm
 
 ;; This file is part of GNU Emacs.
 
@@ -622,7 +622,7 @@ otherwise they are formatted according to `eudc-user-attribute-names-alist'."
       result)))
 
 (defun eudc-filter-partial-records (records attrs)
-  "Eliminate records that do not caontain all ATTRS from RECORDS."
+  "Eliminate records that do not contain all ATTRS from RECORDS."
   (delq nil
         (mapcar
          (function
@@ -1240,7 +1240,7 @@ This does nothing except loading eudc by autoload side-effect."
   nil)
 
 ;;;###autoload
-(cond ((not eudc-xemacs-p)
+(cond ((not (string-match "XEmacs" emacs-version))
        (defvar eudc-tools-menu (make-sparse-keymap "Directory Search"))
        (fset 'eudc-tools-menu (symbol-value 'eudc-tools-menu))
        (define-key eudc-tools-menu [phone]