[Emacs-diffs] trunk r115091: * lisp/replace.el (replace-eval-replacement): Try to give more helpful error

[Glenn Morris]

------------------------------------------------------------
revno: 115091
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15836
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-13 15:48:35 -0500
message:
  * lisp/replace.el (replace-eval-replacement): Try to give more helpful error
  message.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/replace.el                replace.el-20091113204419-o5vbwnq5f7feedwu-119

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-13 20:40:12 +0000
+++ b/lisp/ChangeLog    2013-11-13 20:48:35 +0000
@@ -1,5 +1,8 @@
 2013-11-13  Glenn Morris  <address@hidden>
 
+       * replace.el (replace-eval-replacement):
+       Try to give more helpful error message.  (Bug#15836)
+
        * arc-mode.el (archive-7z-extract, archive-7z-expunge)
        (archive-7z-update): Avoid custom type mismatches.
 

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2013-10-13 05:30:23 +0000
+++ b/lisp/replace.el   2013-11-13 20:48:35 +0000
@@ -1,7 +1,7 @@
 ;;; replace.el --- replace commands for Emacs
 
-;; Copyright (C) 1985-1987, 1992, 1994, 1996-1997, 2000-2013 Free
-;; Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1992, 1994, 1996-1997, 2000-2013
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Package: emacs
@@ -1793,7 +1793,12 @@
 
 (defun replace-eval-replacement (expression count)
   (let* ((replace-count count)
-         (replacement (eval expression)))
+         err
+         (replacement
+          (condition-case err
+              (eval expression)
+            (error
+             (error "Error evaluating replacement expression: %S" err)))))
     (if (stringp replacement)
         replacement
       (prin1-to-string replacement t))))