Mercurial > emacs
comparison src/nsterm.m @ 107709:6db4a0b4404d
Merge from emacs-23 branch
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 30 Mar 2010 22:37:57 -0400 |
| parents | 5860ffa0c5d9 |
| children | ad09f2bfce51 f6f0d450d542 |
comparison
equal
deleted
inserted
replaced
| 107666:67420d9c4e00 | 107709:6db4a0b4404d |
|---|---|
| 4170 -------------------------------------------------------------------------- */ | 4170 -------------------------------------------------------------------------- */ |
| 4171 { | 4171 { |
| 4172 /*NSTRACE (timeout_handler); */ | 4172 /*NSTRACE (timeout_handler); */ |
| 4173 ns_send_appdefined (-2); | 4173 ns_send_appdefined (-2); |
| 4174 } | 4174 } |
| 4175 | |
| 4176 extern void update_window_cursor (struct window *w, int on); | |
| 4177 | 4175 |
| 4178 - (void)fd_handler: (NSTimer *) fdEntry | 4176 - (void)fd_handler: (NSTimer *) fdEntry |
| 4179 /* -------------------------------------------------------------------------- | 4177 /* -------------------------------------------------------------------------- |
| 4180 Check data waiting on file descriptors and terminate if so | 4178 Check data waiting on file descriptors and terminate if so |
| 4181 -------------------------------------------------------------------------- */ | 4179 -------------------------------------------------------------------------- */ |