[Emacs-diffs] /srv/bzr/emacs/trunk r112771: * lisp/emacs-lisp/trace.el (trace--read-args): Provide a default.

[Stefan Monnier]

------------------------------------------------------------
revno: 112771
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-29 11:17:12 -0400
message:
  * lisp/emacs-lisp/trace.el (trace--read-args): Provide a default.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/trace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-29 14:14:16 +0000
+++ b/lisp/ChangeLog    2013-05-29 15:17:12 +0000
@@ -1,5 +1,7 @@
 2013-05-29  Stefan Monnier  <address@hidden>
 
+       * emacs-lisp/trace.el (trace--read-args): Provide a default.
+
        * emacs-lisp/lisp-mode.el (lisp-mode-shared-map): Inherit from
        prog-mode-map.
 

=== modified file 'lisp/emacs-lisp/trace.el'
--- a/lisp/emacs-lisp/trace.el  2013-05-06 22:33:24 +0000
+++ b/lisp/emacs-lisp/trace.el  2013-05-29 15:17:12 +0000
@@ -262,7 +262,17 @@
 
 (defun trace--read-args (prompt)
   (cons
-   (intern (completing-read prompt obarray 'fboundp t))
+   (let ((default (function-called-at-point))
+         (beg (string-match ":[ \t]*\\'" prompt)))
+     (intern (completing-read (if default
+                                  (format
+                                   "%s (default %s)%s"
+                                   (substring prompt 0 beg)
+                                   default
+                                   (if beg (substring prompt beg) ": "))
+                                prompt)
+                              obarray 'fboundp t nil nil
+                              (if default (symbol-name default)))))
    (when current-prefix-arg
      (list
       (read-buffer "Output to buffer: " trace-buffer)