diff options
| author | Kenichi Handa | 2014-06-28 10:35:48 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2014-06-28 10:35:48 +0900 |
| commit | f036e167feaf875873636972b28a4adc12c32254 (patch) | |
| tree | 440e45ae8951f7030393b130b184f2b1882070ee /src/eval.c | |
| parent | 1fc00e5c9e87c88b4b253692d6ade822f6d74d3e (diff) | |
| parent | 2c4e2e6fd3096eb615504e3cfc89c588ec620f78 (diff) | |
| download | emacs-f036e167feaf875873636972b28a4adc12c32254.tar.gz emacs-f036e167feaf875873636972b28a4adc12c32254.zip | |
merge trunk
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/eval.c b/src/eval.c index a96d413d09f..7d54ddb18f5 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -27,11 +27,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 27 | #include "commands.h" | 27 | #include "commands.h" |
| 28 | #include "keyboard.h" | 28 | #include "keyboard.h" |
| 29 | #include "dispextern.h" | 29 | #include "dispextern.h" |
| 30 | #include "frame.h" /* For XFRAME. */ | ||
| 31 | |||
| 32 | #if HAVE_X_WINDOWS | ||
| 33 | #include "xterm.h" | ||
| 34 | #endif | ||
| 35 | 30 | ||
| 36 | /* Chain of condition and catch handlers currently in effect. */ | 31 | /* Chain of condition and catch handlers currently in effect. */ |
| 37 | 32 | ||