[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merging mistakes

From: Stefan Monnier
Subject: Re: Merging mistakes
Date: Sat, 04 Dec 2010 09:00:24 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

> The kind of problems described below happens too much lately.  I think
> the unbearable lightness of merging with Bazaar is at least one of the
> reasons.  Unless we find a safer way of doing this, I fear that Emacs
> 23.3 will either take a very long pretesting or will be released more
> buggy than Emacs 23.2.

Actually, these specific smie byte-compiler-warnings have nothing to do
with bzr merging.  Just like others have already figured it in this
thread, they are simply the result of 2 conflicting desires:
- distribute smie.el with Emacs-23.3 so external packages can start to
  use it earlier.
- change as little of the code compared to the "upstream code".
So I left the blink-matching code, even though it's ineffective: it uses
a hook that's never run in Emacs-23.

I've tested the smie.el code in Emacs-23 about as much as is possible
(i.e. with coq-mode, sml-mode, octave-mode, modula2-mode, prolog-mode;
the last three requiring extra steps to perform this check since they
use pcase which doesn't exist/work in Emacs-23).

> Any suggestions for how to avoid destabilizing the release branch by
> too indiscriminate back-ports from the trunk?

But you're right that we need to be careful with it.  We haven't
received too many bug reports about the pretest code, tho, so it's not
clear whether we have a problem here.


> ------- Start of forwarded message -------
> Resent-From: Sven Joachim <address@hidden>
> Original-Sender: address@hidden
> Resent-To: address@hidden
> Resent-CC: address@hidden, address@hidden
> Resent-Sender: address@hidden
> To: address@hidden
> From: Sven Joachim <address@hidden>
> Date: Fri, 03 Dec 2010 11:15:15 +0100
> Cc: Sven Joachim <address@hidden>
> Subject: bug#7539: 23.2.90; smie.el uses stuff not available in emacs-23

> Byte-compiling lisp/emacs-lisp/smie.el in emacs-23 gives the following
> warnings:

> ,----
> | In smie-setup:
> | smie.el:1536:14:Warning: assignment to free variable
> |     `blink-matching-check-function'
> | 
> | In end of data:
> | smie.el:1559:1:Warning: the function `blink-matching-check-mismatch' is not
> |     known to be defined.
> `----

> Indeed blink-matching-check-function and blink-matching-check-mismatch
> only exist in the trunk, not in emacs-23.
> ------- End of forwarded message -------

reply via email to

[Prev in Thread] Current Thread [Next in Thread]