projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
266c954
)
* xterm.c (x_catch_errors): Remove duplicate declaration.
author
Paul Eggert
<eggert@cs.ucla.edu>
Wed, 6 Apr 2011 22:46:00 +0000
(15:46 -0700)
committer
Paul Eggert
<eggert@cs.ucla.edu>
Wed, 6 Apr 2011 22:46:00 +0000
(15:46 -0700)
src/ChangeLog
patch
|
blob
|
history
src/xterm.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index 8c92869db1f0ddca972699487d5b6d1be0063ff9..ce97ca8204be16f9b3608db4a5457111c29ad17d 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,5
+1,7
@@
2011-04-06 Paul Eggert <eggert@cs.ucla.edu>
+ * xterm.c (x_catch_errors): Remove duplicate declaration.
+
* term.c (maybe_fatal): Mark its 3rd arg as a printf format, too.
* xdisp.c, lisp.h (message_nolog): Remove; unused.
diff --git
a/src/xterm.c
b/src/xterm.c
index 92df7ae8746b44df213d45499a853fed3b7a8e5a..3fc431c135045cf22b87365925f07d2dafe41553 100644
(file)
--- a/
src/xterm.c
+++ b/
src/xterm.c
@@
-7540,8
+7540,6
@@
x_error_catcher (Display *display, XErrorEvent *event)
Calling x_uncatch_errors resumes the normal error handling. */
-void x_check_errors (Display *dpy, const char *format);
-
void
x_catch_errors (Display *dpy)
{