From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: master 205abbf: * doc/misc/flymake.texi (An annotated example
 backend): Typo fix.
Date: Sat, 11 Jul 2020 12:46:41 -0400
Message-ID: <r8sgdyt2xa.fsf@fencepost.gnu.org>
References: <20200711102154.31548.31593@vcs0.savannah.gnu.org>
 <20200711102155.B375E20A27@vcs0.savannah.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="17530"; mail-complaints-to="usenet@ciao.gmane.io"
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
Cc: Andrea Corallo <akrl@sdf.org>
To: emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Jul 11 18:47:13 2020
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1juIee-0004SS-Ie
	for ged-emacs-devel@m.gmane-mx.org; Sat, 11 Jul 2020 18:47:12 +0200
Original-Received: from localhost ([::1]:59204 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1juIed-0006SU-IO
	for ged-emacs-devel@m.gmane-mx.org; Sat, 11 Jul 2020 12:47:11 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58328)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <rgm@gnu.org>) id 1juIeC-00060S-93
 for emacs-devel@gnu.org; Sat, 11 Jul 2020 12:46:44 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:57153)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <rgm@gnu.org>)
 id 1juIeB-0004La-Ij; Sat, 11 Jul 2020 12:46:43 -0400
Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82)
 (envelope-from <rgm@gnu.org>)
 id 1juIe9-0003tL-Sk; Sat, 11 Jul 2020 12:46:42 -0400
X-Spook: Twister Nogales AGT. AMME Commecen Leitrim Wave DNDO Avian
X-Ran: EuC7o)>}^Q<5u@@=V3S?\=zto5\-?-xbn$.Z1+xm1x9-:gL-_%8M-n;\xLVJQ>hVP}5DSM
X-Hue: brightmagenta
X-Attribution: GM
In-Reply-To: <20200711102155.B375E20A27@vcs0.savannah.gnu.org> (Andrea
 Corallo's message of "Sat, 11 Jul 2020 06:21:55 -0400 (EDT)")
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org
Original-Sender: "Emacs-devel"
 <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
Xref: news.gmane.io gmane.emacs.devel:252866
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/252866>


> branch: master
> commit 205abbfb6875d940da347122100dfd4cd411adb4

>     * doc/misc/flymake.texi (An annotated example backend): Typo fix.

> -                  (flymake-log :warning "Canceling obsolete check %s"
> +                  (flymake-log :warning "Cancelling obsolete check %s"


I believe American English (which Emacs uses) prefers single "l",
so this was not a typo. (Though Emacs is not very consistent in this
particular case, with about 1 "cancelled" for every 5 "canceled".)

Also, FYI, you don't need to make identical changes on master and
release branch. Just make them on the release branch and let them get
merged to master.