Merge from emacs-24; up to 2013-01-03T02:37:57Z!rgm@gnu.org

2 files changed, 6 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 823a70326bb..c6f63adebcd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-23  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * process.c (get_process): Check that OBJ is a live buffer.  (Bug#15923)
+
 2013-11-23  Glenn Morris  <rgm@gnu.org>
 
         Empty elements in EMACSLOADPATH stand for the default.  (Bug#12100)
diff --git a/src/process.c b/src/process.c
index 307eab3ab30..7d4fb4e3ec4 100644
--- a/src/process.c
+++ b/src/process.c
@@ -812,9 +812,8 @@ get_process (register Lisp_Object name)
   else
     obj = name;
 
-  /* Now obj should be either a buffer object or a process object.
-   */
-  if (BUFFERP (obj))
+  /* Now obj should be either a (live) buffer object or a process object.  */
+  if (BUFFERP (obj) && !NILP (BVAR (XBUFFER (obj), name)))
     {
       proc = Fget_buffer_process (obj);
       if (NILP (proc))