[Emacs-diffs] /srv/bzr/emacs/trunk r104612: Fix two typos in same-window-p.

[martin rudalics]

------------------------------------------------------------
revno: 104612
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Fri 2011-06-17 08:04:44 +0200
message:
  Fix two typos in same-window-p.
  
  * window.el (same-window-p): Fix two typos introduced when
  adding with-no-warnings.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-16 14:01:46 +0000
+++ b/lisp/ChangeLog    2011-06-17 06:04:44 +0000
@@ -1,3 +1,8 @@
+2011-06-17  Martin Rudalics  <address@hidden>
+
+       * window.el (same-window-p): Fix two typos introduced when
+       adding with-no-warnings.
+
 2011-06-16  Martin Rudalics  <address@hidden>
 
        * window.el (display-buffer-normalize-specifiers-1): Respect

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-06-16 14:01:46 +0000
+++ b/lisp/window.el    2011-06-17 06:04:44 +0000
@@ -5628,8 +5628,8 @@
 `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