HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 2012 to FSF copyright years for Emacs files
[bpt/emacs.git]
/
lisp
/
emacs-lisp
/
elp.el
diff --git
a/lisp/emacs-lisp/elp.el
b/lisp/emacs-lisp/elp.el
index
910eff3
..
0839032
100644
(file)
--- a/
lisp/emacs-lisp/elp.el
+++ b/
lisp/emacs-lisp/elp.el
@@
-1,6
+1,6
@@
;;; elp.el --- Emacs Lisp Profiler
;;; elp.el --- Emacs Lisp Profiler
-;; Copyright (C) 1994-1995, 1997-1998, 2001-201
1
+;; Copyright (C) 1994-1995, 1997-1998, 2001-201
2
;; Free Software Foundation, Inc.
;; Author: Barry A. Warsaw
;; Free Software Foundation, Inc.
;; Author: Barry A. Warsaw
@@
-282,7
+282,7
@@
FUNSYM must be a symbol of a defined function."
;; the function so that non-local exists are still recorded. TBD:
;; I haven't tested non-local exits at all, so no guarantees.
;;
;; the function so that non-local exists are still recorded. TBD:
;; I haven't tested non-local exits at all, so no guarantees.
;;
- ;; The 1st element is the total amount of time in
usecs that have
+ ;; The 1st element is the total amount of time in
seconds that has
;; been spent inside this function. This number is added to on
;; function exit.
;;
;; been spent inside this function. This number is added to on
;; function exit.
;;
@@
-424,9
+424,7
@@
Use optional LIST if provided instead."
\f
(defsubst elp-elapsed-time (start end)
\f
(defsubst elp-elapsed-time (start end)
- (+ (* (- (car end) (car start)) 65536.0)
- (- (car (cdr end)) (car (cdr start)))
- (/ (- (car (cdr (cdr end))) (car (cdr (cdr start)))) 1000000.0)))
+ (float-time (time-subtract end start)))
(defun elp-wrapper (funsym interactive-p args)
"This function has been instrumented for profiling by the ELP.
(defun elp-wrapper (funsym interactive-p args)
"This function has been instrumented for profiling by the ELP.
@@
-630,7
+628,7
@@
displayed."
'display (list 'space :align-to column)
'face 'fixed-pitch)
title)
'display (list 'space :align-to column)
'face 'fixed-pitch)
title)
- (setq column (+ column
1
+ (setq column (+ column
2
(if (= column 0)
elp-field-len
(length title))))))
(if (= column 0)
elp-field-len
(length title))))))