unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: joaotavora@gmail.com (João Távora)
To: emacs-devel@gnu.org, dmantipov@yandex.ru
Subject: Latest master broken on Cocoa/NS
Date: Tue, 12 Jul 2016 22:47:33 +0100	[thread overview]
Message-ID: <m2poqi4jgq.fsf@gmail.com> (raw)

Hi Dmitry,

This commit seems to be the culprit:

  commit 20038f8ab75dd1551412a43cd58520c483c22921
  Author: Dmitry Antipov <dmantipov@yandex.ru>
  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...

João

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];
   else
-    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.  */)
      (void)










             reply	other threads:[~2016-07-12 21:47 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-12 21:47 João Távora [this message]
2016-07-12 22:05 ` Latest master broken on Cocoa/NS John Wiegley
2016-07-12 22:06 ` João Távora
2016-07-12 22:26   ` John Wiegley
2016-07-14  5:41     ` Dmitry Antipov
2016-07-14  6:26       ` John Wiegley
2016-07-15  6:41         ` Dmitry Antipov
2016-07-15  6:46           ` John Wiegley
2016-07-15  7:25           ` Eli Zaretskii
2016-07-15  7:28           ` martin rudalics
2016-07-15  8:02             ` Eli Zaretskii
2016-07-15  9:10               ` martin rudalics
2016-07-15 13:35           ` Stefan Monnier
2016-07-15 13:51             ` Clément Pit--Claudel
2016-07-15 14:09               ` Eli Zaretskii
2016-07-15 14:21                 ` Clément Pit--Claudel
2016-07-15 14:25                   ` Eli Zaretskii
2016-07-15 15:14                     ` Clément Pit--Claudel
2016-07-15 16:04                       ` Eli Zaretskii
2016-07-15 16:16                         ` Clément Pit--Claudel
2016-07-15 17:37                           ` Eli Zaretskii
2016-07-15 14:08             ` Dmitry Gutov
2016-07-15 15:20               ` martin rudalics
2016-07-15 16:12                 ` Clément Pit--Claudel
2016-07-15 16:41                   ` martin rudalics

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m2poqi4jgq.fsf@gmail.com \
    --to=joaotavora@gmail.com \
    --cc=dmantipov@yandex.ru \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).