diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-27 04:00:19 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-27 04:00:19 +0000 |
| commit | 7f22a76506a3f3db2eb4bce1cfc49105bd8d0824 (patch) | |
| tree | 02ffae400506ae46fcf03eacaa5210aac7fe57de /lisp/uniquify.el | |
| parent | d53a60a6f76043ba9fb395eece2aaccc67a0d1b2 (diff) | |
| parent | 619fb9ee822da1d92d8b7974b827dac6a918967f (diff) | |
| download | emacs-7f22a76506a3f3db2eb4bce1cfc49105bd8d0824.tar.gz | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-860
Diffstat (limited to 'lisp/uniquify.el')
| -rw-r--r-- | lisp/uniquify.el | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/uniquify.el b/lisp/uniquify.el index 1f5e6409a76..8226c65cbb9 100644 --- a/lisp/uniquify.el +++ b/lisp/uniquify.el @@ -235,6 +235,14 @@ this rationalization." (with-current-buffer (uniquify-item-buffer (car items)) (setq uniquify-managed nil)) (setq items nil))) + ;; In case we missed some calls to kill-buffer, there may be dead + ;; buffers in uniquify-managed, so filter them out. + (setq items + (delq nil (mapcar + (lambda (item) + (if (buffer-live-p (uniquify-item-buffer item)) + item)) + items))) (setq fix-list (append fix-list items)))) ;; selects buffers whose names may need changing, and others that ;; may conflict, then bring conflicting names together |