[Emacs-diffs] trunk r118004: calc/calc-help.el (calc-describe-thing): Quote strings which could

[Jay Belanger]

------------------------------------------------------------
revno: 118004
revision-id: address@hidden
parent: address@hidden
author: H. Dieter Wilhelm <address@hidden>
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Wed 2014-10-01 20:41:10 -0500
message:
  calc/calc-help.el (calc-describe-thing): Quote strings which could
  look like regexps. 
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/calc/calc-help.el         
calchelp.el-20091113204419-o5vbwnq5f7feedwu-2282

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-01 22:14:43 +0000
+++ b/lisp/ChangeLog    2014-10-02 01:41:10 +0000
@@ -1,3 +1,8 @@
+2014-10-02  
+
+       * calc/calc-help.el (calc-describe-thing): Quote strings
+       which could look like regexps.
+
 2014-10-01  Stefan Monnier  <address@hidden>
 
        Consolidate x-select-text.

=== modified file 'lisp/calc/calc-help.el'
--- a/lisp/calc/calc-help.el    2014-01-01 07:43:34 +0000
+++ b/lisp/calc/calc-help.el    2014-10-02 01:41:10 +0000
@@ -366,9 +366,9 @@
       (Info-goto-node (buffer-substring (match-beginning 1) (match-end 1))))
     (or (let ((case-fold-search nil))
          (or (re-search-forward (format "\\[`%s'\\]\\|(`%s')\\|\\<The[ \n]`%s'"
-                                         (or target thing)
-                                         (or target thing)
-                                         (or target thing)) nil t)
+                                         (or target (regexp-quote thing))
+                                         (or target (regexp-quote thing))
+                                         (or target (regexp-quote thing))) nil 
t)
              (and not-quoted
                   (let ((case-fold-search t))
                     (search-forward (or target thing) nil t)))
@@ -376,9 +376,9 @@
              (search-forward (or target thing) nil t)))
        (let ((case-fold-search t))
          (or (re-search-forward (format "\\[`%s'\\]\\|(`%s')\\|\\<The[ \n]`%s'"
-                                         (or target thing)
-                                         (or target thing)
-                                         (or target thing)) nil t)
+                                         (or target (regexp-quote thing))
+                                         (or target (regexp-quote thing))
+                                         (or target (regexp-quote thing))) nil 
t)
              (search-forward (format "`%s'" (or target thing)) nil t)
              (search-forward (or target thing) nil t))))
     (beginning-of-line)