[merge] Fix last set of Nextstep changes.

* nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL.
* nsterm.h: Fix prototype.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8c83866..908d837 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/nsfns.m b/src/nsfns.m
index 9de7681..7e7fd48 100644 (file)
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -686,7 +686,7 @@ ns_set_name_as_filename (struct frame *f)
 
 
 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;