diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-04 12:37:56 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-04 12:37:56 -0700 |
| commit | 3e9fa60a5c99568817a12a1011b0e61cce5d3a67 (patch) | |
| tree | 831a801351db662f324d0709bf1fee718eda63e9 /src/profiler.c | |
| parent | bbdcf64f499636ba9567e8fed8f209e06380352c (diff) | |
| parent | 61febcb6e32860575316b8a539a2e9f13f70e3c2 (diff) | |
| download | emacs-3e9fa60a5c99568817a12a1011b0e61cce5d3a67.tar.gz | |
Merge from emacs-24; up to 2014-05-04T21:18:30Z!eggert@cs.ucla.edu
Diffstat (limited to 'src/profiler.c')
| -rw-r--r-- | src/profiler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/profiler.c b/src/profiler.c index ff97fe88b7b..919aabc92af 100644 --- a/src/profiler.c +++ b/src/profiler.c @@ -384,7 +384,7 @@ Return non-nil if the profiler was running. */) DEFUN ("profiler-cpu-running-p", Fprofiler_cpu_running_p, Sprofiler_cpu_running_p, 0, 0, 0, - doc: /* Return non-nil iff cpu profiler is running. */) + doc: /* Return non-nil if cpu profiler is running. */) (void) { return profiler_cpu_running ? Qt : Qnil; |