diff options
| author | Lars Ingebrigtsen | 2016-02-13 17:33:25 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-13 17:33:25 +1100 |
| commit | f466bf32d943a41abb964d839ddf8a27c380920e (patch) | |
| tree | 36ee0b7d59cbaa4f08c54787c82cfd6a0124978b | |
| parent | 6d4761330d7e2cf94ce8df07744c7b297bebb79e (diff) | |
| download | emacs-f466bf32d943a41abb964d839ddf8a27c380920e.tar.gz emacs-f466bf32d943a41abb964d839ddf8a27c380920e.zip | |
Remove the gnus-union alias
* lisp/gnus/gnus-util.el (gnus-union): Remove.
| -rw-r--r-- | lisp/gnus/gnus-group.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 23 | ||||
| -rw-r--r-- | lisp/gnus/mml-sec.el | 2 |
3 files changed, 2 insertions, 25 deletions
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 7e48fbf5560..a7c3ebb80e3 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el | |||
| @@ -1369,7 +1369,7 @@ if it is a string, only list groups matching REGEXP." | |||
| 1369 | (when (or gnus-group-listed-groups | 1369 | (when (or gnus-group-listed-groups |
| 1370 | (and (>= level gnus-level-killed) (<= lowest gnus-level-killed))) | 1370 | (and (>= level gnus-level-killed) (<= lowest gnus-level-killed))) |
| 1371 | (gnus-group-prepare-flat-list-dead | 1371 | (gnus-group-prepare-flat-list-dead |
| 1372 | (gnus-union | 1372 | (cl-union |
| 1373 | not-in-list | 1373 | not-in-list |
| 1374 | (setq gnus-killed-list (sort gnus-killed-list 'string<)) | 1374 | (setq gnus-killed-list (sort gnus-killed-list 'string<)) |
| 1375 | :test 'equal) | 1375 | :test 'equal) |
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index ff980416a28..eadf04dfe71 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el | |||
| @@ -1265,29 +1265,6 @@ If HASH-TABLE-P is non-nil, regards SEQUENCE as a hash table." | |||
| 1265 | (put 'gnus-with-output-to-file 'lisp-indent-function 1) | 1265 | (put 'gnus-with-output-to-file 'lisp-indent-function 1) |
| 1266 | (put 'gnus-with-output-to-file 'edebug-form-spec '(form body)) | 1266 | (put 'gnus-with-output-to-file 'edebug-form-spec '(form body)) |
| 1267 | 1267 | ||
| 1268 | (if (fboundp 'union) | ||
| 1269 | (defalias 'gnus-union 'union) | ||
| 1270 | (defun gnus-union (l1 l2 &rest keys) | ||
| 1271 | "Set union of lists L1 and L2. | ||
| 1272 | If KEYS contains the `:test' and `equal' pair, use `equal' to compare | ||
| 1273 | items in lists, otherwise use `eq'." | ||
| 1274 | (cond ((null l1) l2) | ||
| 1275 | ((null l2) l1) | ||
| 1276 | ((equal l1 l2) l1) | ||
| 1277 | (t | ||
| 1278 | (or (>= (length l1) (length l2)) | ||
| 1279 | (setq l1 (prog1 l2 (setq l2 l1)))) | ||
| 1280 | (if (eq 'equal (plist-get keys :test)) | ||
| 1281 | (while l2 | ||
| 1282 | (or (member (car l2) l1) | ||
| 1283 | (push (car l2) l1)) | ||
| 1284 | (pop l2)) | ||
| 1285 | (while l2 | ||
| 1286 | (or (memq (car l2) l1) | ||
| 1287 | (push (car l2) l1)) | ||
| 1288 | (pop l2))) | ||
| 1289 | l1)))) | ||
| 1290 | |||
| 1291 | (declare-function gnus-add-text-properties "gnus" | 1268 | (declare-function gnus-add-text-properties "gnus" |
| 1292 | (start end properties &optional object)) | 1269 | (start end properties &optional object)) |
| 1293 | 1270 | ||
diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el index b4417507b8a..4744187994a 100644 --- a/lisp/gnus/mml-sec.el +++ b/lisp/gnus/mml-sec.el | |||
| @@ -557,7 +557,7 @@ Return keys." | |||
| 557 | (let* ((usage-prefs (mml-secure-cust-usage-lookup context usage)) | 557 | (let* ((usage-prefs (mml-secure-cust-usage-lookup context usage)) |
| 558 | (curr-fprs (cdr (assoc name (cdr usage-prefs)))) | 558 | (curr-fprs (cdr (assoc name (cdr usage-prefs)))) |
| 559 | (key-fprs (mapcar 'mml-secure-fingerprint keys)) | 559 | (key-fprs (mapcar 'mml-secure-fingerprint keys)) |
| 560 | (new-fprs (gnus-union curr-fprs key-fprs :test 'equal))) | 560 | (new-fprs (cl-union curr-fprs key-fprs :test 'equal))) |
| 561 | (if curr-fprs | 561 | (if curr-fprs |
| 562 | (setcdr (assoc name (cdr usage-prefs)) new-fprs) | 562 | (setcdr (assoc name (cdr usage-prefs)) new-fprs) |
| 563 | (setcdr usage-prefs (cons (cons name new-fprs) (cdr usage-prefs)))) | 563 | (setcdr usage-prefs (cons (cons name new-fprs) (cdr usage-prefs)))) |