diff options
| author | Lars Ingebrigtsen | 2016-02-13 17:31:10 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-13 17:31:10 +1100 |
| commit | 6d4761330d7e2cf94ce8df07744c7b297bebb79e (patch) | |
| tree | 89a453e153e78ff6e99fe14750a4a8986095f94b | |
| parent | bfee9fab2f51a94db68247c6ee6eedebb7669209 (diff) | |
| download | emacs-6d4761330d7e2cf94ce8df07744c7b297bebb79e.tar.gz emacs-6d4761330d7e2cf94ce8df07744c7b297bebb79e.zip | |
Remove the gnus-delete-alist alias
* lisp/gnus/gnus-util.el (gnus-run-mode-hooks): Remove compat code.
(gnus-delete-alist): Remove.
| -rw-r--r-- | lisp/gnus/gnus-group.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/gnus-score.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 17 |
3 files changed, 4 insertions, 17 deletions
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 1602c475361..7e48fbf5560 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el | |||
| @@ -4488,7 +4488,7 @@ and the second element is the address." | |||
| 4488 | (if force | 4488 | (if force |
| 4489 | (if (null articles) | 4489 | (if (null articles) |
| 4490 | (setcar (nthcdr 3 info) | 4490 | (setcar (nthcdr 3 info) |
| 4491 | (gnus-delete-alist type (car marked))) | 4491 | (assq-delete-all type (car marked))) |
| 4492 | (setcdr m (gnus-compress-sequence articles t))) | 4492 | (setcdr m (gnus-compress-sequence articles t))) |
| 4493 | (setcdr m (gnus-compress-sequence | 4493 | (setcdr m (gnus-compress-sequence |
| 4494 | (sort (nconc (gnus-uncompress-range (cdr m)) | 4494 | (sort (nconc (gnus-uncompress-range (cdr m)) |
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el index 22ff7b9eba3..14059ac566b 100644 --- a/lisp/gnus/gnus-score.el +++ b/lisp/gnus/gnus-score.el | |||
| @@ -1431,7 +1431,7 @@ If FORMAT, also format the current score file." | |||
| 1431 | (and (file-exists-p file) | 1431 | (and (file-exists-p file) |
| 1432 | (not (file-writable-p file)))) | 1432 | (not (file-writable-p file)))) |
| 1433 | () | 1433 | () |
| 1434 | (setq score (setcdr entry (gnus-delete-alist 'touched score))) | 1434 | (setq score (setcdr entry (assq-delete-all 'touched score))) |
| 1435 | (erase-buffer) | 1435 | (erase-buffer) |
| 1436 | (let (emacs-lisp-mode-hook) | 1436 | (let (emacs-lisp-mode-hook) |
| 1437 | (if (and (not gnus-adaptive-pretty-print) | 1437 | (if (and (not gnus-adaptive-pretty-print) |
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 23a16763202..ff980416a28 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el | |||
| @@ -1115,11 +1115,8 @@ ARG is passed to the first function." | |||
| 1115 | (apply 'run-hook-with-args hook args))) | 1115 | (apply 'run-hook-with-args hook args))) |
| 1116 | 1116 | ||
| 1117 | (defun gnus-run-mode-hooks (&rest funcs) | 1117 | (defun gnus-run-mode-hooks (&rest funcs) |
| 1118 | "Run `run-mode-hooks' if it is available, otherwise `run-hooks'. | 1118 | "Run `run-mode-hooks', saving the current buffer." |
| 1119 | This function saves the current buffer." | 1119 | (save-current-buffer (apply 'run-mode-hooks funcs))) |
| 1120 | (if (fboundp 'run-mode-hooks) | ||
| 1121 | (save-current-buffer (apply 'run-mode-hooks funcs)) | ||
| 1122 | (save-current-buffer (apply 'run-hooks funcs)))) | ||
| 1123 | 1120 | ||
| 1124 | ;;; Various | 1121 | ;;; Various |
| 1125 | 1122 | ||
| @@ -1167,16 +1164,6 @@ If HASH-TABLE-P is non-nil, regards SEQUENCE as a hash table." | |||
| 1167 | (setq sequence (cdr sequence)))) | 1164 | (setq sequence (cdr sequence)))) |
| 1168 | (nreverse out))) | 1165 | (nreverse out))) |
| 1169 | 1166 | ||
| 1170 | (if (fboundp 'assq-delete-all) | ||
| 1171 | (defalias 'gnus-delete-alist 'assq-delete-all) | ||
| 1172 | (defun gnus-delete-alist (key alist) | ||
| 1173 | "Delete from ALIST all elements whose car is KEY. | ||
| 1174 | Return the modified alist." | ||
| 1175 | (let (entry) | ||
| 1176 | (while (setq entry (assq key alist)) | ||
| 1177 | (setq alist (delq entry alist))) | ||
| 1178 | alist))) | ||
| 1179 | |||
| 1180 | (defun gnus-grep-in-list (word list) | 1167 | (defun gnus-grep-in-list (word list) |
| 1181 | "Find if a WORD matches any regular expression in the given LIST." | 1168 | "Find if a WORD matches any regular expression in the given LIST." |
| 1182 | (when (and word list) | 1169 | (when (and word list) |