unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Reiner Steib <reinersteib+gmane@imap.cc>
To: emacs-devel@gnu.org
Subject: Merge issues in `tls.el' (EMACS_22_BASE vs. trunk)
Date: Sat, 01 Mar 2008 23:40:51 +0100	[thread overview]
Message-ID: <v94pbqrrt8.fsf@marauder.physik.uni-ulm.de> (raw)

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/





             reply	other threads:[~2008-03-01 22:40 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-01 22:40 Reiner Steib [this message]
2008-03-01 23:38 ` Merge issues in `tls.el' (EMACS_22_BASE vs. trunk) Glenn Morris
2008-03-02 15:56   ` Reiner Steib
2008-03-03  2:07     ` Glenn Morris
2008-03-10  5:16       ` Katsumi Yamaoka
2008-03-10  7:32         ` Reiner Steib
2008-03-10 23:28           ` Katsumi Yamaoka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=v94pbqrrt8.fsf@marauder.physik.uni-ulm.de \
    --to=reinersteib+gmane@imap.cc \
    --cc=Reiner.Steib@gmx.de \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).