Mercurial > emacs
changeset 107724:0e2821d60d4c
[merge] Fix last set of Nextstep changes.
* nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL.
* nsterm.h: Fix prototype.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Wed, 31 Mar 2010 18:28:12 -0400 |
| parents | d6963128f839 |
| children | cb51e74aafd2 56e62ae17d17 0e10810ea0f9 |
| files | src/ChangeLog src/nsfns.m |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Mar 31 18:22:17 2010 -0400 +++ b/src/ChangeLog Wed Mar 31 18:28:12 2010 -0400 @@ -16,6 +16,11 @@ (gif_load): Put GIF extension data to the property `Qextension_data'. +2010-03-31 Chong Yidong <cyd@stupidchicken.com> + + * nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL. + * nsterm.h: Fix prototype. + 2010-03-31 Eli Zaretskii <eliz@gnu.org> * xdisp.c (highlight_trailing_whitespace): Support highlight of
--- a/src/nsfns.m Wed Mar 31 18:22:17 2010 -0400 +++ b/src/nsfns.m Wed Mar 31 18:28:12 2010 -0400 @@ -686,7 +686,7 @@ void -ns_set_doc_edited (struct frame *f, Lisp_Object arg, Lisp_Object oldval) +ns_set_doc_edited (struct frame *f, Lisp_Object arg) { NSView *view = FRAME_NS_VIEW (f); NSAutoreleasePool *pool;