aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-06-17 08:04:44 +0200
committerMartin Rudalics2011-06-17 08:04:44 +0200
commitdbad4f694d92d446c8b4eeb383afd13017ab76da (patch)
treed6be8963529a5291275e22c17f4503ce904cff9b
parentbf4846e712443d883aab808918335a632dfaab2d (diff)
downloademacs-dbad4f694d92d446c8b4eeb383afd13017ab76da.tar.gz
emacs-dbad4f694d92d446c8b4eeb383afd13017ab76da.zip
Fix two typos in same-window-p.
* window.el (same-window-p): Fix two typos introduced when adding with-no-warnings.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5d76e3f533..0ea97860bfe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-06-17 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (same-window-p): Fix two typos introduced when
4 adding with-no-warnings.
5
12011-06-16 Martin Rudalics <rudalics@gmx.at> 62011-06-16 Martin Rudalics <rudalics@gmx.at>
2 7
3 * window.el (display-buffer-normalize-specifiers-1): Respect 8 * 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
5628`pop-to-buffer' would show a buffer named BUFFER-NAME in the 5628`pop-to-buffer' would show a buffer named BUFFER-NAME in the
5629selected rather than \(as usual\) some other window. See 5629selected rather than \(as usual\) some other window. See
5630`same-window-buffer-names' and `same-window-regexps'." 5630`same-window-buffer-names' and `same-window-regexps'."
5631 (let ((buffer-names (with-no-warnings special-display-buffer-names)) 5631 (let ((buffer-names (with-no-warnings same-window-buffer-names))
5632 (regexps (with-no-warnings special-display-regexps))) 5632 (regexps (with-no-warnings same-window-regexps)))
5633 (cond 5633 (cond
5634 ((not (stringp buffer-name))) 5634 ((not (stringp buffer-name)))
5635 ;; The elements of `same-window-buffer-names' can be buffer 5635 ;; The elements of `same-window-buffer-names' can be buffer