Merging mistakes

[Eli Zaretskii]

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.

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

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