diff options
| author | Paul Eggert | 2014-05-24 14:28:43 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-05-24 14:28:43 -0700 |
| commit | 2082742ed441e799577117ca93bef4510f1bb1b6 (patch) | |
| tree | 714344ef0807b5f74e2ae0c41c74b882be789fe1 /src | |
| parent | 376f53c54402c014da37c29cfd1c8ebf8e392d3c (diff) | |
| download | emacs-2082742ed441e799577117ca93bef4510f1bb1b6.tar.gz emacs-2082742ed441e799577117ca93bef4510f1bb1b6.zip | |
* xdisp.c (safe__call1, safe__eval): Now static.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2bce5e71df8..2ef383c7b49 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-05-24 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * xdisp.c (safe__call1, safe__eval): Now static. | ||
| 4 | |||
| 1 | 2014-05-24 Eli Zaretskii <eliz@gnu.org> | 5 | 2014-05-24 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * xdisp.c (safe__call): Accept va_list argument instead of '...'. | 7 | * xdisp.c (safe__call): Accept va_list argument instead of '...'. |
diff --git a/src/xdisp.c b/src/xdisp.c index 7407390d4f4..6cdc50ac589 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -2646,7 +2646,7 @@ safe_call1 (Lisp_Object fn, Lisp_Object arg) | |||
| 2646 | return safe_call (2, fn, arg); | 2646 | return safe_call (2, fn, arg); |
| 2647 | } | 2647 | } |
| 2648 | 2648 | ||
| 2649 | Lisp_Object | 2649 | static Lisp_Object |
| 2650 | safe__call1 (bool inhibit_quit, Lisp_Object fn, ...) | 2650 | safe__call1 (bool inhibit_quit, Lisp_Object fn, ...) |
| 2651 | { | 2651 | { |
| 2652 | Lisp_Object retval; | 2652 | Lisp_Object retval; |
| @@ -2666,7 +2666,7 @@ safe_eval (Lisp_Object sexpr) | |||
| 2666 | return safe__call1 (false, Qeval, sexpr); | 2666 | return safe__call1 (false, Qeval, sexpr); |
| 2667 | } | 2667 | } |
| 2668 | 2668 | ||
| 2669 | Lisp_Object | 2669 | static Lisp_Object |
| 2670 | safe__eval (bool inhibit_quit, Lisp_Object sexpr) | 2670 | safe__eval (bool inhibit_quit, Lisp_Object sexpr) |
| 2671 | { | 2671 | { |
| 2672 | return safe__call1 (inhibit_quit, Qeval, sexpr); | 2672 | return safe__call1 (inhibit_quit, Qeval, sexpr); |