diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-04-18 13:40:23 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-04-18 13:40:23 +0000 |
| commit | 6ab9dd8034fcd76f5d2e92a91243f8d8be3a8f98 (patch) | |
| tree | a40a6371728d46bdfb26b7090612e0ca70e1c057 /src/termhooks.h | |
| parent | 91fd98fc1eff12aa5a46142efabababa7daf77bb (diff) | |
| parent | d4127a9a1111805640eaa06e9767a7a6f56351a5 (diff) | |
| download | emacs-6ab9dd8034fcd76f5d2e92a91243f8d8be3a8f98.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 60-65, 246-265)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-246
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-247
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-248
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-249
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-250
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-251
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-252
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-253
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-254
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-255
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-256
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-257
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-258
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-259
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-260
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-261
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-262
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-263
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-264
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-265
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-60
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-61
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-62
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-63
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-64
(mm-string-to-multibyte): Use Gnus trunk definition.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-65
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-328
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index 9aedede55bf..d424ad75e4a 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -103,10 +103,11 @@ enum event_kind the wheel event occurred in. .timestamp gives a timestamp (in milliseconds) for the event. */ -#ifdef WINDOWSNT - LANGUAGE_CHANGE_EVENT, /* A LANGUAGE_CHANGE_EVENT is generated - on WINDOWSNT when the keyboard layout - or input language is changed by the +#if defined (WINDOWSNT) || defined (MAC_OS) + LANGUAGE_CHANGE_EVENT, /* A LANGUAGE_CHANGE_EVENT is + generated on WINDOWSNT or Mac OS + when the keyboard layout or input + language is changed by the user. */ #endif SCROLL_BAR_CLICK_EVENT, /* .code gives the number of the mouse button |