diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5d76e3f533..0ea97860bfe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-17  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.el (same-window-p): Fix two typos introduced when
+	adding with-no-warnings.
+
 2011-06-16  Martin Rudalics  <rudalics@gmx.at>
 
 	* window.el (display-buffer-normalize-specifiers-1): Respect
diff --git a/lisp/window.el b/lisp/window.el
index aa874b8e503..0372a2f13f1 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5628,8 +5628,8 @@ This function returns non-nil if `display-buffer' or
 `pop-to-buffer' would show a buffer named BUFFER-NAME in the
 selected rather than \(as usual\) some other window.  See
 `same-window-buffer-names' and `same-window-regexps'."
-  (let ((buffer-names (with-no-warnings special-display-buffer-names))
-	(regexps (with-no-warnings special-display-regexps)))
+  (let ((buffer-names (with-no-warnings same-window-buffer-names))
+	(regexps (with-no-warnings same-window-regexps)))
     (cond
      ((not (stringp buffer-name)))
      ;; The elements of `same-window-buffer-names' can be buffer