# HG changeset patch # User Stefan Monnier # Date 1167795435 0 # Node ID ff242396ed7e3b2a36940825ff69624e1410a51a # Parent 9cb86600aa59b737c52cdebd0e38e7f0a6e83b01 (iswitchb-global-map): Use command-remapping if available. diff -r 9cb86600aa59 -r ff242396ed7e lisp/ChangeLog --- a/lisp/ChangeLog Tue Jan 02 23:57:14 2007 +0000 +++ b/lisp/ChangeLog Wed Jan 03 03:37:15 2007 +0000 @@ -1,3 +1,7 @@ +2007-01-03 Stefan Monnier + + * iswitchb.el (iswitchb-global-map): Use command-remapping if available. + 2007-01-02 Juanma Barranquero * emulation/viper.el (viper-custom-file-name, viper-mode): @@ -19,7 +23,7 @@ * progmodes/cfengine.el (cfengine-font-lock-syntactic-keywords): Fix format of value. - * cus-edit.el (customize-unsaved): Renamed from customize-customized. + * cus-edit.el (customize-unsaved): Rename from customize-customized. Change messages accordingly. (customize-customized): Now alias. @@ -29,8 +33,8 @@ 2007-01-01 Alan Mackenzie - * progmodes/cc-engine.el (c-guess-basic-syntax, case 5N): Check - the format of c-state-cache is valid for an optimisation before + * progmodes/cc-engine.el (c-guess-basic-syntax, case 5N): + Check the format of c-state-cache is valid for an optimisation before using it. * progmodes/cc-engine.el (c-guess-basic-syntax): New case 5Q "we @@ -68,8 +72,8 @@ * progmodes/cc-mode.el: Bind C-M-a and C-M-e to c-\(beginning\|end\)-of-defun by default. - * progmodes/cc-align.el (c-lineup-gnu-DEFUN-intro-cont): New - line-up function, for the DEFUN macro in the Emacs C sources. + * progmodes/cc-align.el (c-lineup-gnu-DEFUN-intro-cont): + New line-up function, for the DEFUN macro in the Emacs C sources. Only used in "gnu" style. * progmodes/cc-styles.el (c-style-alist): Use this new function in @@ -95,8 +99,8 @@ (c-beginning-of-decl-1): Whilst searching for "=" as evidence of a stmt boundary, check for "operator=", etc. - * progmodes/cc-mode.el (c-postprocess-file-styles): Bind - inhibit-read-only to t, around the call to + * progmodes/cc-mode.el (c-postprocess-file-styles): + Bind inhibit-read-only to t, around the call to c-remove-any-local-eval-or-mode-variables, so that it works on a RO file. @@ -275,9 +279,9 @@ 2006-12-25 Michael R. Mauger - * progmodes/sql.el (sql-mode-abbrev-table): Corrected initialization. + * progmodes/sql.el (sql-mode-abbrev-table): Correct initialization. (sql-mode-syntax-table): Disable double quoted strings. - (sql-mode-font-lock-object-name): Added TYPE and TYPE BODY. + (sql-mode-font-lock-object-name): Add TYPE and TYPE BODY. 2006-12-25 YAMAMOTO Mitsuharu diff -r 9cb86600aa59 -r ff242396ed7e lisp/iswitchb.el --- a/lisp/iswitchb.el Tue Jan 02 23:57:14 2007 +0000 +++ b/lisp/iswitchb.el Wed Jan 03 03:37:15 2007 +0000 @@ -1,7 +1,7 @@ ;;; iswitchb.el --- switch between buffers using substrings ;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; 2005, 2006, 2007 Free Software Foundation, Inc. ;; Author: Stephen Eglen ;; Maintainer: Stephen Eglen @@ -495,14 +495,13 @@ (defvar iswitchb-global-map (let ((map (make-sparse-keymap))) - (substitute-key-definition 'switch-to-buffer ; normally C-x b - 'iswitchb-buffer map global-map) - (substitute-key-definition 'switch-to-buffer-other-window ; C-x 4 b - 'iswitchb-buffer-other-window map global-map) - (substitute-key-definition 'switch-to-buffer-other-frame ; C-x 5 b - 'iswitchb-buffer-other-frame map global-map) - (substitute-key-definition 'display-buffer ; C-x 4 C-o - 'iswitchb-display-buffer map global-map) + (dolist (b '((switch-to-buffer . iswitchb-buffer) + (switch-to-buffer-other-window . iswitchb-buffer-other-window) + (switch-to-buffer-other-frame . iswitchb-buffer-other-frame) + (display-buffer . iswitchb-display-buffer))) + (if (fboundp 'command-remapping) + (define-key map (vector 'remap (car b)) (cdr b)) + (substitute-key-definition (car b) (cdr b) map global-map))) map) "Global keymap for `iswitchb-mode'.")