diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /src/w32notify.c | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'src/w32notify.c')
| -rw-r--r-- | src/w32notify.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32notify.c b/src/w32notify.c index be03a6ce45f..95ab298f2d3 100644 --- a/src/w32notify.c +++ b/src/w32notify.c | |||
| @@ -59,7 +59,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 59 | 59 | ||
| 60 | When the FILE_NOTIFY_EVENT event is processed by keyboard.c's | 60 | When the FILE_NOTIFY_EVENT event is processed by keyboard.c's |
| 61 | kbd_buffer_get_event, it is converted to a Lispy event that can be | 61 | kbd_buffer_get_event, it is converted to a Lispy event that can be |
| 62 | bound to a command. The default binding is w32notify-handle-event, | 62 | bound to a command. The default binding is file-notify-handle-event, |
| 63 | defined on subr.el. | 63 | defined on subr.el. |
| 64 | 64 | ||
| 65 | After w32_read_socket or w32_console_read_socket are done | 65 | After w32_read_socket or w32_console_read_socket are done |