summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-03-31 18:28:12 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-03-31 18:28:12 -0400
commit6521c534c4b34ca6da72ad6dc9fb1cac0e576a8d (patch)
tree7536e9e7783bc1ae4ef240370eee8e3fc36fdde7 /src
parent1625d379e06ecd5deb1c1f1d7201ce77be484163 (diff)
downloademacs-6521c534c4b34ca6da72ad6dc9fb1cac0e576a8d.tar.gz
[merge] Fix last set of Nextstep changes.
* nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL. * nsterm.h: Fix prototype.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/nsfns.m2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8c83866350d..908d83759f3 100644
--- 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 9de7681b2f7..7e7fd48caf0 100644
--- 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;