Re: Post-22.1 development?

[Chong Yidong]

Jason Rumney <address@hidden> writes:

> David Kastrup wrote:
>>> Let's wait a couple of months.
>>>     
>>
>> I don't think this is a good plan, and here is why:
>>
>> EMACS_22_BASE is for work on Emacs 22.2
>> trunk is for work on Emacs 22.2
>> unicode-2 is for work on Emacs 23.1
>>   
>
> I agree that 2 months is too long to wait. We should merge any changes
> from the trunk that were intended for Emacs 22.2 ASAP, then any future
> changes targeted for 22.2 should be made in the EMACS_22_BASE branch and
> merged to the trunk, not the other way around.

I've gone ahead and merged several straightforward bugfixes from the
trunk into the branch.  I also drew up a list of the remaining
differences between the trunk and branch.  Could people chime in about
whether these should make their way into the branch?

1. Two new files:

   2007-06-04  Michael Albinus  net/socks.el
   2007-05-31  Stefan Monnier   textmodes/css-mode.el


2. Several package updates and enhancements:

   2007-05-28  Michael Albinus  Tramp 2.0.56.

   2007-06-03  Nick Roberts     [Terminal mouse enhancements]
   ....                        xt-mouse.el, t-mouse.el, keyboard.c, ...

   2007-05-21  Chong Yidong     [image uncaching code]
                                image.c, image-mode.el

   2007-05-24  Chong Yidong     image-mode.el [scrolling in image-mode]

   2007-05-22  Jan Djärv        Use find-source-lisp-file in help-fns.el

   2007-05-17  Vinicius Jose Latorre  Printing 6.9

3. An incompatible package behavior change:

   2007-06-01  David Kastrup

   * dired.el (dired-recursive-deletes, dired-recursive-copies):
     Change default to `top'.

4. Several other fixes whose safety is not known to me:

   2007-06-03  Sam Steingold  <address@hidden>

     Add TIMESTAMP to LOC to handle "incremental compilation", e.g.,
     with `omake -P': the compilation process never terminates and
     automatically recompiles modified files.

     * progmodes/compile.el (compilation-loop): VISITED is not 5th CDR.
     (compilation-next-error-function): Set TIMESTAMP.

   2007-06-03  Sam Steingold  <address@hidden>

     * files.el (kill-buffer-ask): New function.
     (kill-some-buffers): Use it.
     (kill-matching-buffers): New user command.


   2007-05-23  Eli Zaretskii  <address@hidden>

     * tar-mode.el (tar-header-block-summarize, tar-summarize-buffer)
     (tar-get-descriptor): Handle type 55, an extended pax header.

   2007-05-22  Martin Rudalics  <address@hidden>

     * syntax.c (scan_words): Fix arg to UPDATE_SYNTAX_TABLE_BACKWARD.

   2007-04-29  Andreas Schwab  <address@hidden>

     * lisp.h (VECSIZE): Use OFFSETOF.

   2007-04-28  Richard Stallman  <address@hidden>

     * lread.c (read_escape): In a string, \s is always space.

5. And a big pile of changes by Stefan Monnier.  [Stefan, can you
   handle the merge for these by yourself?]

     keymap.c emacs-lisp/derived.el emacs-lisp/copyright.el edmacro.el
     ediff-init.el cus-dep.el composite.el autoinsert.el
     textmodes/sgml-mode.el textmodes/tex-mode.el diff-mode.el
     emacs-lisp/advice.el newcomment.el textmodes/sgml-mode.el vc.el
     progmodes/python.el diff.el