(woman-file-name, woman-follow-word):

If current-word returns nil, use "".

1 files changed, 3 insertions, 3 deletions

diff --git a/lisp/woman.el b/lisp/woman.el
index 059eadc031b..6946930505f 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1221,7 +1221,7 @@ Optional argument RE-CACHE, if non-nil, forces the cache to be re-read."
                    ;; Was let-bound when file loaded, so ...
                    (setq woman-topic-at-point woman-topic-at-point-default)))
              (setq topic
-                   (current-word t))    ; only within or adjacent to word
+                   (or (current-word t) ""))    ; only within or adjacent to word
              (assoc topic woman-topic-all-completions))
         (setq topic
               (completing-read
@@ -1230,7 +1230,7 @@ Optional argument RE-CACHE, if non-nil, forces the cache to be re-read."
                ;; Initial input suggestion (was nil), with
                ;; cursor at left ready to kill suggestion!:
                (and woman-topic-at-point
-                    (cons (current-word) 0)) ; nearest word
+                    (cons (or (current-word) "") 0)) ; nearest word
                'woman-topic-history)))
     ;; Note that completing-read always returns a string.
     (if (= (length topic) 0)
@@ -1744,7 +1744,7 @@ Leave point at end of new text.  Return length of inserted text."
 Argument EVENT is the invoking mouse event."
   (interactive "e")                     ; mouse event
   (goto-char (posn-point (event-start event)))
-  (woman (current-word t)))
+  (woman (or (current-word t) "")))
 
 ;; WoMan menu bar and pop-up menu:
 (easy-menu-define