[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Latest master broken on Cocoa/NS

From: João Távora
Subject: Re: Latest master broken on Cocoa/NS
Date: Tue, 12 Jul 2016 23:06:30 +0100

Disregard the patch attached (and the diagnostic). My fix doesn't work for 
some reason I have yet to investigate.

The problem is still there, though.


On Tue, Jul 12, 2016 at 10:47 PM, João Távora <address@hidden> wrote:
Hi Dmitry,

This commit seems to be the culprit:

  commit 20038f8ab75dd1551412a43cd58520c483c22921
  Author: Dmitry Antipov <address@hidden>
  Date:   Tue Jul 12 09:16:26 2016 +0300

You add a frame argument to Fx_hide_tip and a corresponding call, but
apparently forgot to take care of nsfns.m, which also declares it for
use in the NS build:

   menu.c:1407:20: error: too many arguments to function call, expected 0, have 1
         Fx_hide_tip (frame);
         ~~~~~~~~~~~  ^~~~~
   ./globals.h:4300:1: note: 'Fx_hide_tip' declared here
   EXFUN (Fx_hide_tip, 0);
   ./../lwlib/../src/lisp.h:691:3: note: expanded from macro 'EXFUN'
     extern Lisp_Object fnname DEFUN_ARGS_ ## maxargs
   1 error generated.

The patch after my sig apparently fixes it...


diff --git a/src/nsfns.m b/src/nsfns.m
index a017be5..c5ff9e5 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2800,7 +2800,7 @@ with offset DY added (default is -10).
   if (ns_tooltip == nil)
     ns_tooltip = [[EmacsTooltip alloc] init];
-    Fx_hide_tip ();
+    Fx_hide_tip (frame);

   [ns_tooltip setText: str];
   size = [ns_tooltip frame].size;
@@ -2817,7 +2817,7 @@ with offset DY added (default is -10).

-DEFUN ("x-hide-tip", Fx_hide_tip, Sx_hide_tip, 0, 0, 0,
+DEFUN ("x-hide-tip", Fx_hide_tip, Sx_hide_tip, 0, 1, 0,
        doc: /* Hide the current tooltip window, if there is any.
 Value is t if tooltip was open, nil otherwise.  */)

João Távora

reply via email to

[Prev in Thread] Current Thread [Next in Thread]