From 1c4001a1dfc499418dac4b5f3de071afd7b210c0 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 10 May 2003 22:46:10 +0000 Subject: [PATCH] (uniquify-rationalize-file-buffer-names): Thinko. --- lisp/uniquify.el | 4 ++-- src/ChangeLog | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lisp/uniquify.el b/lisp/uniquify.el index 7a992d6becb..382b7efd580 100644 --- 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 35e4b01694b..d9b6166e52f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,17 @@ +2003-05-10 Stefan Monnier + + * 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 * xmenu.c (single_menu_item): Change last parameter to void* to -- 2.11.4.GIT