aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2010-03-31 00:00:23 -0400
committerChong Yidong2010-03-31 00:00:23 -0400
commit4f103e0430a9c48084d26ab7f100542626c2acc6 (patch)
tree108da4ab89714c862d0523d57431aed3a9a3de38 /src
parenta6d676d9f41be8ad0c436c6d04cfedc1ce68adc8 (diff)
downloademacs-4f103e0430a9c48084d26ab7f100542626c2acc6.tar.gz
emacs-4f103e0430a9c48084d26ab7f100542626c2acc6.zip
* nsterm.h: Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsterm.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cb80f6f498d..d6bab5bdefc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-03-31 Chong Yidong <cyd@stupidchicken.com>
2
3 * nsterm.h: Fix last change.
4
12010-03-30 Bernhard Herzog <bh@intevation.de> (tiny change) 52010-03-30 Bernhard Herzog <bh@intevation.de> (tiny change)
2 6
3 * menu.c (Fx_popup_menu): Use last_event_timestamp (Bug#4930). 7 * menu.c (Fx_popup_menu): Use last_event_timestamp (Bug#4930).
diff --git a/src/nsterm.h b/src/nsterm.h
index 01086e63b69..10d1695dc4f 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -709,7 +709,7 @@ extern int ns_lisp_to_cursor_type ();
709extern Lisp_Object ns_cursor_type_to_lisp (int arg); 709extern Lisp_Object ns_cursor_type_to_lisp (int arg);
710extern Lisp_Object Qnone; 710extern Lisp_Object Qnone;
711extern void ns_set_name_as_filename (struct frame *f); 711extern void ns_set_name_as_filename (struct frame *f);
712extern void ns_set_doc_edited (struct frame *f, Lisp_Object arg); 712extern void ns_set_doc_edited (struct frame *f, Lisp_Object arg, Lisp_Object oldval);
713 713
714extern int 714extern int
715ns_defined_color (struct frame *f, char *name, XColor *color_def, int alloc, 715ns_defined_color (struct frame *f, char *name, XColor *color_def, int alloc,