[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100622: Backport r104485 (Bug#8799) from trunk

[Chong Yidong]

------------------------------------------------------------
revno: 100622 [merge]
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2011-08-20 23:12:26 -0400
message:
  Backport r104485 (Bug#8799) from trunk
modified:
  lisp/ChangeLog
  lisp/iswitchb.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-09 21:55:34 +0000
+++ b/lisp/ChangeLog    2011-08-21 03:12:09 +0000
@@ -1,3 +1,8 @@
+2011-08-21  Deniz Dogan  <address@hidden>
+
+       * iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of
+       `memq' (Bug#8799).
+
 2011-08-09  Chong Yidong  <address@hidden>
 
        * hi-lock.el (hi-lock-unface-buffer): Fix interactive spec

=== modified file 'lisp/iswitchb.el'
--- a/lisp/iswitchb.el  2011-01-02 23:50:46 +0000
+++ b/lisp/iswitchb.el  2011-08-21 03:12:09 +0000
@@ -1112,10 +1112,9 @@
 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
       )))