diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/floatfns.c | 5 | ||||
| -rw-r--r-- | src/profiler.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 17a32a4823f..12a0cd63dc0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-05-01 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * floatfns.c (Fisnan): | ||
| 4 | * profiler.c (Fprofiler_cpu_running_p): Doc fix (replace `iff'). | ||
| 5 | |||
| 1 | 2014-05-01 Eli Zaretskii <eliz@gnu.org> | 6 | 2014-05-01 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * term.c (tty_menu_activate): A better initialization for cursor | 8 | * term.c (tty_menu_activate): A better initialization for cursor |
diff --git a/src/floatfns.c b/src/floatfns.c index ac0447ce6d6..75106a661b7 100644 --- a/src/floatfns.c +++ b/src/floatfns.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* Primitive operations on floating point for GNU Emacs Lisp interpreter. | 1 | /* Primitive operations on floating point for GNU Emacs Lisp interpreter. |
| 2 | 2 | ||
| 3 | Copyright (C) 1988, 1993-1994, 1999, 2001-2014 Free Software Foundation, | 3 | Copyright (C) 1988, 1993-1994, 1999, 2001-2014 Free Software Foundation, Inc. |
| 4 | Inc. | ||
| 5 | 4 | ||
| 6 | Author: Wolfgang Rupprecht | 5 | Author: Wolfgang Rupprecht |
| 7 | (according to ack.texi) | 6 | (according to ack.texi) |
| @@ -142,7 +141,7 @@ DEFUN ("tan", Ftan, Stan, 1, 1, 0, | |||
| 142 | } | 141 | } |
| 143 | 142 | ||
| 144 | DEFUN ("isnan", Fisnan, Sisnan, 1, 1, 0, | 143 | DEFUN ("isnan", Fisnan, Sisnan, 1, 1, 0, |
| 145 | doc: /* Return non nil iff argument X is a NaN. */) | 144 | doc: /* Return non nil if argument X is a NaN. */) |
| 146 | (Lisp_Object x) | 145 | (Lisp_Object x) |
| 147 | { | 146 | { |
| 148 | CHECK_FLOAT (x); | 147 | CHECK_FLOAT (x); |
diff --git a/src/profiler.c b/src/profiler.c index 8b092dcc818..fff7c6b0ff6 100644 --- a/src/profiler.c +++ b/src/profiler.c | |||
| @@ -384,7 +384,7 @@ Return non-nil if the profiler was running. */) | |||
| 384 | DEFUN ("profiler-cpu-running-p", | 384 | DEFUN ("profiler-cpu-running-p", |
| 385 | Fprofiler_cpu_running_p, Sprofiler_cpu_running_p, | 385 | Fprofiler_cpu_running_p, Sprofiler_cpu_running_p, |
| 386 | 0, 0, 0, | 386 | 0, 0, 0, |
| 387 | doc: /* Return non-nil iff cpu profiler is running. */) | 387 | doc: /* Return non-nil if cpu profiler is running. */) |
| 388 | (void) | 388 | (void) |
| 389 | { | 389 | { |
| 390 | return profiler_cpu_running ? Qt : Qnil; | 390 | return profiler_cpu_running ? Qt : Qnil; |