aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorMartin Rudalics <[email protected]>2011-06-17 08:04:44 +0200
committerMartin Rudalics <[email protected]>2011-06-17 08:04:44 +0200
commitdbad4f694d92d446c8b4eeb383afd13017ab76da (patch)
treed6be8963529a5291275e22c17f4503ce904cff9b /lisp
parentbf4846e712443d883aab808918335a632dfaab2d (diff)
Fix two typos in same-window-p.
* window.el (same-window-p): Fix two typos introduced when adding with-no-warnings.
Diffstat (limited to 'lisp')
-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 b5d76e3f53..0ea97860bf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-17 Martin Rudalics <[email protected]>
+
+ * window.el (same-window-p): Fix two typos introduced when
+ adding with-no-warnings.
+
2011-06-16 Martin Rudalics <[email protected]>
* window.el (display-buffer-normalize-specifiers-1): Respect
diff --git a/lisp/window.el b/lisp/window.el
index aa874b8e50..0372a2f13f 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