diff options
| author | Miles Bader | 2007-08-13 13:51:08 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-08-13 13:51:08 +0000 |
| commit | aaf34461ff5804e5cebe163b31e535da72e81d87 (patch) | |
| tree | b096310b459b78e437f08ac0f1f00954840a5db5 /src/termhooks.h | |
| parent | 61d032dfd91b811d59acd7605ac02758be97e912 (diff) | |
| parent | 37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (diff) | |
| download | emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.tar.gz emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index 740c9135866..4124e37586b 100644 --- a/src/termhooks.h +++ b/src/termhooks.h | |||
| @@ -52,7 +52,7 @@ extern void (*fullscreen_hook) P_ ((struct frame *f)); | |||
| 52 | /* Input queue declarations and hooks. */ | 52 | /* Input queue declarations and hooks. */ |
| 53 | 53 | ||
| 54 | /* Expedient hack: only provide the below definitions to files that | 54 | /* Expedient hack: only provide the below definitions to files that |
| 55 | are prepared to handle lispy things. CONSP is defined iff lisp.h | 55 | are prepared to handle lispy things. CONSP is defined if lisp.h |
| 56 | has been included before this file. */ | 56 | has been included before this file. */ |
| 57 | #ifdef CONSP | 57 | #ifdef CONSP |
| 58 | 58 | ||