[Emacs-diffs] Changes to emacs/lisp/simple.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/03/08 14:43:08

Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.848
retrieving revision 1.849
diff -u -b -r1.848 -r1.849
--- simple.el   6 Mar 2007 02:18:05 -0000       1.848
+++ simple.el   8 Mar 2007 14:43:08 -0000       1.849
@@ -1005,6 +1005,9 @@
 
 (defvar read-expression-history nil)
 
+(defvar minibuffer-completing-symbol nil
+  "Non-nil means completing a Lisp symbol in the minibuffer.")
+
 (defcustom eval-expression-print-level 4
   "Value for `print-level' while printing value in `eval-expression'.
 A value of nil means no limit."
@@ -1056,9 +1059,10 @@
 If `eval-expression-debug-on-error' is non-nil, which is the default,
 this command arranges for all errors to enter the debugger."
   (interactive
-   (list (read-from-minibuffer "Eval: "
+   (list (let ((minibuffer-completing-symbol t))
+          (read-from-minibuffer "Eval: "
                               nil read-expression-map t
-                              'read-expression-history)
+                                'read-expression-history))
         current-prefix-arg))
 
   (if (null eval-expression-debug-on-error)
@@ -5109,6 +5113,7 @@
                (save-excursion
                  (skip-chars-backward completion-root-regexp)
                  (- (point) (minibuffer-prompt-end)))))
+            (minibuffer-completing-symbol nil)
             ;; Otherwise, in minibuffer, the base size is 0.
             ((minibufferp mainbuf) 0)))
       (setq common-string-length