unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Re: master 205abbf: * doc/misc/flymake.texi (An annotated example backend): Typo fix.
       [not found] ` <20200711102155.B375E20A27@vcs0.savannah.gnu.org>
@ 2020-07-11 16:46   ` Glenn Morris
  2020-07-11 17:48     ` Andrea Corallo via Emacs development discussions.
  0 siblings, 1 reply; 2+ messages in thread
From: Glenn Morris @ 2020-07-11 16:46 UTC (permalink / raw)
  To: emacs-devel; +Cc: Andrea Corallo


> 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.



^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: master 205abbf: * doc/misc/flymake.texi (An annotated example backend): Typo fix.
  2020-07-11 16:46   ` master 205abbf: * doc/misc/flymake.texi (An annotated example backend): Typo fix Glenn Morris
@ 2020-07-11 17:48     ` Andrea Corallo via Emacs development discussions.
  0 siblings, 0 replies; 2+ messages in thread
From: Andrea Corallo via Emacs development discussions. @ 2020-07-11 17:48 UTC (permalink / raw)
  To: Glenn Morris; +Cc: emacs-devel

Glenn Morris <rgm@gnu.org> writes:

>> 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".)

Apologies, sounded strange to me and checking I trusted my M-$.

> 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.

Yes I know, I mistakenly installed that into master so I cherry picked
into 27 afterwards.

Anyway is reverted with d24e56a5e4, thanks for letting me know.

Regards

  Andrea

-- 
akrl@sdf.org



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-07-11 17:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20200711102154.31548.31593@vcs0.savannah.gnu.org>
     [not found] ` <20200711102155.B375E20A27@vcs0.savannah.gnu.org>
2020-07-11 16:46   ` master 205abbf: * doc/misc/flymake.texi (An annotated example backend): Typo fix Glenn Morris
2020-07-11 17:48     ` Andrea Corallo via Emacs development discussions.

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).