[Emacs-diffs] Changes to emacs/lisp/uniquify.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/08/27 04:00:20

Index: lisp/uniquify.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/uniquify.el,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- lisp/uniquify.el    26 Jul 2007 05:26:36 -0000      1.64
+++ lisp/uniquify.el    27 Aug 2007 04:00:12 -0000      1.65
@@ -235,6 +235,14 @@
              (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