Backport 2011-06-04T11:02:37Z!deniz@dogan.se (Bug#8799) from trunk

2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 509978a8127..f579b7179d4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-21  Deniz Dogan  <deniz@dogan.se>
+
+        * iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of
+        `memq' (Bug#8799).
+
 2011-08-09  Chong Yidong  <cyd@stupidchicken.com>
 
         * hi-lock.el (hi-lock-unface-buffer): Fix interactive spec
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index a9db65d0cc8..180f1901aa7 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -1112,10 +1112,9 @@ Return the modified list with the last element prepended to it."
 If BUFFER is visible in the current frame, return nil."
   (interactive)
   (let ((blist (iswitchb-get-buffers-in-frames 'current)))
-    ;;If the buffer is visible in current frame, return nil
-    (if (memq buffer blist)
-        nil
-      ;;  maybe in other frame or icon
+    ;; If the buffer is visible in current frame, return nil
+    (unless (member buffer blist)
+      ;; maybe in other frame or icon
       (get-buffer-window buffer 0) ; better than 'visible
       )))