Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Correctly define the alias of `open-ssl-stream' for Emacs21.

* twittering-mode.el: Correctly define the alias of
`open-ssl-stream' for Emacs21 even if `url-gw.el' has been already
loaded and unavailable autoload has been declared.
(twittering-start-http-session-urllib-https-p): ignore the
autoload declaration of `open-ssl-stream' in `url-gw.el' if
"ssl.el" is unavailable.
  • Loading branch information...
commit b284305cf690a52fa4ed305c1450416b1c84104e 1 parent 2c6ce8d
@cvmat cvmat authored
Showing with 15 additions and 1 deletion.
  1. +7 −0 ChangeLog
  2. +8 −1 twittering-mode.el
View
7 ChangeLog
@@ -75,6 +75,13 @@
(twittering-render-timeline): do not add the `source-spec'
property.
+ * twittering-mode.el: Correctly define the alias of
+ `open-ssl-stream' for Emacs21 even if `url-gw.el' has been already
+ loaded and unavailable autoload has been declared.
+ (twittering-start-http-session-urllib-https-p): ignore the
+ autoload declaration of `open-ssl-stream' in `url-gw.el' if
+ "ssl.el" is unavailable.
+
2010-11-14 Tadashi MATSUO <tad@mymail.twin.jp>
* twittering-mode.el: Fix a bug in registration of a sentinel for
View
9 twittering-mode.el
@@ -1687,7 +1687,14 @@ The method to perform the request is determined from
((require 'ssl nil t)
;; On Emacs21, `url' requires `ssl'.
t)
- ((or (fboundp 'open-ssl-stream)
+ ((or (and (fboundp 'open-ssl-stream)
+ ;; Since `url-gw' (required by `url') defines autoload of
+ ;; `open-ssl-stream' from "ssl",
+ ;; (fboundp 'open-ssl-stream) will be non-nil even if
+ ;; "ssl" cannot be loaded and `open-ssl-stream' is
+ ;; unavailable.
+ ;; Here, the availability is confirmed by `documentation'.
+ (documentation 'open-ssl-stream))
;; On Emacs21, `url' requires `ssl' in order to use
;; `open-ssl-stream', which is included in `ssl.el'.
;; Even if `ssl' cannot be loaded, `open-tls-stream' can be
Please sign in to comment.
Something went wrong with that request. Please try again.