Rename INSTALL.BZR to UNSTALL.REPOm and carry that through in other files.

[bpt/emacs.git] / lisp / iswitchb.el

diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index 13ab41c..5690d9c 100644 (file)
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -1,6 +1,6 @@
 ;;; iswitchb.el --- switch between buffers using substrings
 
-;; Copyright (C) 1996-1997, 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2000-2014 Free Software Foundation, Inc.
 
 ;; Author: Stephen Eglen <stephen@gnu.org>
 ;; Maintainer: Stephen Eglen <stephen@gnu.org>
@@ -471,6 +471,8 @@ interfere with other minibuffer usage.")
     (define-key map "?" 'iswitchb-completion-help)
     (define-key map "\C-s" 'iswitchb-next-match)
     (define-key map "\C-r" 'iswitchb-prev-match)
+    (define-key map [?\C-.] 'iswitchb-next-match)
+    (define-key map [?\C-,] 'iswitchb-prev-match)
     (define-key map "\t" 'iswitchb-complete)
     (define-key map "\C-j" 'iswitchb-select-buffer-text)
     (define-key map "\C-t" 'iswitchb-toggle-regexp)
@@ -595,7 +597,7 @@ the selection process begins.  Used by isearchb.el."
   ;; The map is generated every time so that it can inherit new
   ;; functions.
   (let ((map (copy-keymap minibuffer-local-map))
-       buf-sel iswitchb-final-text map
+       buf-sel iswitchb-final-text
        icomplete-mode)  ; prevent icomplete starting up
     (define-key map "?" 'iswitchb-completion-help)
     (define-key map "\C-s" 'iswitchb-next-match)
@@ -1425,6 +1427,9 @@ between buffers using substrings.  See `iswitchb' for details."
       (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)
     (remove-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)))
 
+(make-obsolete 'iswitchb-mode
+               "use icomplete-mode or ido-mode instead" "24.4")
+
 (provide 'iswitchb)
 
 ;;; iswitchb.el ends here