aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Eglen1998-06-07 17:46:15 +0000
committerStephen Eglen1998-06-07 17:46:15 +0000
commit02e526add790e9bdd90d91b8ee4288eda4e2766c (patch)
treed1c8669088992e43f67f4b434f3ec0f156b91ceb
parent7a3662966cb7c548202347f4cdd85b87c97d2d4b (diff)
downloademacs-02e526add790e9bdd90d91b8ee4288eda4e2766c.tar.gz
emacs-02e526add790e9bdd90d91b8ee4288eda4e2766c.zip
(iswitchb-require-match, iswitchb-temp-buflist, iswitchb-bufs-in-frame):
Variables declared with defvar to quieten the byte compiler.
-rw-r--r--lisp/iswitchb.el30
1 files changed, 21 insertions, 9 deletions
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index bdbcb3fbe1f..a6bac08dd74 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -381,6 +381,16 @@ selected.")
381(defvar iswitchb-default nil 381(defvar iswitchb-default nil
382 "Default buffer for iswitchb.") 382 "Default buffer for iswitchb.")
383 383
384;; The following variables are needed to keep the byte compiler quiet.
385(defvar iswitchb-require-match nil
386 "Non-nil if matching buffer must be selected.")
387
388(defvar iswitchb-temp-buflist nil
389 "Stores a temporary version of the buffer list being created.")
390
391(defvar iswitchb-bufs-in-frame nil
392 "List of the buffers visible in the current frame.")
393
384;;; FUNCTIONS 394;;; FUNCTIONS
385 395
386;;; ISWITCHB KEYMAP 396;;; ISWITCHB KEYMAP
@@ -653,7 +663,7 @@ in this list. If DEFAULT is non-nil, and corresponds to an existing buffer,
653it is put to the start of the list." 663it is put to the start of the list."
654 (setq iswitchb-buflist 664 (setq iswitchb-buflist
655 (let* ((iswitchb-current-buffers (iswitchb-get-buffers-in-frames)) 665 (let* ((iswitchb-current-buffers (iswitchb-get-buffers-in-frames))
656 (buflist 666 (iswitchb-temp-buflist
657 (delq nil 667 (delq nil
658 (mapcar 668 (mapcar
659 (lambda (x) 669 (lambda (x)
@@ -664,23 +674,25 @@ it is put to the start of the list."
664 (memq b-name iswitchb-current-buffers))) 674 (memq b-name iswitchb-current-buffers)))
665 b-name))) 675 b-name)))
666 (buffer-list))))) 676 (buffer-list)))))
667 (nconc buflist iswitchb-current-buffers) 677 (nconc iswitchb-temp-buflist iswitchb-current-buffers)
668 (run-hooks 'iswitchb-make-buflist-hook) 678 (run-hooks 'iswitchb-make-buflist-hook)
669 ;; Should this be after the hooks, or should the hooks be the 679 ;; Should this be after the hooks, or should the hooks be the
670 ;; final thing to be run? 680 ;; final thing to be run?
671 (if default 681 (if default
672 (progn 682 (progn
673 (setq buflist (delete default buflist)) 683 (setq iswitchb-temp-buflist
674 (setq buflist (cons default buflist)))) 684 (delete default iswitchb-temp-buflist))
675 buflist))) 685 (setq iswitchb-temp-buflist
686 (cons default iswitchb-temp-buflist))))
687 iswitchb-temp-buflist)))
676 688
677(defun iswitchb-to-end (lst) 689(defun iswitchb-to-end (lst)
678 "Move the elements from LST to the end of BUFLIST." 690 "Move the elements from LST to the end of `iswitchb-temp-buflist'."
679 (mapcar 691 (mapcar
680 (lambda (elem) 692 (lambda (elem)
681 (setq buflist (delq elem buflist))) 693 (setq iswitchb-temp-buflist (delq elem iswitchb-temp-buflist)))
682 lst) 694 lst)
683 (nconc buflist lst)) 695 (nconc iswitchb-temp-buflist lst))
684 696
685(defun iswitchb-get-buffers-in-frames (&optional current) 697(defun iswitchb-get-buffers-in-frames (&optional current)
686 "Return the list of buffers that are visible in the current frame. 698 "Return the list of buffers that are visible in the current frame.
@@ -1229,7 +1241,7 @@ This is an example function which can be hooked on to
1229 (string-match "Summary" x) 1241 (string-match "Summary" x)
1230 (string-match "output\\*$" x)) 1242 (string-match "output\\*$" x))
1231 x)) 1243 x))
1232 buflist)))) 1244 iswitchb-temp-buflist))))
1233 (iswitchb-to-end summaries))) 1245 (iswitchb-to-end summaries)))
1234 1246
1235;;; HOOKS 1247;;; HOOKS