From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Reiner Steib Newsgroups: gmane.emacs.devel Subject: Re: Merge issues in `tls.el' (EMACS_22_BASE vs. trunk) Date: Sun, 02 Mar 2008 16:56:14 +0100 Message-ID: References: <13zltiauc8.fsf@fencepost.gnu.org> Reply-To: Reiner Steib NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1204473429 2379 80.91.229.12 (2 Mar 2008 15:57:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Mar 2008 15:57:09 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 02 16:57:34 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JVqZC-0006fr-2C for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2008 16:57:34 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JVqYf-0003Bd-8J for ged-emacs-devel@m.gmane.org; Sun, 02 Mar 2008 10:57:01 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JVqYX-00036l-Ek for emacs-devel@gnu.org; Sun, 02 Mar 2008 10:56:53 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JVqYW-000356-Ig for emacs-devel@gnu.org; Sun, 02 Mar 2008 10:56:52 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JVqYW-00034e-6h for emacs-devel@gnu.org; Sun, 02 Mar 2008 10:56:52 -0500 Original-Received: from mail.uni-ulm.de ([134.60.1.11]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JVqYS-0003dN-9P; Sun, 02 Mar 2008 10:56:48 -0500 Original-Received: from bridgekeeper.physik.uni-ulm.de (bridgekeeper.physik.uni-ulm.de [134.60.41.37]) by mail.uni-ulm.de (8.14.2/8.14.2) with ESMTP id m22Fuk4w000699; Sun, 2 Mar 2008 16:56:46 +0100 (MET) Original-Received: from localhost (bridgekeeper.physik.uni-ulm.de [134.60.41.37]) by bridgekeeper.physik.uni-ulm.de (Postfix) with ESMTP id 81E3712FCF; Sun, 2 Mar 2008 16:56:46 +0100 (CET) X-Face: P05mdcZT&lL[-s2=mw~RsllZ0zZAb?vdE}.s, emacs-devel@gnu.org In-Reply-To: <13zltiauc8.fsf@fencepost.gnu.org> (Glenn Morris's message of "Sat, 01 Mar 2008 18:38:15 -0500") User-Agent: Gnus/5.110007 (No Gnus v0.7) Emacs/22.1.91 (gnu/linux) X-DCC-CTc-dcc2-Metrics: poseidon 1031; Body=2 Fuz1=2 Fuz2=2 X-Virus-Scanned: by amavisd-new X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:91065 Archived-At: 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/