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

diff --git a/src/ChangeLog b/src/ChangeLog
index 823a70326bb4e8d98a1503f80fb8817f82931ff7..c6f63adebcdd5e4b868d884a9d8907c18615c849 100644 (file)
--- 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 307eab3ab3030500f9607de21685ff4a0c31b877..7d4fb4e3ec4b4caa88a2174211c1520643c8a5f6 100644 (file)
--- 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))