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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Stefan Monnier <monnier>        07/08/25 20:21:14

Index: uniquify.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/uniquify.el,v
retrieving revision 1.62.2.1
retrieving revision 1.62.2.2
diff -u -b -r1.62.2.1 -r1.62.2.2
--- uniquify.el 25 Jul 2007 04:46:56 -0000      1.62.2.1
+++ uniquify.el 25 Aug 2007 20:21:12 -0000      1.62.2.2
@@ -233,6 +233,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