diff options
| author | Paul Eggert | 2011-04-06 15:46:00 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-06 15:46:00 -0700 |
| commit | ce4d90b550a2bfb66099784386910a81b31421ed (patch) | |
| tree | ecb88f148720f26ed8cd792e29e316dd06c619b7 /src | |
| parent | 266c95470005fc0fdb22b984de4bb8ec73aec727 (diff) | |
| download | emacs-ce4d90b550a2bfb66099784386910a81b31421ed.tar.gz emacs-ce4d90b550a2bfb66099784386910a81b31421ed.zip | |
* xterm.c (x_catch_errors): Remove duplicate declaration.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8c92869db1f..ce97ca8204b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-04-06 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-06 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * xterm.c (x_catch_errors): Remove duplicate declaration. | ||
| 4 | |||
| 3 | * term.c (maybe_fatal): Mark its 3rd arg as a printf format, too. | 5 | * term.c (maybe_fatal): Mark its 3rd arg as a printf format, too. |
| 4 | 6 | ||
| 5 | * xdisp.c, lisp.h (message_nolog): Remove; unused. | 7 | * xdisp.c, lisp.h (message_nolog): Remove; unused. |
diff --git a/src/xterm.c b/src/xterm.c index 92df7ae8746..3fc431c1350 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -7540,8 +7540,6 @@ x_error_catcher (Display *display, XErrorEvent *event) | |||
| 7540 | 7540 | ||
| 7541 | Calling x_uncatch_errors resumes the normal error handling. */ | 7541 | Calling x_uncatch_errors resumes the normal error handling. */ |
| 7542 | 7542 | ||
| 7543 | void x_check_errors (Display *dpy, const char *format); | ||
| 7544 | |||
| 7545 | void | 7543 | void |
| 7546 | x_catch_errors (Display *dpy) | 7544 | x_catch_errors (Display *dpy) |
| 7547 | { | 7545 | { |