From: Juanma Barranquero Date: Wed, 5 Mar 2008 12:00:46 +0000 (+0000) Subject: Don't check for `cadr' and `last'. X-Git-Tag: emacs-pretest-23.0.90~7443 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d739651295fa3dff9e768313a58bf98a508ebe13;p=emacs.git Don't check for `cadr' and `last'. (iswitchb-define-mode-map, iswitchb-default-keybindings): Add obsolescence declaration and remove redundant info from docstring. (iswitchb-set-common-completion, iswitchb-set-matches, iswitchb-get-matched-buffers, iswitchb-visit-buffer): Use `let'. (recentf-list, most-len, most-is-exact): Don't wrap defvars within `eval-when-compile'. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e50414ba7fe..bd2dbf465d5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2008-03-05 Juanma Barranquero + + * iswitchb.el: Don't check for `cadr' and `last'. + (iswitchb-define-mode-map, iswitchb-default-keybindings): + Add obsolescence declaration and remove redundant info from docstring. + (iswitchb-set-common-completion, iswitchb-set-matches) + (iswitchb-get-matched-buffers, iswitchb-visit-buffer): Use `let'. + (recentf-list, most-len, most-is-exact): + Don't wrap defvars within `eval-when-compile'. + 2008-03-05 Glenn Morris * ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs): Remove. @@ -40,7 +50,7 @@ * progmodes/compile.el (compilation-menu-map): (compilation-mode-map): - * progmodes/grep.el (grep-mode-map): Add :help. + * progmodes/grep.el (grep-mode-map): Add :help. * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Define and initialize in one step. Add :help. Use :enable to activate menu @@ -51,7 +61,7 @@ * ediff-init.el (ediff-color-display-p): Simplify. (Xor): Remove unused function. - (ediff-with-syntax-table): Simplify for emacs. + (ediff-with-syntax-table): Simplify for Emacs. * ediff-hook.el (menu-bar-ediff-menu): Don't depend on the menu-bar being loaded, it always is. @@ -63,8 +73,7 @@ 2008-03-04 Alan Mackenzie - * progmodes/cc-mode.el (c-neutralize-syntax-in-CPP): Fix coding - bug. + * progmodes/cc-mode.el (c-neutralize-syntax-in-CPP): Fix coding bug. * progmodes/cc-langs.el (c-before-font-lock-function): Fix bug in doc-string, "c-old-LEN" -> "c-old-END". diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index c259edcc954..e14d8ed53f9 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -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 @@ selected.") ;;; 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 @@ variable `iswitchb-mode'." (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 @@ the selection process begins. Used by isearchb.el." "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 @@ If no buffer exactly matching the prompt exists, maybe create a new one." (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 @@ current frame, rather than all frames, regardless of value of "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 @@ current frame, rather than all frames, regardless of value of "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 @@ Return the modified list with the last element prepended to it." ;;; 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 @@ If BUFFER is visible in the current frame, return nil." (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 @@ Obsolescent. Use `iswitchb-mode'." (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 @@ Copied from `icomplete-exhibit' with two changes: (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)