Mercurial > emacs
diff lisp/iswitchb.el @ 90737:95d0cdf160ea
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 26 Jan 2007 06:16:11 +0000 |
parents | e3bacb89536a ff242396ed7e |
children | f55f9811f5d7 |
line wrap: on
line diff
--- a/lisp/iswitchb.el Fri Jan 26 02:30:28 2007 +0000 +++ b/lisp/iswitchb.el Fri Jan 26 06:16:11 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 <stephen@gnu.org> ;; Maintainer: Stephen Eglen <stephen@gnu.org> @@ -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'.")