Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Replace'flet' with a combination of 'let' and 'lambda'.

'flet' has been obsoleted on Emacs 24.3.

* twittering-mode.el: Remove 'flet'.
(twittering-normalize-raw-status): replace 'flet' with a
combination of 'let' and 'lambda'.
  • Loading branch information...
commit b32b72534976a69a0dbb960f2dad14b88c0ec61a 1 parent 2d903af
@cvmat cvmat authored
Showing with 19 additions and 10 deletions.
  1. +6 −0 ChangeLog
  2. +13 −10 twittering-mode.el
View
6 ChangeLog
@@ -1,3 +1,9 @@
+2014-03-31 Tadashi MATSUO <tad@mymail.twin.jp>
+
+ * twittering-mode.el: Remove 'flet'.
+ (twittering-normalize-raw-status): replace 'flet' with a
+ combination of 'let' and 'lambda'.
+
2013-12-12 Tadashi MATSUO <tad@mymail.twin.jp>
* twittering-mode.el: Embed root CA certificates to follow the
View
23 twittering-mode.el
@@ -7120,14 +7120,14 @@ GAP-LIST must be generated by `twittering-make-gap-list'."
. ,value)))
retweeting-status))))
(t
- (flet ((assq-get (item seq)
- (car (cddr (assq item seq)))))
+ (let ((assq-get (lambda (item seq)
+ (car (cddr (assq item seq))))))
`(,@(mapcar
(lambda (entry)
(let* ((sym (elt entry 0))
(sym-in-data (elt entry 1))
(encoded (elt entry 2))
- (data (assq-get sym-in-data status-data)))
+ (data (funcall assq-get sym-in-data status-data)))
`(,sym . ,(if encoded
(twittering-decode-entities-after-parsing-xml
data)
@@ -7141,14 +7141,16 @@ GAP-LIST must be generated by `twittering-make-gap-list'."
(text text t)
))
;; created_at
- (created-at . ,(date-to-time (assq-get 'created_at status-data)))
+ (created-at
+ . ,(date-to-time (funcall assq-get 'created_at status-data)))
;; Replace "true" and "false" into t and nil.
,@(mapcar (lambda (sym)
- `(,sym . ,(string= "true" (assq-get sym status-data))))
+ `(,sym . ,(string= "true"
+ (funcall assq-get sym status-data))))
'(favorited truncated))
;; Entities.
,(let* ((entity-data (cddr (assq 'entities status-data)))
- (encoded-text (assq-get 'text status-data))
+ (encoded-text (funcall assq-get 'text status-data))
(text
(twittering-decode-entities-after-parsing-xml encoded-text))
(gap-list (twittering-make-gap-list text)))
@@ -7230,7 +7232,7 @@ GAP-LIST must be generated by `twittering-make-gap-list'."
(assq 'urls entity-data))))))
;; Source.
,@(let ((source (twittering-decode-html-entities
- (assq-get 'source status-data))))
+ (funcall assq-get 'source status-data))))
(if (and source
(string-match "<a href=\"\\(.*?\\)\".*?>\\(.*\\)</a>"
source))
@@ -7247,7 +7249,7 @@ GAP-LIST must be generated by `twittering-make-gap-list'."
(let* ((sym (elt entry 0))
(sym-in-user-data (elt entry 1))
(encoded (elt entry 2))
- (value (assq-get sym-in-user-data user-data)))
+ (value (funcall assq-get sym-in-user-data user-data)))
`(,sym . ,(if encoded
(twittering-decode-html-entities value)
value))))
@@ -7263,8 +7265,9 @@ GAP-LIST must be generated by `twittering-make-gap-list'."
,@(let ((user-data (cddr (assq 'user status-data))))
(mapcar (lambda (entry)
`(,(car entry)
- . ,(string= "true"
- (assq-get (cdr entry) user-data))))
+ . ,(string=
+ "true"
+ (funcall assq-get (cdr entry) user-data))))
'((user-protected . protected))))))))))
(defun twittering-xmltree-to-status (xmltree)
Please sign in to comment.
Something went wrong with that request. Please try again.