From 80f5d2efec87d768484439bb58d5b0b0253f108d Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 2 Aug 2003 20:36:51 +0000 Subject: [PATCH] (apropos-words-to-regexp): Only add `wild' if `words' has more than one member. --- lisp/ChangeLog | 3 +++ lisp/apropos.el | 7 ++++--- 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 + * 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 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 ;; Rewritten: Daniel Pfeiffer @@ -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 "\\|") "\\)") ""))) -- 2.39.2