[Emacs-diffs] /srv/bzr/emacs/trunk r99796: [merge] Fix last set of Nextstep changes.

[Chong Yidong]

------------------------------------------------------------
revno: 99796
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2010-03-31 18:28:12 -0400
message:
  [merge] Fix last set of Nextstep changes.
  
  * nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL.
  * nsterm.h: Fix prototype.
modified:
  src/ChangeLog
  src/nsfns.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-03-31 20:39:03 +0000
+++ b/src/ChangeLog     2010-03-31 22:28:12 +0000
@@ -16,6 +16,11 @@
        (gif_load): Put GIF extension data to the property
        `Qextension_data'.
 
+2010-03-31  Chong Yidong  <address@hidden>
+
+       * nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL.
+       * nsterm.h: Fix prototype.
+
 2010-03-31  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (highlight_trailing_whitespace): Support highlight of

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2010-03-29 23:48:44 +0000
+++ b/src/nsfns.m       2010-03-31 22:28:12 +0000
@@ -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;