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: Merge issues in `tls.el' (EMACS_22_BASE vs. trunk) Date: Sat, 01 Mar 2008 23:40:51 +0100 Message-ID: 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 1204411370 12651 80.91.229.12 (1 Mar 2008 22:42:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 1 Mar 2008 22:42:50 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 01 23:43:15 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 1JVaQ6-0007AQ-5v for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2008 23:43:06 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JVaPZ-0003eT-J6 for ged-emacs-devel@m.gmane.org; Sat, 01 Mar 2008 17:42:33 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JVaPV-0003eD-0Y for emacs-devel@gnu.org; Sat, 01 Mar 2008 17:42:29 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JVaPS-0003e1-K2 for emacs-devel@gnu.org; Sat, 01 Mar 2008 17:42:27 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JVaPS-0003dy-EZ for emacs-devel@gnu.org; Sat, 01 Mar 2008 17:42:26 -0500 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JVaPS-0000Hh-3j for emacs-devel@gnu.org; Sat, 01 Mar 2008 17:42:26 -0500 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1JVaPJ-0008Qp-U2 for emacs-devel@gnu.org; Sat, 01 Mar 2008 22:42:17 +0000 Original-Received: from p54a9777d.dip.t-dialin.net ([84.169.119.125]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 01 Mar 2008 22:42:17 +0000 Original-Received: from Reiner.Steib by p54a9777d.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 01 Mar 2008 22:42:17 +0000 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 16 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: p54a9777d.dip.t-dialin.net X-Face: P05mdcZT&lL[-s2=mw~RsllZ0zZAb?vdE}.s 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:91012 Archived-At: Hi, it seems that something went wrong when syncing Emacs_22 and the trunk in `tls.el': - EMACS_22_BASE should not use `rx'. (The log of revision 1.27 says "Revert merge that re-required rx."). - 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. Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/