summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
386e4d3)
* gnus-group.el (gnus-group-prepare-flat):
Make gnus-union use `equal' to compare items in lists.
* gnus-util.el (gnus-union): Make it behave like cl-union partially.
+2015-12-23 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ Fix `gnus-union' so as to behave like `cl-union'.
+
+ * gnus-group.el (gnus-group-prepare-flat):
+ Make gnus-union use `equal' to compare items in lists.
+
+ * gnus-util.el (gnus-union): Make it behave like cl-union partially.
+
2015-12-17 Eli Zaretskii <eliz@gnu.org>
* auth-source.el (auth-source-ensure-strings):
2015-12-17 Eli Zaretskii <eliz@gnu.org>
* auth-source.el (auth-source-ensure-strings):
(gnus-group-prepare-flat-list-dead
(gnus-union
not-in-list
(gnus-group-prepare-flat-list-dead
(gnus-union
not-in-list
- (setq gnus-killed-list (sort gnus-killed-list 'string<)))
+ (setq gnus-killed-list (sort gnus-killed-list 'string<))
+ :test 'equal)
gnus-level-killed ?K regexp))
(gnus-group-set-mode-line)
gnus-level-killed ?K regexp))
(gnus-group-set-mode-line)
(if (fboundp 'union)
(defalias 'gnus-union 'union)
(if (fboundp 'union)
(defalias 'gnus-union 'union)
- (defun gnus-union (l1 l2)
- "Set union of lists L1 and L2."
+ (defun gnus-union (l1 l2 &rest keys)
+ "Set union of lists L1 and L2.
+If KEYS contains the `:test' and `equal' pair, use `equal' to compare
+items in lists, otherwise use `eq'."
(cond ((null l1) l2)
((null l2) l1)
((equal l1 l2) l1)
(t
(or (>= (length l1) (length l2))
(setq l1 (prog1 l2 (setq l2 l1))))
(cond ((null l1) l2)
((null l2) l1)
((equal l1 l2) l1)
(t
(or (>= (length l1) (length l2))
(setq l1 (prog1 l2 (setq l2 l1))))
- (while l2
- (or (member (car l2) l1)
- (push (car l2) l1))
- (pop l2))
+ (if (eq 'equal (plist-get keys :test))
+ (while l2
+ (or (member (car l2) l1)
+ (push (car l2) l1))
+ (pop l2))
+ (while l2
+ (or (memq (car l2) l1)
+ (push (car l2) l1))
+ (pop l2)))
l1))))
(declare-function gnus-add-text-properties "gnus"
l1))))
(declare-function gnus-add-text-properties "gnus"