(uniquify-rationalize-file-buffer-names): Thinko.

diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 7a992d6becbd6d58fd5cb4251f9b17fc66e2b066..382b7efd5807332c36cee668422c3c2792588c77 100644 (file)
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -215,9 +215,9 @@ this rationaliztion."
                   (uniquify-item-buffer (car items))))
            ;; This shouldn't happen, but maybe there' no dirname any more.
            (unless (uniquify-item-dirname (car items))
-             (setq items nil)
              (with-current-buffer (uniquify-item-buffer (car items))
-               (setq uniquify-managed nil))))
+               (setq uniquify-managed nil))
+             (setq items nil)))
          (setq fix-list (append fix-list items))))
       ;; selects buffers whose names may need changing, and others that
       ;; may conflict, then bring conflicting names together

diff --git a/src/ChangeLog b/src/ChangeLog
index 35e4b01694bce912b05650e0049f445eede5c9cb..d9b6166e52f3b09b778e0c451bcba99c050368dc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2003-05-10  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * keyboard.c (follow_key): Remove dead variable `did_meta'.
+       (access_keymap_keyremap, keyremap_step): New funs, extracted from the
+       duplicated handling of function-key-map and key-translation-map
+       in read_key_sequence.
+       (read_key_sequence): Use them.
+
+       * keyboard.c (adjust_point_for_property): Try harder to move point
+       to the non-sticky end of an invisible property.
+
+       * xdisp.c (single_display_prop_intangible_p): Make `space' display
+       property intangible as well.
+
 2003-05-10  Andreas Schwab  <schwab@suse.de>
 
        * xmenu.c (single_menu_item): Change last parameter to void* to