2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78643a290b2..28146912eca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2003-08-02  Andreas Schwab  <schwab@suse.de>
 
+        * apropos.el (apropos-words-to-regexp): Only add `wild' if `words'
+        has more than one member.
+
         * progmodes/sh-script.el (sh-mode): Don't set mode-class property.
 
 2003-08-01  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 74b0f3fa838..677c43b756d 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1,6 +1,6 @@
 ;;; apropos.el --- apropos commands for users and programmers
 
-;; Copyright (C) 1989, 1994, 1995, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1994, 1995, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 ;; Author: Joe Wells <jbw@bigbird.bu.edu>
 ;; Rewritten: Daniel Pfeiffer <occitan@esperanto.org>
@@ -248,9 +248,10 @@ before finding a label."
   "Make regexp matching any two of the words in WORDS."
   (concat "\\("
           (mapconcat 'identity words "\\|")
-          "\\)" wild
+          "\\)"
           (if (cdr words)
-              (concat "\\("
+              (concat wild
+                      "\\("
                       (mapconcat 'identity words "\\|")
                       "\\)")
             "")))