[Emacs-diffs] trunk r115194: Merge from emacs-24; up to r111408

[Glenn Morris]

------------------------------------------------------------
revno: 115194 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-11-22 18:24:50 -0800
message:
  Merge from emacs-24; up to r111408
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/process.c                  process.c-20091113204419-o5vbwnq5f7feedwu-462

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-23 01:55:16 +0000
+++ b/src/ChangeLog     2013-11-23 02:24:50 +0000
@@ -1,3 +1,7 @@
+2013-11-23  Andreas Schwab  <address@hidden>
+
+       * process.c (get_process): Check that OBJ is a live buffer.  (Bug#15923)
+
 2013-11-23  Glenn Morris  <address@hidden>
 
        Empty elements in EMACSLOADPATH stand for the default.  (Bug#12100)

=== modified file 'src/process.c'
--- a/src/process.c     2013-11-06 18:41:31 +0000
+++ b/src/process.c     2013-11-23 02:24:50 +0000
@@ -812,9 +812,8 @@
   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))