Replaced fourth, plusp and assert to its cl-* equivalents
This commit is contained in:
parent
76ce26d313
commit
6978a71f64
|
@ -4991,9 +4991,9 @@ Return an XML node."
|
||||||
"Convert XML-DATA to simpler sexp format.
|
"Convert XML-DATA to simpler sexp format.
|
||||||
XML-DATA is an <iq> node with a <query xmlns='jabber:iq:roster'> child.
|
XML-DATA is an <iq> node with a <query xmlns='jabber:iq:roster'> child.
|
||||||
See `jabber-roster-to-sexp' for description of output format."
|
See `jabber-roster-to-sexp' for description of output format."
|
||||||
(assert (eq (jabber-xml-node-name xml-data) 'iq))
|
(cl-assert (eq (jabber-xml-node-name xml-data) 'iq))
|
||||||
(let ((query (car (jabber-xml-get-children xml-data 'query))))
|
(let ((query (car (jabber-xml-get-children xml-data 'query))))
|
||||||
(assert query)
|
(cl-assert query)
|
||||||
(mapcar
|
(mapcar
|
||||||
#'(lambda (n)
|
#'(lambda (n)
|
||||||
(list
|
(list
|
||||||
|
@ -6419,7 +6419,7 @@ JC is the Jabber connection."
|
||||||
(interactive)
|
(interactive)
|
||||||
;; If user accidentally hits RET without writing anything, just
|
;; If user accidentally hits RET without writing anything, just
|
||||||
;; ignore it.
|
;; ignore it.
|
||||||
(when (plusp (- (point-max) jabber-point-insert))
|
(when (cl-plusp (- (point-max) jabber-point-insert))
|
||||||
;; If connection was lost...
|
;; If connection was lost...
|
||||||
(unless (memq jabber-buffer-connection jabber-connections)
|
(unless (memq jabber-buffer-connection jabber-connections)
|
||||||
;; ...maybe there is a new connection to the same account.
|
;; ...maybe there is a new connection to the same account.
|
||||||
|
@ -9790,7 +9790,7 @@ JC is the Jabber connection."
|
||||||
(cl-destructuring-bind (muc-jid . nick) default-nickname
|
(cl-destructuring-bind (muc-jid . nick) default-nickname
|
||||||
(let ((entry (assoc muc-jid conferences)))
|
(let ((entry (assoc muc-jid conferences)))
|
||||||
(if entry
|
(if entry
|
||||||
(setf (fourth entry) nick)
|
(setf (cl-fourth entry) nick)
|
||||||
(setq entry (list muc-jid "" nil nick ""))
|
(setq entry (list muc-jid "" nil nick ""))
|
||||||
(push entry conferences)
|
(push entry conferences)
|
||||||
(push (cons 'conference entry) value)))))
|
(push (cons 'conference entry) value)))))
|
||||||
|
|
Loading…
Reference in New Issue