(Finsert_file_contents): Delete incorrect decrement of specpdl_ptr.

[gnu-emacs] / src / nsterm.h

diff --git a/src/nsterm.h b/src/nsterm.h
index d2a66aadfef45e0d25d56b21af613daff03e4481..97db10ce338184dc235860ea1072e1f3e778b309 100644 (file)
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -41,7 +41,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 - (void)showPreferencesWindow: (id)sender;
 - (BOOL) openFile: (NSString *)fileName;
 - (void)fd_handler: (NSTimer *) fdEntry;
-- (void)cursor_blink_handler: (NSTimer *)cursorEntry;
 - (void)timeout_handler: (NSTimer *)timedEntry;
 - (BOOL)fulfillService: (NSString *)name withArg: (NSString *)arg;
 @end
@@ -83,6 +82,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 - (void) setWindowClosing: (BOOL)closing;
 - (EmacsToolbar *) toolbar;
 - (void) deleteWorkingText;
+
+#ifdef NS_IMPL_GNUSTEP
+/* Not declared, but useful. */
+- (void) unlockFocusNeedsFlush: (BOOL)needs;
+#endif
 @end
 
 
@@ -355,7 +359,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 @end
 
 extern NSArray *ns_send_types, *ns_return_types;
-extern EmacsMenu *mainMenu, *svcsMenu;
+extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
 
 /* Apple removed the declaration, but kept the implementation */
 #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
@@ -364,10 +368,10 @@ extern EmacsMenu *mainMenu, *svcsMenu;
 @end
 #endif
 
-#if defined (NS_IMPL_GNUSTEP) || ( defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4)
+#ifndef NS_HAVE_NSINTEGER
 typedef long NSInteger;
 typedef unsigned long NSUInteger;
-#endif /* NS_IMPL_GNUSTEP || (NS_IMPL_COCOA and <= 10.4) */
+#endif /* not NS_HAVE_NSINTEGER */
 
 #endif  /* __OBJC__ */