Re: M-x woman signals error when no current word

[Richard Stallman]

Does this give the right behavior?


*** woman.el.~1.17.~    Thu Sep 11 09:46:00 2003
--- woman.el    Sun Sep 21 06:20:39 2003
***************
*** 1221,1227 ****
                   ;; 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
             (assoc topic woman-topic-all-completions))
        (setq topic
              (completing-read
--- 1221,1227 ----
                   ;; Was let-bound when file loaded, so ...
                   (setq woman-topic-at-point woman-topic-at-point-default)))
             (setq topic
!                  (or (current-word t) ""))    ; only within or adjacent to 
word
             (assoc topic woman-topic-all-completions))
        (setq topic
              (completing-read
***************
*** 1230,1236 ****
               ;; Initial input suggestion (was nil), with
               ;; cursor at left ready to kill suggestion!:
               (and woman-topic-at-point
!                   (cons (current-word) 0)) ; nearest word
               'woman-topic-history)))
      ;; Note that completing-read always returns a string.
      (if (= (length topic) 0)
--- 1230,1236 ----
               ;; Initial input suggestion (was nil), with
               ;; cursor at left ready to kill suggestion!:
               (and woman-topic-at-point
!                   (cons (or (current-word) "") 0)) ; nearest word
               'woman-topic-history)))
      ;; Note that completing-read always returns a string.
      (if (= (length topic) 0)
***************
*** 1744,1750 ****
  Argument EVENT is the invoking mouse event."
    (interactive "e")                   ; mouse event
    (goto-char (posn-point (event-start event)))
!   (woman (current-word t)))
  
  ;; WoMan menu bar and pop-up menu:
  (easy-menu-define
--- 1744,1750 ----
  Argument EVENT is the invoking mouse event."
    (interactive "e")                   ; mouse event
    (goto-char (posn-point (event-start event)))
!   (woman (or (current-word t) "")))
  
  ;; WoMan menu bar and pop-up menu:
  (easy-menu-define