aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2012-06-17 12:43:50 +0200
committerMartin Rudalics2012-06-17 12:43:50 +0200
commit074633638d5f65e3cbf8fa5ee3856113b105286a (patch)
treec12da34ce0ac2f349cac3db6f53ae5bc3f89bce4
parent96a313a1daea14c0b125857f2775aae911045349 (diff)
downloademacs-074633638d5f65e3cbf8fa5ee3856113b105286a.tar.gz
emacs-074633638d5f65e3cbf8fa5ee3856113b105286a.zip
In special-display-p signal an error if BUFFER-NAME is not a string (Bug#11713).
* window.el (special-display-p): Signal an error if BUFFER-NAME is not a string (Bug#11713).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9fe44089c9..63b02cfe017 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-06-17 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (special-display-p): Signal an error if BUFFER-NAME
4 is not a string (Bug#11713).
5
12012-06-17 Paul Eggert <eggert@cs.ucla.edu> 62012-06-17 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * progmodes/python.el (python-info-beginning-of-backslash): 8 * progmodes/python.el (python-info-beginning-of-backslash):
diff --git a/lisp/window.el b/lisp/window.el
index d9dd7b63e27..62cd226daec 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4192,7 +4192,8 @@ or matches BUFFER-NAME, the return value is the cdr of that
4192entry." 4192entry."
4193 (let (tmp) 4193 (let (tmp)
4194 (cond 4194 (cond
4195 ((not (stringp buffer-name))) 4195 ((not (stringp buffer-name))
4196 (error "Invalid buffer name %s" buffer-name))
4196 ((member buffer-name special-display-buffer-names) 4197 ((member buffer-name special-display-buffer-names)
4197 t) 4198 t)
4198 ((setq tmp (assoc buffer-name special-display-buffer-names)) 4199 ((setq tmp (assoc buffer-name special-display-buffer-names))