(help-do-arg-highlight): Regexp-quote argument names.

2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 329fcdba26b..407f779999a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-30  Richard M. Stallman  <rms@gnu.org>
+
+        * emacs-lisp/crm.el (crm-do-completion): Handle minibuffer prompt.
+        (crm-find-current-element): Likewise.
+
+2005-06-30  Johan Bockg,Ae(Brd  <bojohan@users.sourceforge.net>
+
+        * help-fns.el (help-do-arg-highlight): Regexp-quote argument
+        names.
+
 2005-06-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * arc-mode.el (archive-extract): Make it work as a mouse binding.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 39d5f2fc4ea..ab9e118bfdf 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -277,7 +277,7 @@ face (according to `face-differs-from-default-p')."
                    (concat "\\<"                   ; beginning of word
                            "\\(?:[a-z-]*-\\)?"     ; for xxx-ARG
                            "\\("
-                           arg
+                           (regexp-quote arg)
                            "\\)"
                            "\\(?:es\\|s\\|th\\)?"  ; for ARGth, ARGs
                            "\\(?:-[a-z-]+\\)?"     ; for ARG-xxx