(grep-expand-template): Use symbol-value instead of eval on symbols.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0be66f3b08cd4522fc9e8428816f1b7fc827605..c841f83b086238a9001d263f59814ef4991f18cb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -26,24 +26,24 @@
        (tramp-completion-handle-file-name-directory)
        (tramp-completion-handle-file-name-nondirectory)
        (tramp-completion-handle-expand-file-name): Remove them.
-       (tramp-handle-file-name-directory): Return the real directory
-       name.  Returning "/" only doesn't need to be necessary any longer.
+       (tramp-handle-file-name-directory): Return the real directory name.
+       Returning "/" only doesn't need to be necessary any longer.
        (tramp-file-name-handler): Make special attention when in hostname
        completion mode.
-       (tramp-completion-file-name-handler): Revert patch from
-       2006-04-28.
+       (tramp-completion-file-name-handler): Revert patch from 2006-04-28.
        (tramp-register-file-name-handlers): Register
        `tramp-completion-file-name-handler' only when
        `partial-completion-mode is enabled.
-       (tramp-completion-handle-file-name-all-completions): Delete
-       directory part from results.
+       (tramp-completion-handle-file-name-all-completions):
+       Delete directory part from results.
        (tramp-get-completion-methods, tramp-get-completion-user-host):
        Discard deleting "/", it doesn't work after the change of
        `tramp-handle-file-name-directory' above.
 
 2006-05-01  Kim F. Storm  <storm@cua.dk>
 
-       * progmodes/grep.el (grep-expand-template): Use save-match-data.
+       * progmodes/grep.el (grep-expand-template): Use save-match-data
+       and symbol-value.
 
 2006-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
@@ -121,7 +121,7 @@
        (grep-read-regexp, grep-read-files): New helper functions.
        (rgrep): Rename from grep-tree.  Rework to use proper histories.
        Adapt to changes in defcustoms and functions above.
-       (lgrep): New command, as grep, but using same interactive api as rgrep.
+       (lgrep): New command, as grep, but using same interactive UI as rgrep.
 
 2006-04-28  Michael Albinus  <michael.albinus@gmx.de>
 

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 0aba9d42b84633f1b3f0a38a90539653270b985c..c695272e92b542878f7e1fefd6f8b15ace11c578 100644 (file)
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -584,7 +584,7 @@ substitution string.  Note dynamic scoping of variables.")
          (setq command
                (replace-match
                 (or (if (symbolp (cdr kw))
-                        (eval (cdr kw))
+                        (symbol-value (cdr kw))
                       (save-match-data (eval (cdr kw))))
                     "")
                 t t command))))))