Re: iswitchb problems

[Stefan Monnier]

> The compile errors come in both cases from code that is exec'ed under
> XEmacs, not Emacs, so I think those are okay.  I'm not sure there is
> anything I can do to silence them under XEmacs.

The patch below should eliminate all those warnings
(at least it eliminates them when byte-compiled with Emacs-CVS).
It also eliminates some apparently used vars and args.


        Stefan


--- iswitchb.el.~1.41.~ Mon Jun  2 15:32:56 2003
+++ iswitchb.el Wed Jun 25 14:29:23 2003
@@ -1,6 +1,6 @@
 ;;; iswitchb.el --- switch between buffers using substrings
 
-;; Copyright (C) 1996, 1997, 2000, 2001  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 2000, 2001, 2003  Free Software Foundation, Inc.
 
 ;; Author: Stephen Eglen <address@hidden>
 ;; Maintainer: Stephen Eglen <address@hidden>
@@ -473,9 +473,6 @@
 (defvar iswitchb-buffer-ignore-orig nil
   "Stores original value of `iswitchb-buffer-ignore'.")
 
-(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.")
 
@@ -599,7 +596,6 @@
     (iswitchb-set-matches)
     (let
        ((minibuffer-local-completion-map iswitchb-mode-map)
-        (iswitchb-prepost-hooks t)
         ;; Record the minibuffer depth that we expect to find once
         ;; the minibuffer is set up and iswitchb-entryfn-p is called.
         (iswitchb-minibuf-depth (1+ (minibuffer-depth)))
@@ -956,7 +952,7 @@
          (set-buffer buf))
 
       (with-output-to-temp-buffer temp-buf
-       (if iswitchb-xemacs
+       (if (featurep 'xemacs)
 
            ;; XEmacs extents are put on by default, doesn't seem to be
            ;; any way of switching them off.
@@ -1012,7 +1008,7 @@
             (or (eq iswitchb-method 'always-frame)
                 (y-or-n-p "Jump to frame? ")))
        (setq newframe (window-frame win))
-        (if (not iswitchb-xemacs)
+        (if (fboundp 'select-frame-set-input-focus)
             (select-frame-set-input-focus newframe)
           (raise-frame newframe)
           (select-frame newframe)
@@ -1032,7 +1028,7 @@
      ((eq iswitchb-method 'otherframe)
       (progn
        (switch-to-buffer-other-frame buffer)
-       (if (not iswitchb-xemacs)
+       (if (fboundp 'select-frame-set-input-focus)
             (select-frame-set-input-focus (selected-frame)))
        )))))
 
@@ -1143,7 +1139,7 @@
        (goto-char (point-min)))))
 
 ;; add this hook for XEmacs only.
-(if iswitchb-xemacs
+(if (featurep 'xemacs)
     (add-hook 'iswitchb-minibuffer-setup-hook
              'iswitchb-init-XEmacs-trick))
 
@@ -1157,7 +1153,7 @@
   (define-key iswitchb-mode-map '[backspace] 'backward-delete-char)
   (define-key iswitchb-mode-map '[(meta backspace)] 'backward-kill-word))
 
-(if iswitchb-xemacs
+(if (featurep 'xemacs)
     (add-hook 'iswitchb-define-mode-map-hook
              'iswitchb-xemacs-backspacekey))
 
@@ -1189,11 +1185,9 @@
          ;; Insert the match-status information:
          (insert (iswitchb-completions
                   contents
-                  minibuffer-completion-table
-                  minibuffer-completion-predicate
                   (not minibuffer-completion-confirm)))))))
 
-(defun iswitchb-completions (name candidates predicate require-match)
+(defun iswitchb-completions (name require-match)
   "Return the string that is displayed after the user's text.
 Modified from `icomplete-completions'."
 
@@ -1237,7 +1231,6 @@
                  (most nil)
                  (most-len (length most))
                  most-is-exact
-                 first
                  (alternatives
                   (apply
                    (function concat)
@@ -1336,7 +1329,7 @@
   "Return non-nil iff we should ignore case when matching.
 See the variable `iswitchb-case' for details."
   (if iswitchb-case
-      (if iswitchb-xemacs
+      (if (featurep 'xemacs)
          (isearch-no-upper-case-p iswitchb-text)
        (isearch-no-upper-case-p iswitchb-text t))))