summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/profiler.el6
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c8a4f9ec84..366380b4ec4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
2012-08-22 Tomohiro Matsuyama <tomo@cx4a.org>
* profiler.el: Switch to cl-lib.
+ (profiler-start): Change mode spec.
2012-08-22 Daiki Ueno <ueno@unixuser.org>
diff --git a/lisp/profiler.el b/lisp/profiler.el
index 8428b38c586..db2d0eb461a 100644
--- a/lisp/profiler.el
+++ b/lisp/profiler.el
@@ -538,16 +538,16 @@ otherwise collapse the entry."
;;;###autoload
(defun profiler-start (mode)
(interactive
- (list (intern (completing-read "Mode: " '("cpu" "memory" "cpu&memory")
+ (list (intern (completing-read "Mode: " '("cpu" "mem" "cpu+mem")
nil t nil nil "cpu"))))
(cl-ecase mode
(cpu
(sample-profiler-start profiler-sample-interval)
(message "CPU profiler started"))
- (memory
+ (mem
(memory-profiler-start)
(message "Memory profiler started"))
- (cpu&memory
+ (cpu+mem
(sample-profiler-start profiler-sample-interval)
(memory-profiler-start)
(message "CPU and memory profiler started"))))