Mercurial > emacs

changeset 107908:44e86aa9f6f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 31 Mar 2010 06:31:33 +0000
parents 91ec5dc616ef (current diff) cc97bf641d5f (diff)
children de35fc0712bc
files
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Mar 31 00:05:35 2010 +0000
+++ b/src/ChangeLog	Wed Mar 31 06:31:33 2010 +0000
@@ -1,3 +1,7 @@
+2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
+
+	* nsterm.h: Fix last change.
+
 2010-03-30  Bernhard Herzog  <bh@intevation.de>  (tiny change)
 
 	* menu.c (Fx_popup_menu): Use last_event_timestamp (Bug#4930).
--- a/src/nsterm.h	Wed Mar 31 00:05:35 2010 +0000
+++ b/src/nsterm.h	Wed Mar 31 06:31:33 2010 +0000
@@ -709,7 +709,7 @@
 extern Lisp_Object ns_cursor_type_to_lisp (int arg);
 extern Lisp_Object Qnone;
 extern void ns_set_name_as_filename (struct frame *f);
-extern void ns_set_doc_edited (struct frame *f, Lisp_Object arg);
+extern void ns_set_doc_edited (struct frame *f, Lisp_Object arg, Lisp_Object oldval);
 
 extern int
 ns_defined_color (struct frame *f, char *name, XColor *color_def, int alloc,