[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/iswitchb.el,v
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/iswitchb.el,v |
Date: |
Wed, 05 Mar 2008 11:56:57 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 08/03/05 11:56:57
Index: iswitchb.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/iswitchb.el,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- iswitchb.el 4 Jan 2008 06:18:30 -0000 1.72
+++ iswitchb.el 5 Mar 2008 11:56:56 -0000 1.73
@@ -244,11 +244,6 @@
;;; Code:
-;; CL needed for cadr and last
-(if (not (and (fboundp 'cadr)
- (fboundp 'last)))
- (require 'cl))
-
(require 'font-lock)
;;; User Variables
@@ -526,9 +521,7 @@
;;; ISWITCHB KEYMAP
(defun iswitchb-define-mode-map ()
- "Set up the keymap for `iswitchb-buffer'.
-This is obsolete. Use \\[iswitchb-mode] or customize the
-variable `iswitchb-mode'."
+ "Set up the keymap for `iswitchb-buffer'."
(interactive)
(let (map)
;; generated every time so that it can inherit new functions.
@@ -549,6 +542,10 @@
(setq iswitchb-mode-map map)
(run-hooks 'iswitchb-define-mode-map-hook)))
+(make-obsolete 'iswitchb-define-mode-map
+ "use M-x iswitchb-mode or customize the variable
`iswitchb-mode'."
+ "21.1")
+
;;; MAIN FUNCTION
(defun iswitchb ()
"Switch to buffer matching a substring.
@@ -688,7 +685,7 @@
"Find common completion of `iswitchb-text' in `iswitchb-matches'.
The result is stored in `iswitchb-common-match-string'."
- (let* (val)
+ (let (val)
(setq iswitchb-common-match-string nil)
(if (and iswitchb-matches
(not iswitchb-regexp) ;; testing
@@ -778,8 +775,7 @@
(setq iswitchb-exit 'findfile)
(exit-minibuffer))
-(eval-when-compile
- (defvar recentf-list))
+(defvar recentf-list)
(defun iswitchb-next-match ()
"Put first element of `iswitchb-matches' at the end of the list."
@@ -888,7 +884,7 @@
"Set `iswitchb-matches' to the list of buffers matching prompt."
(if iswitchb-rescan
(setq iswitchb-matches
- (let* ((buflist iswitchb-buflist))
+ (let ((buflist iswitchb-buflist))
(iswitchb-get-matched-buffers iswitchb-text iswitchb-regexp
buflist))
iswitchb-virtual-buffers nil)))
@@ -898,7 +894,7 @@
"Return buffers matching REGEXP.
If STRING-FORMAT is nil, consider REGEXP as just a string.
BUFFER-LIST can be list of buffers or list of strings."
- (let* ((case-fold-search (iswitchb-case))
+ (let ((case-fold-search (iswitchb-case))
name ret)
(if (null string-format) (setq regexp (regexp-quote regexp)))
(setq iswitchb-invalid-regexp nil)
@@ -1051,7 +1047,7 @@
;;; VISIT CHOSEN BUFFER
(defun iswitchb-visit-buffer (buffer)
"Visit buffer named BUFFER according to `iswitchb-method'."
- (let* (win newframe)
+ (let (win newframe)
(cond
((eq iswitchb-method 'samewindow)
(switch-to-buffer buffer))
@@ -1123,9 +1119,7 @@
(defun iswitchb-default-keybindings ()
"Set up default keybindings for `iswitchb-buffer'.
Call this function to override the normal bindings. This function also
-adds a hook to the minibuffer.
-
-Obsolescent. Use `iswitchb-mode'."
+adds a hook to the minibuffer."
(interactive)
(add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)
(global-set-key "\C-xb" 'iswitchb-buffer)
@@ -1133,6 +1127,8 @@
(global-set-key "\C-x4\C-o" 'iswitchb-display-buffer)
(global-set-key "\C-x5b" 'iswitchb-buffer-other-frame))
+(make-obsolete 'iswitchb-default-keybindings 'iswitchb-mode "21.1")
+
(defun iswitchb-buffer ()
"Switch to another buffer.
@@ -1235,9 +1231,8 @@
(insert (iswitchb-completions
contents))))))
-(eval-when-compile
- (defvar most-len)
- (defvar most-is-exact))
+(defvar most-len)
+(defvar most-is-exact)
(defun iswitchb-output-completion (com)
(if (= (length com) most-len)
- [Emacs-diffs] Changes to emacs/lisp/iswitchb.el,v,
Juanma Barranquero <=