From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oBedMg7tV2FoFAAAgWs5BA (envelope-from ) for ; Sat, 02 Oct 2021 07:24:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id SElALg7tV2GwUAAAB5/wlQ (envelope-from ) for ; Sat, 02 Oct 2021 05:24:30 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 34F5C284CB for ; Sat, 2 Oct 2021 07:24:30 +0200 (CEST) Received: from localhost ([::1]:33526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWXVc-0004lW-IJ for larch@yhetil.org; Sat, 02 Oct 2021 01:24:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWXVG-0004k9-Cw for emacs-orgmode@gnu.org; Sat, 02 Oct 2021 01:24:06 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:33465) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWXVE-0002pL-Ro; Sat, 02 Oct 2021 01:24:06 -0400 Received: by mail-pf1-x435.google.com with SMTP id s16so9800085pfk.0; Fri, 01 Oct 2021 22:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=b04D1rmTIEvB6EbsFFk+6BToM+hJf1oYa8odsXZTbfY=; b=n0LHZyPpcXyj7rC8TjZhZxc4sVIEu6QCAeHW1ZmMqIXrBt5XhQPu8PNvYadWsiV90t Quaii1LQRUe27cVIDq1Vu8cOl5wZyjpZO+AdL2ogvLvBxwdJUhSDB3T8X04BYtJcRer1 4360LdPlf0xWlg5NYFF0fmkPF+T58upcKif5vEtSJAOXla1UUIsyf+kQAIDtdO6R7jI5 fr8i2obhvuQwIG6Q1T8dAUsWFiQQGyrJ13wuIZ8Ugr9/wDgdmya9r+cmGHV8oyc15P/r jVdFkq8MRH/NNVL1nXq38A+AwtBeJlsyUFte8AYz0TVL8QCMG32kFlmiXI+STS4vrLHZ XzTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=b04D1rmTIEvB6EbsFFk+6BToM+hJf1oYa8odsXZTbfY=; b=siIPRq7/OFL6agrxCqQ88iKkMkU1Z82eR+LtPIPSrHeQhcuLLXh2xwY0ZxbfTCydiR lBH7ni8etj/knW/8XGlL4U6+tpdB9x153l49yHGsF3jEIQuLzt5d4VVaCzxh6mZaKh3X 1nPlMenUaroMH5IbbhfZ/LNEnacvufnKsa3wkhd72jWbV/qYWv5FTIVaTpcu71Tbo+q0 55PTBXKQXgNCMqE6IxMWDqVPfdG6sRXyjJZdW2YGjg0yS3g2lReHL5WgxjWM4Hs6fEdr vTvRZUnUzxYakBbGla/jGb3XmDMD7UAvthwtCXOEUc63Pr61RzfUq85kIquUfvjJFVf5 6Big== X-Gm-Message-State: AOAM531SW5zoP9NzYh7pB+Lz2nXR3xELkWxVX6SY/KLXgPyJno6J6g3A +Fo6uI9nlzG8GOHGPRnfOTKpDp8Bds5ly7cq X-Google-Smtp-Source: ABdhPJwRVvdWmzcKZj5sUhexq2ez4XeGbJpLx8QyQVrJJFkozyAR2goA/0HZz/JgvPxQmSD6fuYfrg== X-Received: by 2002:a65:6a15:: with SMTP id m21mr1566740pgu.415.1633152241814; Fri, 01 Oct 2021 22:24:01 -0700 (PDT) Received: from localhost (211-22-147-226.hinet-ip.hinet.net. [211.22.147.226]) by smtp.gmail.com with ESMTPSA id f33sm560251pjk.42.2021.10.01.22.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Oct 2021 22:24:01 -0700 (PDT) From: Ihor Radchenko To: Bastien Subject: Re: Bug: font-lock error with - in code-mode [9.4.6 (9.4.6-gab9f2a @ /gnu/store/2pny4z6mbi2aybgzzxz0yrzkds7hbpmq-emacs-org-9.4.6/share/emacs/site-lisp/org-9.4.6/)] In-Reply-To: <87v92gnhsv.fsf@bzg.fr> References: <87fsujp7mc.fsf@web.de> <87lf3d3w6n.fsf@localhost> <87o888oxog.fsf@gnu.org> <87ee94yqnl.fsf@localhost> <87v92gnhsv.fsf@bzg.fr> Date: Sat, 02 Oct 2021 13:25:19 +0800 Message-ID: <874ka0yp4w.fsf@localhost> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=yantar92@gmail.com; helo=mail-pf1-x435.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Dr. Arne Babenhauserheide" , emacs-orgmode@gnu.org Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633152270; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=b04D1rmTIEvB6EbsFFk+6BToM+hJf1oYa8odsXZTbfY=; b=G3fsO6ad8sKFciWa0mfmTH94NrtILAz1s31tFzI/eMIG6O8SPXr6K3Z7m8gXXT39v00v+m EG5p8II92eOGk8Wa95seMDXLDebfyXbv8pg70Jl3z5vtpwRopscwKb9z2ufU8iQ675mGot Pgewto+tandHBTFHXZUAOYDMbjdYdyPLv6JoDZUb2NAyGPRQ3jz36xpVHmsEob0kHWv5aS UrZq/u/WLQ6J1Kfzm4HhWr923AB6wh2KDwrmaXuVjHLcwpPUQhULQnMLyuJtWyoUdKP8I+ lHYxQK1NzE/mmvyec7K+kGO+v7OdueAwnakvEapfU51wvpam2kXGaABsVOsBhg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633152270; a=rsa-sha256; cv=none; b=HYo8zS3zrGfHkC2ObaIdGoS74zPydlApyhqVkZKmZaHXUd43SYb55auzAG95cimrSLmV1b 8LBW8ZZBCO2TNno4akJWAoZpVK3AAch5j92TmEnOKwg7BIGNTm2EbyOZ2zK6/SmK6EX7dW d6OK/sF+JwFkADXxQ+06o1sQlrkqI/odp/fkiCmIX00gdnp0H5st04QH/6+epDTtd3ceTW rTBm+Gf1DJvlVIkNjVgQp1gRfItTpm+6TXj+XP9Jp06qkrd4u2qIB3/RzbCviGiS3epYOi EfYtRCDOvJhHKQXlEKgncNprRq1EkXVXZDYGMmbtIdWu1M7LhW0EUBl4lVtbQw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=n0LHZyPp; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: -2.61 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=n0LHZyPp; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 34F5C284CB X-Spam-Score: -2.61 X-Migadu-Scanner: scn0.migadu.com X-TUID: NtbwErAw53z6 Bastien writes: > Ihor Radchenko writes: > >> Should I also merge main with bugfix every time? > > You should merge bugfix into main, yes (but not main into bugfix.) Thanks for the clarification. It indeed makes sense, but I was not sure if merging too frequently is ok or not. Best, Ihor