Mercurial > emacs
changeset 107942:3022f1f90ee2
Revert changes 98939 (enhance c-parse-state) and 99448 (< and > handling).
[These enhancements were not sufficiently stable at the time of releasing
a pretest.]
| author | Alan Mackenzie <acm@muc.de> |
|---|---|
| date | Tue, 13 Apr 2010 09:15:14 +0000 |
| parents | 171da9949036 (diff) 1a9d5fee61d1 (current diff) |
| children | 0ddcd935235c eb72bd4ec8f0 |
| files | |
| diffstat | 3 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.bzrignore Mon Apr 12 18:58:52 2010 +0000 +++ b/.bzrignore Tue Apr 13 09:15:14 2010 +0000 @@ -10,6 +10,7 @@ oo oo-spd autom4te.cache +*.dSYM *.elc *.exe DOC @@ -48,6 +49,7 @@ lisp/cus-load.el lisp/eshell/esh-groups.el lisp/finder-inf.el +nextstep/Emacs.app nt/config.log src/buildobj.h src/config.h
--- a/src/ChangeLog Mon Apr 12 18:58:52 2010 +0000 +++ b/src/ChangeLog Tue Apr 13 09:15:14 2010 +0000 @@ -1,3 +1,8 @@ +2010-04-13 Adrian Robert <Adrian.B.Robert@gmail.com> + + * nsmenu.m (EmacsDialog-runDialogAt:): Declare ret as + NSInteger (Bug#5811). + 2010-04-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * s/darwin.h (PTY_ITERATION, PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF)
--- a/src/nsmenu.m Mon Apr 12 18:58:52 2010 +0000 +++ b/src/nsmenu.m Tue Apr 13 09:15:14 2010 +0000 @@ -1709,7 +1709,7 @@ - (Lisp_Object)runDialogAt: (NSPoint)p { - int ret; + NSInteger ret; extern EMACS_TIME timer_check (int do_it_now); /* TODO: add to a header */ /* initiate a session that will be ended by pop_down_menu */