X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/25c80f5c14d7e3f9237b93eb7751a3bf4b2c4402..ca2ebe63eba27e234394e9c5c20229dcdce87b33:/lisp/iswitchb.el diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index a20d1806c5..a6bac08dd7 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -4,7 +4,8 @@ ;; Author: Stephen Eglen ;; Maintainer: Stephen Eglen -;; Keywords: extensions +;; Keywords: extensions convenience +;; location: http://www.cns.ed.ac.uk/people/stephen/emacs/ ;; This file is part of GNU Emacs. @@ -120,7 +121,7 @@ ;; (define-key iswitchb-mode-map " " 'iswitchb-next-match) ;; ) ;; -;; Seeing all the matching buffers. +;; Seeing all the matching buffers ;; ;; If you have many matching buffers, they may not all fit onto one ;; line of the minibuffer. In this case, you should use rsz-mini @@ -128,8 +129,7 @@ ;; only shows a certain number of lines -- see the documentation for ;; `iswitchb-minibuffer-setup-hook'. - -;; Changing the list of buffers. +;; Changing the list of buffers ;; By default, the list of current buffers is most recent first, ;; oldest last, with the exception that the buffers visible in the @@ -153,8 +153,7 @@ ;; this is too harsh, let me know. Colouring of the matching buffer ;; name was suggested by Carsten Dominik (dominik@strw.leidenuniv.nl) - -;; Replacement for read-buffer. +;; Replacement for read-buffer ;; iswitchb-read-buffer has been written to be a drop in replacement ;; for the normal buffer selection routine `read-buffer'. To use @@ -165,6 +164,19 @@ ;; (defalias 'read-buffer 'iswitchb-read-buffer) ;; since `read-buffer' is defined in lisp. +;; Regexp matching + +;; There is limited provision for regexp matching within iswitchb, +;; enabled through `iswitchb-regexp'. This allows you to type `c$' +;; for example and see all buffer names ending in `c'. This facility +;; is quite limited though in two respects. First, you can't +;; currently type in expressions like `[0-9]' directly -- you have to +;; type them in when iswitchb-regexp is nil and then toggle on the +;; regexp functionality. Likewise, don't enter an expression +;; containing `\' in regexp mode. If you try, iswitchb gets confused, +;; so just hit C-g and try again. Secondly, no completion mechanism +;; is currently offered when regexp searching. + ;;; TODO ;;; Acknowledgements @@ -175,9 +187,10 @@ ;;; Code: - ;; CL needed for cadr and last -(require 'cl) +(if (not (and (fboundp 'cadr) + (fboundp 'last))) + (require 'cl)) ;; Set up the custom library. ;; taken from http://www.dina.kvl.dk/~abraham/custom/ @@ -200,12 +213,11 @@ (defgroup iswitchb nil "Switch between buffers using substrings." :group 'extensions + :group 'convenience ;; These links are to be added in later versions of custom and ;; so are currently commented out. :link '(emacs-commentary-link :tag "Commentary" "iswitchb.el") - :link '(emacs-library-link :tag "Lisp File" "iswitchb.el") -) - + :link '(emacs-library-link :tag "Lisp File" "iswitchb.el")) (defcustom iswitchb-case case-fold-search "*Non-nil if searching of buffer names should ignore case." @@ -221,15 +233,14 @@ example functions that filter buffernames." :type '(repeat regexp) :group 'iswitchb) - ;;; Examples for setting the value of iswitchb-buffer-ignore -;(defun -c-mode (name) +;(defun iswitchb-ignore-c-mode (name) ; "Ignore all c mode buffers -- example function for iswitchb." ; (save-excursion ; (set-buffer name) ; (string-match "^C$" mode-name))) -;(setq iswitchb-buffer-ignore '("^ " ignore-c-mode)) +;(setq iswitchb-buffer-ignore '("^ " iswitchb-ignore-c-mode)) ;(setq iswitchb-buffer-ignore '("^ " "\\.c$" "\\.h$")) (defcustom iswitchb-default-method 'always-frame @@ -252,66 +263,45 @@ Possible values: (const always-frame)) :group 'iswitchb) - (defcustom iswitchb-regexp nil "*Non-nil means that `iswitchb' will do regexp matching. -Value can be toggled within `iswitchb'." +Value can be toggled within `iswitchb' using `iswitchb-toggle-regexp'." :type 'boolean :group 'iswitchb) - (defcustom iswitchb-newbuffer t "*Non-nil means create new buffer if no buffer matches substring. See also `iswitchb-prompt-newbuffer'." :type 'boolean :group 'iswitchb) - (defcustom iswitchb-prompt-newbuffer t "*Non-nil means prompt user to confirm before creating new buffer. See also `iswitchb-newbuffer'." :type 'boolean :group 'iswitchb) - (defcustom iswitchb-define-mode-map-hook nil "*Hook to define keys in `iswitchb-mode-map' for extra keybindings." :type 'hook :group 'iswitchb) - - (defcustom iswitchb-use-fonts t - "*Non-nil means use fonts for showing first match." + "*Non-nil means use font-lock fonts for showing first match." :type 'boolean :group 'iswitchb) - (defcustom iswitchb-make-buflist-hook nil "*Hook to run when list of matching buffers is created." :type 'hook :group 'iswitchb) - - -(defvar iswitchb-method nil - "*Stores the method for viewing the selected buffer. -Its value is one of `samewindow', `otherwindow', `display', `otherframe', -`maybe-frame' or `always-frame'. See `iswitchb-default-method' for -details of values.") - (defvar iswitchb-all-frames 'visible "*Argument to pass to `walk-windows' when finding visible buffers. See documentation of `walk-windows' for useful values.") - - -;; Do we need the variable iswitchb-use-mycompletion? - - -;;; Internal Variables -(defvar iswitchb-minibuffer-setup-hook nil - "Iswitchb-specific customization of minibuffer setup. +(defcustom iswitchb-minibuffer-setup-hook nil + "*Iswitchb-specific customization of minibuffer setup. This hook is run during minibuffer setup iff `iswitchb' will be active. It is intended for use in customizing iswitchb for interoperation @@ -324,14 +314,25 @@ with other packages. For instance: \(setq resize-minibuffer-window-max-height 3)))) will constrain rsz-mini to a maximum minibuffer height of 3 lines when -iswitchb is running. Copied from `icomplete-minibuffer-setup-hook'.") +iswitchb is running. Copied from `icomplete-minibuffer-setup-hook'." + :type 'hook + :group 'iswitchb) + +;; Do we need the variable iswitchb-use-mycompletion? + +;;; Internal Variables + +(defvar iswitchb-method nil + "Stores the method for viewing the selected buffer. +Its value is one of `samewindow', `otherwindow', `display', `otherframe', +`maybe-frame' or `always-frame'. See `iswitchb-default-method' for +details of values.") (defvar iswitchb-eoinput 1 "Point where minibuffer input ends and completion info begins. Copied from `icomplete-eoinput'.") (make-variable-buffer-local 'iswitchb-eoinput) - (defvar iswitchb-buflist nil "Stores the current list of buffers that will be searched through. The list is ordered, so that the most recent buffers come first, @@ -348,11 +349,9 @@ interfere with other minibuffer usage.") (defvar iswitchb-change-word-sub nil "Private variable used by `iswitchb-word-matching-substring'.") - (defvar iswitchb-common-match-string nil "Stores the string that is common to all matching buffers.") - (defvar iswitchb-rescan nil "Non-nil means we need to regenerate the list of matching buffers.") @@ -379,9 +378,20 @@ selected.") (defvar iswitchb-xemacs (string-match "XEmacs" (emacs-version)) "Non-nil if we are running XEmacs. Otherwise, assume we are running Emacs.") +(defvar iswitchb-default nil + "Default buffer for iswitchb.") -;;; FUNCTIONS +;; The following variables are needed to keep the byte compiler quiet. +(defvar iswitchb-require-match nil + "Non-nil if matching buffer must be selected.") +(defvar iswitchb-temp-buflist nil + "Stores a temporary version of the buffer list being created.") + +(defvar iswitchb-bufs-in-frame nil + "List of the buffers visible in the current frame.") + +;;; FUNCTIONS ;;; ISWITCHB KEYMAP (defun iswitchb-define-mode-map () @@ -404,11 +414,8 @@ selected.") (define-key map "\C-k" 'iswitchb-kill-buffer) (define-key map "\C-m" 'iswitchb-exit-minibuffer) (setq iswitchb-mode-map map) - (run-hooks 'iswitchb-define-mode-map-hook) - )) + (run-hooks 'iswitchb-define-mode-map-hook))) - - ;;; MAIN FUNCTION (defun iswitchb () "Switch to buffer matching a substring. @@ -445,7 +452,6 @@ in a separate window. (setq buf (iswitchb-read-buffer prompt)) - ;;(message "chosen text %s" iswitchb-final-text) ;; Choose the buffer name: either the text typed in, or the head ;; of the list of matches @@ -463,12 +469,9 @@ in a separate window. (iswitchb-visit-buffer buf) ;; else buffer doesn't exist (iswitchb-possible-new-buffer buf))) - )) - - )) - - + )))) +;;;###autoload (defun iswitchb-read-buffer (prompt &optional default require-match) "Replacement for the built-in `read-buffer'. Return the name of a buffer selected. @@ -489,16 +492,16 @@ If REQUIRE-MATCH is non-nil, an existing-buffer must be selected." (setq iswitchb-exit nil) (setq iswitchb-rescan t) (setq iswitchb-text "") - (iswitchb-make-buflist - (if (bufferp default) - (buffer-name default) - default)) + (setq iswitchb-default + (if (bufferp default) + (buffer-name default) + default)) + (iswitchb-make-buflist iswitchb-default) (iswitchb-set-matches) (let ((minibuffer-local-completion-map iswitchb-mode-map) (iswitchb-prepost-hooks t) - (iswitchb-require-match require-match) - ) + (iswitchb-require-match require-match)) ;; prompt the user for the buffer name (setq iswitchb-final-text (completing-read prompt ;the prompt @@ -525,7 +528,6 @@ If REQUIRE-MATCH is non-nil, an existing-buffer must be selected." buf-sel)) - (defun iswitchb-existing-buffer-p () "Return non-nil if there is a matching buffer." (not (null iswitchb-matches))) @@ -539,22 +541,20 @@ The result is stored in `iswitchb-common-match-string'." (let* (val) (setq iswitchb-common-match-string nil) (if (and iswitchb-matches + (not iswitchb-regexp) ;; testing (stringp iswitchb-text) (> (length iswitchb-text) 0)) (if (setq val (iswitchb-find-common-substring iswitchb-matches iswitchb-text)) (setq iswitchb-common-match-string val))) - val - )) - + val)) (defun iswitchb-complete () "Try and complete the current pattern amongst the buffer names." (interactive) (let (res) (cond ((not iswitchb-matches) - (iswitchb-completion-help) - ) + (iswitchb-completion-help)) ((= 1 (length iswitchb-matches)) ;; only one choice, so select it. @@ -562,9 +562,7 @@ The result is stored in `iswitchb-common-match-string'." (t ;; else there could be some completions - - (setq res (iswitchb-find-common-substring - iswitchb-matches iswitchb-text)) + (setq res iswitchb-common-match-string) (if (and (not (memq res '(t nil))) (not (equal res iswitchb-text))) ;; found something to complete, so put it in the minibuffer. @@ -574,11 +572,7 @@ The result is stored in `iswitchb-common-match-string'." (insert res)) ;; else nothing to complete (iswitchb-completion-help) - ) - ) - ))) - - + ))))) ;;; TOGGLE FUNCTIONS @@ -587,17 +581,14 @@ The result is stored in `iswitchb-common-match-string'." (interactive) (setq iswitchb-case (not iswitchb-case)) ;; ask for list to be regenerated. - (setq iswitchb-rescan t) - ) + (setq iswitchb-rescan t)) (defun iswitchb-toggle-regexp () "Toggle the value of `iswitchb-regexp'." (interactive) (setq iswitchb-regexp (not iswitchb-regexp)) ;; ask for list to be regenerated. - (setq iswitchb-rescan t) - ) - + (setq iswitchb-rescan t)) (defun iswitchb-toggle-ignore () "Toggle ignoring buffers specified with `iswitchb-buffer-ignore'." @@ -605,22 +596,19 @@ The result is stored in `iswitchb-common-match-string'." (if iswitchb-buffer-ignore (progn (setq iswitchb-buffer-ignore-orig iswitchb-buffer-ignore) - (setq iswitchb-buffer-ignore nil) - ) + (setq iswitchb-buffer-ignore nil)) ;; else - (setq iswitchb-buffer-ignore iswitchb-buffer-ignore-orig) - ) + (setq iswitchb-buffer-ignore iswitchb-buffer-ignore-orig)) + (iswitchb-make-buflist iswitchb-default) ;; ask for list to be regenerated. - (setq iswitchb-rescan t) - ) + (setq iswitchb-rescan t)) (defun iswitchb-exit-minibuffer () "Exit minibuffer, but make sure we have a match if one is needed." (interactive) (if (or (not iswitchb-require-match) (iswitchb-existing-buffer-p)) - (throw 'exit nil) - )) + (throw 'exit nil))) (defun iswitchb-select-buffer-text () "Select the buffer named by the prompt. @@ -629,8 +617,6 @@ If no buffer exactly matching the prompt exists, maybe create a new one." (setq iswitchb-exit 'takeprompt) (exit-minibuffer)) - - (defun iswitchb-find-file () "Drop into find-file from buffer switching." (interactive) @@ -642,19 +628,14 @@ If no buffer exactly matching the prompt exists, maybe create a new one." (interactive) (let ((next (cadr iswitchb-matches))) (setq iswitchb-buflist (iswitchb-chop iswitchb-buflist next)) - (setq iswitchb-rescan t) - )) + (setq iswitchb-rescan t))) (defun iswitchb-prev-match () "Put last element of `iswitchb-matches' at the front of the list." (interactive) (let ((prev (car (last iswitchb-matches)))) (setq iswitchb-buflist (iswitchb-chop iswitchb-buflist prev)) - (setq iswitchb-rescan t) - )) - - - + (setq iswitchb-rescan t))) (defun iswitchb-chop (list elem) "Remove all elements before ELEM and put them at the end of LIST." @@ -671,12 +652,8 @@ If no buffer exactly matching the prompt exists, maybe create a new one." (setq sofar (cons next sofar))))) ret)) - - - ;;; CREATE LIST OF ALL CURRENT BUFFERS - (defun iswitchb-make-buflist (default) "Set `iswitchb-buflist' to the current list of buffers. Currently visible buffers are put at the end of the list. @@ -686,7 +663,7 @@ in this list. If DEFAULT is non-nil, and corresponds to an existing buffer, it is put to the start of the list." (setq iswitchb-buflist (let* ((iswitchb-current-buffers (iswitchb-get-buffers-in-frames)) - (buflist + (iswitchb-temp-buflist (delq nil (mapcar (lambda (x) @@ -697,26 +674,25 @@ it is put to the start of the list." (memq b-name iswitchb-current-buffers))) b-name))) (buffer-list))))) - (nconc buflist iswitchb-current-buffers) + (nconc iswitchb-temp-buflist iswitchb-current-buffers) (run-hooks 'iswitchb-make-buflist-hook) ;; Should this be after the hooks, or should the hooks be the ;; final thing to be run? (if default (progn - (setq buflist (delete default buflist)) - (setq buflist (cons default buflist)) - )) - buflist))) + (setq iswitchb-temp-buflist + (delete default iswitchb-temp-buflist)) + (setq iswitchb-temp-buflist + (cons default iswitchb-temp-buflist)))) + iswitchb-temp-buflist))) (defun iswitchb-to-end (lst) - "Move the elements from LST to the end of BUFLIST." + "Move the elements from LST to the end of `iswitchb-temp-buflist'." (mapcar (lambda (elem) - (setq buflist (delq elem buflist))) + (setq iswitchb-temp-buflist (delq elem iswitchb-temp-buflist))) lst) - (nconc buflist lst)) - - + (nconc iswitchb-temp-buflist lst)) (defun iswitchb-get-buffers-in-frames (&optional current) "Return the list of buffers that are visible in the current frame. @@ -730,7 +706,6 @@ current frame, rather than all frames, regardless of value of iswitchb-all-frames)) iswitchb-bufs-in-frame)) - (defun iswitchb-get-bufname (win) "Used by `iswitchb-get-buffers-in-frames' to walk through all windows." (let ((buf (buffer-name (window-buffer win)))) @@ -741,31 +716,27 @@ current frame, rather than all frames, regardless of value of (setq iswitchb-bufs-in-frame (cons buf iswitchb-bufs-in-frame))))) - ;;; FIND MATCHING BUFFERS - (defun iswitchb-set-matches () "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))))) + buflist))))) (defun iswitchb-get-matched-buffers (regexp &optional string-format buffer-list) - "Return buffers matching REGEXP. -If STRING-FORMAT is non-nil, consider REGEXP as string. + "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) ;; need reverse since we are building up list backwards (list (reverse buffer-list)) - (do-string (stringp (car list))) + (do-string (stringp (car list))) name - ret - ) + ret) (mapcar (lambda (x) @@ -778,24 +749,18 @@ BUFFER-LIST can be list of buffers or list of strings." (and (null string-format) (string-match (regexp-quote regexp) name))) - ;; todo (not (iswitchb-ignore-buffername-p name)) - ) + (not (iswitchb-ignore-buffername-p name))) (setq ret (cons name ret)) ))) list) - ret - )) - - - + ret)) (defun iswitchb-ignore-buffername-p (bufname) "Return t if the buffer BUFNAME should be ignored." (let ((data (match-data)) (re-list iswitchb-buffer-ignore) ignorep - nextstr - ) + nextstr) (while re-list (setq nextstr (car re-list)) (cond @@ -808,17 +773,12 @@ BUFFER-LIST can be list of buffers or list of strings." (if (funcall nextstr bufname) (progn (setq ignorep t) - (setq re-list nil)) - )) - ) + (setq re-list nil))))) (setq re-list (cdr re-list))) (set-match-data data) ;; return the result - ignorep) - ) - - + ignorep)) (defun iswitchb-word-matching-substring (word) "Return part of WORD before 1st match to `iswitchb-change-word-sub'. @@ -830,17 +790,11 @@ If `iswitchb-change-word-sub' cannot be found in WORD, return nil." ;; else no match nil)))) - - - - - (defun iswitchb-find-common-substring (lis subs) "Return common string following SUBS in each element of LIS." (let (res alist - iswitchb-change-word-sub - ) + iswitchb-change-word-sub) (setq iswitchb-change-word-sub (if iswitchb-regexp subs @@ -852,9 +806,7 @@ If `iswitchb-change-word-sub' cannot be found in WORD, return nil." ;; try-completion returns t if there is an exact match. (let ((completion-ignore-case iswitchb-case)) - (try-completion subs alist) - ))) - + (try-completion subs alist)))) (defun iswitchb-makealist (res) "Return dotted pair (RES . 1)." @@ -872,9 +824,7 @@ Return the modified list with the last element prepended to it." (setq prev las las (cdr las))) (setcdr prev nil) - (cons (car las) lis)) - )) - + (cons (car las) lis)))) (defun iswitchb-completion-help () "Show possible completions in a *Buffer Completions* buffer." @@ -897,9 +847,7 @@ Return the modified list with the last element prepended to it." (if (pos-visible-in-window-p (point-max) win) (set-window-start win (point-min)) (scroll-other-window)) - (set-buffer buf) - ) - + (set-buffer buf)) (with-output-to-temp-buffer temp-buf (if iswitchb-xemacs @@ -919,8 +867,6 @@ Return the modified list with the last element prepended to it." iswitchb-buflist)) ))))) - - ;;; KILL CURRENT BUFFER (defun iswitchb-kill-buffer () @@ -944,7 +890,6 @@ Return the modified list with the last element prepended to it." ;; else buffer was killed so remove name from list. (setq iswitchb-buflist (delq buf iswitchb-buflist))))))) - ;;; VISIT CHOSEN BUFFER (defun iswitchb-visit-buffer (buffer) "Visit buffer named BUFFER according to `iswitchb-method'." @@ -965,15 +910,12 @@ Return the modified list with the last element prepended to it." (if (not iswitchb-xemacs) ;; reposition mouse to make frame active. not needed in XEmacs ;; This line came from the other-frame defun in Emacs. - (set-mouse-position (selected-frame) (1- (frame-width)) 0)) - ) + (set-mouse-position (selected-frame) (1- (frame-width)) 0))) (t ;; No buffer in other frames... (switch-to-buffer buffer) ))) - - ((eq iswitchb-method 'otherwindow) (switch-to-buffer-other-window buffer)) @@ -985,8 +927,7 @@ Return the modified list with the last element prepended to it." (switch-to-buffer-other-frame buffer) (if (not iswitchb-xemacs) (set-mouse-position (selected-frame) (1- (frame-width)) 0)) - ) - ) ))) + ))))) (defun iswitchb-possible-new-buffer (buf) "Possibly create and visit a new buffer called BUF." @@ -1008,8 +949,7 @@ Return the modified list with the last element prepended to it." (set-buffer-major-mode newbufcreated)) (iswitchb-visit-buffer newbufcreated)) ;; else wont create new buffer - (message (format "no buffer matching `%s'" buf)) - ))) + (message (format "no buffer matching `%s'" buf))))) (defun iswitchb-window-buffer-p (buffer) "Return window pointer if BUFFER is visible in another frame. @@ -1033,7 +973,6 @@ Call this function to override the normal bindings." (global-set-key (read-kbd-macro "C-x 4 C-o") 'iswitchb-display-buffer) (global-set-key (read-kbd-macro "C-x 5 b") 'iswitchb-buffer-other-frame)) - ;;;###autoload (defun iswitchb-buffer () "Switch to another buffer. @@ -1047,7 +986,6 @@ For details of keybindings, do `\\[describe-function] iswitchb'." (setq iswitchb-method iswitchb-default-method) (iswitchb)) - ;;;###autoload (defun iswitchb-buffer-other-window () "Switch to another buffer and show it in another window. @@ -1057,8 +995,6 @@ For details of keybindings, do `\\[describe-function] iswitchb'." (setq iswitchb-method 'otherwindow) (iswitchb)) - - ;;;###autoload (defun iswitchb-display-buffer () "Display a buffer in another window but don't select it. @@ -1068,8 +1004,6 @@ For details of keybindings, do `\\[describe-function] iswitchb'." (setq iswitchb-method 'display) (iswitchb)) - - ;;;###autoload (defun iswitchb-buffer-other-frame () "Switch to another buffer and show it in another frame. @@ -1089,7 +1023,7 @@ For details of keybindings, do `\\[describe-function] iswitchb'." ;; function. To solve this, we use another entry hook for emacs to ;; show the default the first time we enter the minibuffer. -(defun iswitchb-init-Xemacs-trick () +(defun iswitchb-init-XEmacs-trick () "Display default buffer when first entering minibuffer. This is a hack for XEmacs, and should really be handled by `iswitchb-exhibit'." (if (iswitchb-entryfn-p) @@ -1097,12 +1031,10 @@ This is a hack for XEmacs, and should really be handled by `iswitchb-exhibit'." (iswitchb-exhibit) (goto-char (point-min))))) - ;; add this hook for XEmacs only. (if iswitchb-xemacs (add-hook 'iswitchb-minibuffer-setup-hook - 'iswitchb-init-Xemacs-trick)) - + 'iswitchb-init-XEmacs-trick)) ;;; XEmacs / backspace key ;; For some reason, if the backspace key is pressed in XEmacs, the @@ -1112,16 +1044,12 @@ This is a hack for XEmacs, and should really be handled by `iswitchb-exhibit'." (defun iswitchb-xemacs-backspacekey () "Bind backspace to `backward-delete-char'." (define-key iswitchb-mode-map '[backspace] 'backward-delete-char) - (define-key iswitchb-mode-map '[(meta backspace)] 'backward-kill-word) - ) - + (define-key iswitchb-mode-map '[(meta backspace)] 'backward-kill-word)) (if iswitchb-xemacs (add-hook 'iswitchb-define-mode-map-hook 'iswitchb-xemacs-backspacekey)) - - ;;; ICOMPLETE TYPE CODE (defun iswitchb-exhibit () @@ -1157,8 +1085,6 @@ Copied from `icomplete-exhibit' with two changes: (not minibuffer-completion-confirm))) )))) - - (defun iswitchb-completions (name candidates predicate require-match) "Return the string that is displayed after the user's text. @@ -1171,8 +1097,7 @@ Modified from `icomplete-completions'." ;"-prospects" - more than one candidate (open-bracket-prospects "{") (close-bracket-prospects "}") - first - ) + first) (if (and iswitchb-use-fonts comps) (progn @@ -1183,8 +1108,7 @@ Modified from `icomplete-completions'." 'font-lock-comment-face 'font-lock-function-name-face) first) - (setq comps (cons first (cdr comps))) - )) + (setq comps (cons first (cdr comps))))) (cond ((null comps) (format " %sNo match%s" open-bracket-determined @@ -1199,8 +1123,7 @@ Modified from `icomplete-completions'." (car comps) close-bracket-determined) "") - (if (not iswitchb-use-fonts) " [Matched]") - )) + (if (not iswitchb-use-fonts) " [Matched]"))) (t ;multiple matches (let* ( ;;(most (try-completion name candidates predicate)) @@ -1234,8 +1157,7 @@ Modified from `icomplete-completions'." (concat open-bracket-determined (substring iswitchb-common-match-string (length name)) - close-bracket-determined) - ) + close-bracket-determined)) ;; end of partial matches... ;; think this bit can be ignored. @@ -1249,8 +1171,7 @@ Modified from `icomplete-completions'." (if most-is-exact (concat "," alternatives) alternatives) - close-bracket-prospects))) - ))) + close-bracket-prospects)))))) (defun iswitchb-minibuffer-setup () "Set up minibuffer for `iswitchb-buffer'. @@ -1269,22 +1190,15 @@ Copied from `icomplete-minibuffer-setup-hook'." 'iswitchb-post-command nil t) - (run-hooks 'iswitchb-minibuffer-setup-hook) - ) - )) - + (run-hooks 'iswitchb-minibuffer-setup-hook)))) (defun iswitchb-pre-command () "Run before command in `iswitchb-buffer'." (iswitchb-tidy)) - (defun iswitchb-post-command () "Run after command in `iswitchb-buffer'." - (iswitchb-exhibit) - ) - - + (iswitchb-exhibit)) (defun iswitchb-tidy () "Remove completions display, if any, prior to new user input. @@ -1303,7 +1217,6 @@ Copied from `icomplete-tidy'." (make-local-variable 'iswitchb-eoinput) (setq iswitchb-eoinput 1))) - (defun iswitchb-entryfn-p () "Return non-nil if `this-command' shows we are using `iswitchb-buffer'." (or (boundp 'iswitchb-prepost-hooks) @@ -1317,10 +1230,6 @@ Copied from `icomplete-tidy'." ;; iswitchb-buffer-other-window)))) )) - - - - (defun iswitchb-summaries-to-end () "Move the summaries to the end of the list. This is an example function which can be hooked on to @@ -1332,13 +1241,9 @@ This is an example function which can be hooked on to (string-match "Summary" x) (string-match "output\\*$" x)) x)) - buflist) - ))) - + iswitchb-temp-buflist)))) (iswitchb-to-end summaries))) - - ;;; HOOKS (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)