diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
| commit | 9a70f03d70e44db2ec9c6d2952cb8a1deae15000 (patch) | |
| tree | c0efd5c0a208640c0a883f4566df1b40caa3aaad /lisp/net | |
| parent | 29c8a348c5c9f326af54a3d30f69cde98fe300bb (diff) | |
| download | emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.gz emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.bz2 emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/network-stream.el | 2 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 3 | ||||
| -rw-r--r-- | lisp/net/trampver.el | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index bb09d8945c9..ceb094cded7 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -230,7 +230,7 @@ functionality. (or builtin-starttls (and (or require-tls (plist-get parameters :use-starttls-if-possible)) - (executable-find "gnutls-cli"))) + (starttls-available-p))) (not (eq (plist-get parameters :type) 'plain))) ;; If using external STARTTLS, drop this connection and start ;; anew with `starttls-open-stream'. diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 9e04abb8cd5..7d43c4f7547 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -2695,7 +2695,8 @@ the only argument." (setq rcirc-topic (caddr args))))) (defun rcirc-handler-333 (process sender args text) - "Not in rfc1459.txt" + "333 says who set the topic and when. +Not in rfc1459.txt" (let ((buffer (or (rcirc-get-buffer process (cadr args)) (rcirc-get-temp-buffer-create process (cadr args))))) (with-current-buffer buffer diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 7b4c6fd75b1..da51662b216 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -31,7 +31,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.2.2-pre" +(defconst tramp-version "2.2.2" "This version of Tramp.") ;;;###tramp-autoload @@ -44,7 +44,7 @@ (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" - (format "Tramp 2.2.2-pre is not fit for %s" + (format "Tramp 2.2.2 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) |