Re: Merge issues in `tls.el' (EMACS_22_BASE vs. trunk)

[Reiner Steib <reinersteib+gmane@imap.cc>]

On Sun, Mar 02 2008, Glenn Morris wrote:

> Reiner Steib wrote:
>> it seems that something went wrong when syncing Emacs_22 and the trunk
>> in `tls.el':
>
> No, something went wrong syncing gnus trunk to emacs trunk. :)
> Anyway, well spotted.

(In fact, I found it when comparing v5_10 and EMACS_22_BASE.)

>> - EMACS_22_BASE should not use `rx'.  (The log of revision 1.27 says
>>   "Revert merge that re-required rx.").
>
> There's no problem there.

The "problem" is loading rx and (maybe more important) unnecessary
differences between branch and trunk.

I'd suggest to replace the former one.  But Yidong or Stefan should
decide if it should be before or after the release of Emacs 22.2.

>> - In the trunk, `tls-end-of-info' is defcustomed, but not used at all.
>>   It is used in `open-tls-stream' in EMACS_22_BASE.
>
> The 2007-12-05 changes of Elias Oltmanns to open-tls-stream seem to
> have clobbered the 2007-11-04 changes of Riccardo Murri. Does this
> patch look ok?

Looks ok for me (cursory inspection only).

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/