xfns.c (Fx_create_frame): If frame height i stoo big, try

[gnu-emacs] / src / composite.h

diff --git a/src/composite.h b/src/composite.h
index e3a5e688f315711def7b1b99a7ac94ae0a660ed0..59c237c8de21f956b67e2d5747e4e126cec1f905 100644 (file)
--- a/src/composite.h
+++ b/src/composite.h
@@ -1,7 +1,7 @@
 /* Header for composite sequence handler.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008 Free Software Foundation, Inc.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+                 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
    Copyright (C) 2003, 2006
@@ -319,7 +319,7 @@ extern int composition_reseat_it P_ ((struct composition_it *,
 extern int composition_update_it P_ ((struct composition_it *,
                                      EMACS_INT, EMACS_INT, Lisp_Object));
 
-extern int composition_adjust_point P_ ((EMACS_INT));
+extern int composition_adjust_point P_ ((EMACS_INT, EMACS_INT));
 
 EXFUN (Fcompose_region_internal, 4);
 EXFUN (Fcompose_string_internal, 5);