From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 15 Jan 2005 12:46:54 +0000 (+0000)
Subject: (woman-dired-define-key-maybe): If KEY is undefined,
X-Git-Tag: ttn-vms-21-2-B4~2747
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f79b331a48a9e8391e30d3cd624afc20f1b136b6;p=emacs.git

(woman-dired-define-key-maybe): If KEY is undefined,
lookup-key might return nil; handle that.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 567b5c5c9d5..9339bc1f87b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-15  Stephen Eglen  <S.J.Eglen@damtp.cam.ac.uk>  (tiny change)
+
+	* woman.el (woman-dired-define-key-maybe): If KEY is undefined,
+	lookup-key might return nil; handle that.
+
 2005-01-15  Alan Mackenzie  <acm@muc.de>
 
 	* ebrowse.el (ebrowse-class-in-tree): Return the tail of the tree
diff --git a/lisp/woman.el b/lisp/woman.el
index 610590a2972..e4b29374a05 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1491,7 +1491,8 @@ Also make each path-info component into a list.
 
 (defsubst woman-dired-define-key-maybe (key)
   "If KEY is undefined in Dired, bind it to command `woman-dired-find-file'."
-  (if (eq (lookup-key dired-mode-map key) 'undefined)
+  (if (or (eq (lookup-key dired-mode-map key) 'undefined)
+	  (null (lookup-key dired-mode-map key)))
       (woman-dired-define-key key)))
 
 (defun woman-dired-define-keys ()