[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/woman.el
From: |
Richard M . Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/woman.el |
Date: |
Thu, 08 Sep 2005 21:21:28 -0400 |
Index: emacs/lisp/woman.el
diff -c emacs/lisp/woman.el:1.34 emacs/lisp/woman.el:1.35
*** emacs/lisp/woman.el:1.34 Wed Sep 7 21:23:34 2005
--- emacs/lisp/woman.el Fri Sep 9 01:21:28 2005
***************
*** 3,9 ****
;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Author: Francis J. Wright <address@hidden>
! ;; Maintainer: Francis J. Wright <address@hidden>
;; Keywords: help, unix
;; Adapted-By: Eli Zaretskii <address@hidden>
;; Version: see `woman-version'
--- 3,9 ----
;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Author: Francis J. Wright <address@hidden>
! ;; Maintainer: FSF
;; Keywords: help, unix
;; Adapted-By: Eli Zaretskii <address@hidden>
;; Version: see `woman-version'
***************
*** 1221,1227 ****
;; completions, but to return only a case-sensitive match. This
;; does not seem to work properly by default, so I re-do the
;; completion if necessary.
! (let (files)
(or (stringp topic)
(and (eq t
(if (boundp 'woman-topic-at-point)
--- 1221,1228 ----
;; completions, but to return only a case-sensitive match. This
;; does not seem to work properly by default, so I re-do the
;; completion if necessary.
! (let (files
! (default (current-word)))
(or (stringp topic)
(and (eq t
(if (boundp 'woman-topic-at-point)
***************
*** 1233,1245 ****
(assoc topic woman-topic-all-completions))
(setq topic
(completing-read
! "Manual entry: "
woman-topic-all-completions nil 1
! ;; 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)
nil ; no topic, so no file!
--- 1234,1248 ----
(assoc topic woman-topic-all-completions))
(setq topic
(completing-read
! (if default
! (format "Manual entry (default `%s'): " default)
! "Manual entry: ")
woman-topic-all-completions nil 1
! nil
! 'woman-topic-history
! ;; Default topic.
(and woman-topic-at-point
! default))))
;; Note that completing-read always returns a string.
(if (= (length topic) 0)
nil ; no topic, so no file!
- [Emacs-diffs] Changes to emacs/lisp/woman.el, Michael Albinus, 2005/09/07
- [Emacs-diffs] Changes to emacs/lisp/woman.el,
Richard M . Stallman <=
- [Emacs-diffs] Changes to emacs/lisp/woman.el, Eli Zaretskii, 2005/09/09
- [Emacs-diffs] Changes to emacs/lisp/woman.el, Eli Zaretskii, 2005/09/09
- [Emacs-diffs] Changes to emacs/lisp/woman.el, Eli Zaretskii, 2005/09/10
- [Emacs-diffs] Changes to emacs/lisp/woman.el, D . Goel, 2005/09/18
- [Emacs-diffs] Changes to emacs/lisp/woman.el, Romain Francoise, 2005/09/24