diff options
| author | Eli Zaretskii | 2005-01-15 12:46:54 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2005-01-15 12:46:54 +0000 |
| commit | f79b331a48a9e8391e30d3cd624afc20f1b136b6 (patch) | |
| tree | 67699a642143d3743301986120169c2cf114149d | |
| parent | 8b3a75ac8f9fb619b3136a811b34e9d36ec4e2b8 (diff) | |
| download | emacs-f79b331a48a9e8391e30d3cd624afc20f1b136b6.tar.gz emacs-f79b331a48a9e8391e30d3cd624afc20f1b136b6.zip | |
(woman-dired-define-key-maybe): If KEY is undefined,
lookup-key might return nil; handle that.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/woman.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 567b5c5c9d5..9339bc1f87b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2005-01-15 Stephen Eglen <S.J.Eglen@damtp.cam.ac.uk> (tiny change) | ||
| 2 | |||
| 3 | * woman.el (woman-dired-define-key-maybe): If KEY is undefined, | ||
| 4 | lookup-key might return nil; handle that. | ||
| 5 | |||
| 1 | 2005-01-15 Alan Mackenzie <acm@muc.de> | 6 | 2005-01-15 Alan Mackenzie <acm@muc.de> |
| 2 | 7 | ||
| 3 | * ebrowse.el (ebrowse-class-in-tree): Return the tail of the tree | 8 | * 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. | |||
| 1491 | 1491 | ||
| 1492 | (defsubst woman-dired-define-key-maybe (key) | 1492 | (defsubst woman-dired-define-key-maybe (key) |
| 1493 | "If KEY is undefined in Dired, bind it to command `woman-dired-find-file'." | 1493 | "If KEY is undefined in Dired, bind it to command `woman-dired-find-file'." |
| 1494 | (if (eq (lookup-key dired-mode-map key) 'undefined) | 1494 | (if (or (eq (lookup-key dired-mode-map key) 'undefined) |
| 1495 | (null (lookup-key dired-mode-map key))) | ||
| 1495 | (woman-dired-define-key key))) | 1496 | (woman-dired-define-key key))) |
| 1496 | 1497 | ||
| 1497 | (defun woman-dired-define-keys () | 1498 | (defun woman-dired-define-keys () |