diff options
| author | Joakim Verona | 2013-09-11 07:47:21 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-11 07:47:21 +0200 |
| commit | 46b1dc2856fcfd6222f5320a511fcf0863c9c04c (patch) | |
| tree | 1c49c1f19420175b466a109ff3da3016fad37ca0 /src | |
| parent | 681bd2a1dd602397646a7382ae72c5f622c0946c (diff) | |
| download | emacs-46b1dc2856fcfd6222f5320a511fcf0863c9c04c.tar.gz emacs-46b1dc2856fcfd6222f5320a511fcf0863c9c04c.zip | |
fix conflicts
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 0e3d398035a..b9a16ffcc43 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -303,13 +303,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 303 | #include TERM_HEADER | 303 | #include TERM_HEADER |
| 304 | #endif /* HAVE_WINDOW_SYSTEM */ | 304 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 305 | 305 | ||
| 306 | <<<<<<< HEAD | ||
| 307 | #include "font.h" | 306 | #include "font.h" |
| 308 | #ifdef HAVE_XWIDGETS | 307 | #ifdef HAVE_XWIDGETS |
| 309 | #include "xwidget.h" | 308 | #include "xwidget.h" |
| 310 | #endif | 309 | #endif |
| 311 | ======= | ||
| 312 | >>>>>>> trunk | ||
| 313 | #ifndef FRAME_X_OUTPUT | 310 | #ifndef FRAME_X_OUTPUT |
| 314 | #define FRAME_X_OUTPUT(f) ((f)->output_data.x) | 311 | #define FRAME_X_OUTPUT(f) ((f)->output_data.x) |
| 315 | #endif | 312 | #endif |