From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#52126: Problematic characters in info node names Date: Mon, 29 Nov 2021 22:39:53 -0800 Message-ID: References: <871r2zueyw.fsf@gnus.org> <83ee6yvog6.fsf@gnu.org> <877dcqn8i2.fsf@protesilaos.com> <83czmivnr9.fsf@gnu.org> <871r2yn4f7.fsf@protesilaos.com> <83a6hmvj7j.fsf@gnu.org> <87y256lo81.fsf@protesilaos.com> <837dcqvh1i.fsf@gnu.org> <87tufullz6.fsf@protesilaos.com> <8335neuxyr.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15305"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 52126@debbugs.gnu.org, larsi@gnus.org, kyle@kyleam.com, rgm@gnu.org To: Eli Zaretskii , Protesilaos Stavrou Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Nov 30 07:41:16 2021 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 1mrwpI-0003oU-GY for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 30 Nov 2021 07:41:16 +0100 Original-Received: from localhost ([::1]:52112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrwpG-0007mR-TY for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 30 Nov 2021 01:41:14 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:50974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrwo7-0007mA-RX for bug-gnu-emacs@gnu.org; Tue, 30 Nov 2021 01:40:06 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:56743) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrwo7-0004Ua-1s for bug-gnu-emacs@gnu.org; Tue, 30 Nov 2021 01:40:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrwo6-0001J1-Tb for bug-gnu-emacs@gnu.org; Tue, 30 Nov 2021 01:40:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 30 Nov 2021 06:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52126 X-GNU-PR-Package: emacs Original-Received: via spool by 52126-submit@debbugs.gnu.org id=B52126.16382544025014 (code B ref 52126); Tue, 30 Nov 2021 06:40:02 +0000 Original-Received: (at 52126) by debbugs.gnu.org; 30 Nov 2021 06:40:02 +0000 Original-Received: from localhost ([127.0.0.1]:40056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrwo5-0001Ii-PH for submit@debbugs.gnu.org; Tue, 30 Nov 2021 01:40:01 -0500 Original-Received: from mail-pf1-f179.google.com ([209.85.210.179]:39895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrwo3-0001IU-ID for 52126@debbugs.gnu.org; Tue, 30 Nov 2021 01:39:59 -0500 Original-Received: by mail-pf1-f179.google.com with SMTP id i12so19578470pfd.6 for <52126@debbugs.gnu.org>; Mon, 29 Nov 2021 22:39:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:in-reply-to:references:mime-version:date :message-id:subject:to:cc; bh=iu0ydPBYx/H9ZKQmJqNGnxR/lyzjjneivDAskdWN02g=; b=IQriCdvF8ZJpm5l7x/h9q6sz6gH1G/jgrxtzJ6vgsig92/f2ZSd35xz5r+Pt+bjSIk 34O4kU9KZ6/94wyUSsJUMEwvOASNdkx9lRZecE2n0lCHunTO2HJdyuW3iBiN1MPyOb21 RsNB+63rE5kT20O4jua9Y9Y1cZD2VVzX0ZnRNpAiCbcWKIOFCTWRYJ4+kBu5MEwXnv6E o6CUsM2pbX2a0WHE9S6K3mglJrFp1k+gK4Arn3n+ouFyFwDb97IhMzu4q9JC7DWiK3zj OCIIQY1D9Sc6t71RzJfrLhtQnn6ZlIi988MqZGgZd1ohzgMt9H2nC6ZoOqVdgQ6y/n6d Ydnw== X-Gm-Message-State: AOAM533w48JAwCMuyI6MmaUlhn+wd0ppjVTc3LmzaUm62vd/RSUv00EO BqocCxPXOL+Wavka8ubtuDUwIXKcodYFZ8ADI2Q= X-Google-Smtp-Source: ABdhPJwHuRLUnSf1o4Hzc5op8fhbYVDjMFc5TVHOtdonorfnmRNZfwTRLmp7gc1QYhyDSS1Qjl/iCdYQqxB1l6Nm7As= X-Received: by 2002:a05:6a00:244d:b0:44d:c279:5155 with SMTP id d13-20020a056a00244d00b0044dc2795155mr43724831pfj.0.1638254393841; Mon, 29 Nov 2021 22:39:53 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Mon, 29 Nov 2021 22:39:53 -0800 In-Reply-To: <8335neuxyr.fsf@gnu.org> 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" Xref: news.gmane.io gmane.emacs.bugs:221100 Archived-At: Eli Zaretskii writes: > The common part should only be committed to one branch. > Alternatively, the commit to emacs-28 should be marked with the "do > not merge to master" note. See CONTRIBUTE for more about this. Yup. Otherwise, I get to resolve merge conflicts over my morning coffee. :-) There are unresolved conflicts in .../emacs/doc/misc/modus-themes.org Conflicts in: doc/misc/modus-themes.org Resolve the conflicts manually automerge: merge error It's not the end of the world, but it saves time if we can avoid it.