diff options
| author | Paul Eggert | 2011-01-16 23:27:25 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-16 23:27:25 -0800 |
| commit | 4ef36a7b4c2107306387bece0843a4a1f2bcb552 (patch) | |
| tree | c1052954cda62dd93aa462fbb4dc135183064ade /src | |
| parent | 6df4097e922af99c7f051978be2df0ffbc51c929 (diff) | |
| download | emacs-4ef36a7b4c2107306387bece0843a4a1f2bcb552.tar.gz emacs-4ef36a7b4c2107306387bece0843a4a1f2bcb552.zip | |
* xterm.h (struct x_display_info): Remove stray semicolon.
The extra semicolon didn't conform to the C standard.
Problem reported by Sun cc.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xterm.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cb51917bb31..4b9fe9b13dc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2011-01-17 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-01-17 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * xterm.h (struct x_display_info): Remove stray semicolon. | ||
| 4 | The extra semicolon didn't conform to the C standard. | ||
| 5 | Problem reported by Sun cc. | ||
| 6 | |||
| 3 | * lisp.h: Redo flags and XSET slightly to avoid overflow diagnostics. | 7 | * lisp.h: Redo flags and XSET slightly to avoid overflow diagnostics. |
| 4 | These changes make compilation easier to follow with Sun cc. | 8 | These changes make compilation easier to follow with Sun cc. |
| 5 | (ARRAY_MARK_FLAG): Make it signed, so that it can be assigned to | 9 | (ARRAY_MARK_FLAG): Make it signed, so that it can be assigned to |
diff --git a/src/xterm.h b/src/xterm.h index 4f075be7fc0..4399d300834 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -270,8 +270,8 @@ struct x_display_info | |||
| 270 | Atom Xatom_Scrollbar; | 270 | Atom Xatom_Scrollbar; |
| 271 | 271 | ||
| 272 | /* Atom used in XEmbed client messages. */ | 272 | /* Atom used in XEmbed client messages. */ |
| 273 | Atom Xatom_XEMBED, Xatom_XEMBED_INFO;; | 273 | Atom Xatom_XEMBED, Xatom_XEMBED_INFO; |
| 274 | 274 | ||
| 275 | /* The frame (if any) which has the X window that has keyboard focus. | 275 | /* The frame (if any) which has the X window that has keyboard focus. |
| 276 | Zero if none. This is examined by Ffocus_frame in xfns.c. Note | 276 | Zero if none. This is examined by Ffocus_frame in xfns.c. Note |
| 277 | that a mere EnterNotify event can set this; if you need to know the | 277 | that a mere EnterNotify event can set this; if you need to know the |
| @@ -1112,4 +1112,3 @@ extern Lisp_Object Qx_gtk_map_stock; | |||
| 1112 | (nr).y = (ry), \ | 1112 | (nr).y = (ry), \ |
| 1113 | (nr).width = (rwidth), \ | 1113 | (nr).width = (rwidth), \ |
| 1114 | (nr).height = (rheight)) | 1114 | (nr).height = (rheight)) |
| 1115 | |||