From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#59921: 30.0.50; emacs HEAD is missing some older emacs-29 commits Date: Sat, 10 Dec 2022 13:30:22 +0200 Message-ID: <835yejxzqp.fsf@gnu.org> References: <87r0x8rie6.fsf@posteo.net> <87bkocrbfe.fsf@posteo.net> <83h6y4zi5r.fsf@gnu.org> <878rjgdqlc.fsf@posteo.net> <83r0x7y9u9.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6839"; mail-complaints-to="usenet@ciao.gmane.io" Cc: stefankangas@gmail.com, 59921@debbugs.gnu.org To: leungbk@posteo.net Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 10 12:31:17 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1p3y4b-0001aX-NX for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 10 Dec 2022 12:31:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3y4O-0000nN-Po; Sat, 10 Dec 2022 06:31:04 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3y4N-0000nE-4r for bug-gnu-emacs@gnu.org; Sat, 10 Dec 2022 06:31:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3y4M-0005VA-SJ for bug-gnu-emacs@gnu.org; Sat, 10 Dec 2022 06:31:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3y4M-0000cg-EN for bug-gnu-emacs@gnu.org; Sat, 10 Dec 2022 06:31:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 10 Dec 2022 11:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59921 X-GNU-PR-Package: emacs Original-Received: via spool by 59921-submit@debbugs.gnu.org id=B59921.16706718352378 (code B ref 59921); Sat, 10 Dec 2022 11:31:02 +0000 Original-Received: (at 59921) by debbugs.gnu.org; 10 Dec 2022 11:30:35 +0000 Original-Received: from localhost ([127.0.0.1]:42250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3y3v-0000cG-AY for submit@debbugs.gnu.org; Sat, 10 Dec 2022 06:30:35 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:56324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3y3t-0000c9-2R for 59921@debbugs.gnu.org; Sat, 10 Dec 2022 06:30:33 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3y3n-0003nm-IM; Sat, 10 Dec 2022 06:30:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=F9VhVGJXvkuBTRsSlqrR9Uyg2JiZhekiwUKnE3CzNRk=; b=gFYRlgEVYeNi e0rrJaDpAJ6SL4HaCLf/2S0DbFl4f2VVuJRGKoXx5xrfbYVSWbc2G+3lXm4uQ3hWmFKrthDBiPVJE t60zGRxAEKeTacMUhjFQFHWRNBcytIsnwu2M0wRuFd8LWAlOEJ7LbhdIk+Fi+T18ToGlM7TgOioeM 1Lef6OU5viq4TifCckrzdEAo4nz1kdVMNLPejtLIe3XztbKQG6ulzIUy6+KcEKBwHevDDZ2G7q5HT iGra9iyr/vlDvaDDUAdaGy7g8W0V7i3aVFtEBSn+0ib280c2W9UDsykY6119RRZzaZGeMi33e99BO QPujyoz5JkWF9YOU0rdwdA==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3y3m-0001yT-JH; Sat, 10 Dec 2022 06:30:27 -0500 In-Reply-To: <83r0x7y9u9.fsf@gnu.org> (message from Eli Zaretskii on Sat, 10 Dec 2022 09:52:14 +0200) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:250507 Archived-At: > Cc: stefankangas@gmail.com, 59921@debbugs.gnu.org > Date: Sat, 10 Dec 2022 09:52:14 +0200 > From: Eli Zaretskii > > > 508b0c1b223 | * | Fix crash on Windows 9X > > 670daa8b626 | * | Add recursion limit to > > treesit--children-covering-range-recurse > > b429e524288 | * | Improve tree-sitter fontification in edge-cases > > (bug#59738) > > c83c95634e7 | * | Add c-ts-mode-indent-defun (bug#59662) > > 6479691cf07 | * | Fix syntax-table for tree-sitter modes > > b710ca62c00 | * | c++-ts-mode: Highlight nullptr as a constant > > d31a2539834 | * | Improve parameter checking in tree-sitter > > functions > > a669d5fae54 | * | ; * test/lisp/comint-tests.el > > (w32-application-type): Fix typo. > > f7262b8f81e | * | Fix comint-tests on MS-Windows > > fef17557365 | * | Use new external-completion.el in Eglot > > bf81df86e52 | * | Don't override completion-category-defaults in > > fido-mode > > 4bc9c8972ac | * | Add lisp/external-completion.el for completions > > from external tools > > bfc00f1c120 | * | Eglot: fix setting of > > flymake-list-only-diagnostics (bug#59824) > > d2411615e8b | * | * test/src/sqlite-tests.el (sqlite-version): > > Declare. > > You are saying that all of the above commits don't have their changes > in master? I've went over all of the above commits, and manually committed changes of those of them which appeared to be missing from the master branch. I have no idea how this happened. I guess we have some subtle bug in gitmerge.el, perhaps triggered by the situations like the one at that merge, where a feature branch which was not forked from our Git repository was merged piecemeal into the release branch.