From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andrea Corallo Newsgroups: gmane.emacs.devel Subject: Re: [External] : emacs-28 windows binaries available from alpha Date: Thu, 10 Feb 2022 18:34:22 +0000 Message-ID: References: <834k5d3hbv.fsf@gnu.org> <83o83l1v51.fsf@gnu.org> <83k0e3vox9.fsf@gnu.org> <83fsoruv2u.fsf@gnu.org> <83o83eudgz.fsf@gnu.org> <83ee4atzh5.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20943"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: dieter@duenenhof-wilhelm.de, corwin@bru.st, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Feb 10 20:08:34 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nIEnx-0005I0-HA for ged-emacs-devel@m.gmane-mx.org; Thu, 10 Feb 2022 20:08:33 +0100 Original-Received: from localhost ([::1]:37852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIEnw-0007ig-3L for ged-emacs-devel@m.gmane-mx.org; Thu, 10 Feb 2022 14:08:32 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:51614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIEH9-0004oZ-Tl for emacs-devel@gnu.org; Thu, 10 Feb 2022 13:34:40 -0500 Original-Received: from mx.sdf.org ([205.166.94.24]:59145) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIEH7-0006WT-Ju; Thu, 10 Feb 2022 13:34:39 -0500 Original-Received: from ma.sdf.org (ma.sdf.org [205.166.94.33]) by mx.sdf.org (8.15.2/8.14.5) with ESMTPS id 21AIYM9S000495 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO); Thu, 10 Feb 2022 18:34:23 GMT In-Reply-To: <83ee4atzh5.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 10 Feb 2022 19:15:18 +0200") Received-SPF: pass client-ip=205.166.94.24; envelope-from=akrl@sdf.org; helo=mx.sdf.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:286146 Archived-At: Eli Zaretskii writes: >> From: Andrea Corallo >> Cc: dieter@duenenhof-wilhelm.de, corwin@bru.st, emacs-devel@gnu.org >> Date: Thu, 10 Feb 2022 13:36:10 +0000 >> >> Eli Zaretskii writes: >> >> > Fine with me, please install on the release branch. But please add >> > there a comment explaining why we do this, and mention that it's for >> > MS-Windows (you can take the text from the comment I wrote for my >> > comp.c patch, which will now not be needed). >> >> Done with 202d3be873. > > Thanks. > >> PS I tried to merge emacs-28 into master using gitmerge.el as suggested >> in git-workflow as I suspected a conflict there that I wanted to solve >> myself, but it says "nothing to merge". Not sure if I'm doing something >> wrong. > > I merged that change, but for the future: what exactly did you do, and > in particular did you remember to switch to the master branch and do a > "git pull" in master, before invoking "gitmerge"? I did what's described in git-workflow, so yes I had master checked out and I pulled before trying. The only difference is that haven't started a fresh emacs but loaded gitmerge.el in my current session. Next time I'll try with a fresh session and maybe with -Q. Anyway I was thinking if it wouldn't be correct to emit also a warning if libgccjit is not available. This condition could prevent some package to work as expected (ex evil-mode IIRC) so might be worth to inform the user that and emacs compiled with native-comp is being run without libgccjit being available. In case we decide is worth if we agree on the message I'll be happy to prepare the patch. Best Regards Andrea