[Emacs-diffs] trunk r115347: * subr.el (process-live-p): Return nil for non-process.

[Leo Liu]

------------------------------------------------------------
revno: 115347
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16023
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-02 15:13:01 +0800
message:
  * subr.el (process-live-p): Return nil for non-process. 
  
  * progmodes/sh-script.el (sh-shell-process):
  * progmodes/octave.el (inferior-octave-process-live-p):
  * progmodes/gdb-mi.el (gdb-delchar-or-quit)
  (gdb-inferior-io-sentinel):
  * emacs-lock.el (emacs-lock-live-process-p): All uses changed.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lock.el             emacslock.el-20110705113219-ow9goco1t3qf274t-1
  lisp/progmodes/gdb-mi.el       gdbmi.el-20100327132052-973a0aspo2g2bze8-1
  lisp/progmodes/octave.el       
octavemod.el-20091113204419-o5vbwnq5f7feedwu-1028
  lisp/progmodes/sh-script.el    shscript.el-20091113204419-o5vbwnq5f7feedwu-727
  lisp/subr.el                   subr.el-20091113204419-o5vbwnq5f7feedwu-151

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-02 03:03:40 +0000
+++ b/lisp/ChangeLog    2013-12-02 07:13:01 +0000
@@ -1,3 +1,13 @@
+2013-12-02  Leo Liu  <address@hidden>
+
+       * subr.el (process-live-p): Return nil for non-process.  (Bug#16023)
+
+       * progmodes/sh-script.el (sh-shell-process):
+       * progmodes/octave.el (inferior-octave-process-live-p):
+       * progmodes/gdb-mi.el (gdb-delchar-or-quit)
+       (gdb-inferior-io-sentinel):
+       * emacs-lock.el (emacs-lock-live-process-p): All uses changed.
+
 2013-12-02  Dmitry Gutov  <address@hidden>
 
        * vc/log-edit.el (log-edit-kill-buffer): Move the use of

=== modified file 'lisp/emacs-lock.el'
--- a/lisp/emacs-lock.el        2013-06-22 02:33:33 +0000
+++ b/lisp/emacs-lock.el        2013-12-02 07:13:01 +0000
@@ -109,8 +109,7 @@
 
 (defun emacs-lock-live-process-p (buffer-or-name)
   "Return t if BUFFER-OR-NAME is associated with a live process."
-  (let ((proc (get-buffer-process buffer-or-name)))
-    (and proc (process-live-p proc))))
+  (process-live-p (get-buffer-process buffer-or-name)))
 
 (defun emacs-lock--can-auto-unlock (action)
   "Return t if the current buffer can auto-unlock for ACTION.

=== modified file 'lisp/progmodes/gdb-mi.el'
--- a/lisp/progmodes/gdb-mi.el  2013-11-17 23:01:23 +0000
+++ b/lisp/progmodes/gdb-mi.el  2013-12-02 07:13:01 +0000
@@ -981,7 +981,8 @@
               (eq gud-minor-mode 'gdbmi))
     (error "Not in a GDB-MI buffer"))
   (let ((proc (get-buffer-process gud-comint-buffer)))
-    (if (and (eobp) proc (process-live-p proc)
+    (if (and (eobp)
+             (process-live-p proc)
             (not gud-running)
             (= (point) (marker-position (process-mark proc))))
        ;; Sending an EOF does not work with GDB-MI; submit an
@@ -1584,9 +1585,8 @@
     ;; read from the pty, and stops listening to it.  If the gdb
     ;; process is still running, remove the pty, make a new one, and
     ;; pass it to gdb.
-    (let ((gdb-proc (get-buffer-process gud-comint-buffer))
-         (io-buffer (process-buffer proc)))
-      (when (and gdb-proc (process-live-p gdb-proc)
+    (let ((io-buffer (process-buffer proc)))
+      (when (and (process-live-p (get-buffer-process gud-comint-buffer))
                 (buffer-live-p io-buffer))
        ;; `comint-exec' deletes the original process as a side effect.
        (comint-exec io-buffer "gdb-inferior" nil nil nil)

=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el  2013-11-22 14:17:48 +0000
+++ b/lisp/progmodes/octave.el  2013-12-02 07:13:01 +0000
@@ -700,7 +700,7 @@
 (declare-function compilation-forget-errors "compile" ())
 
 (defun inferior-octave-process-live-p ()
-  (and inferior-octave-process (process-live-p inferior-octave-process)))
+  (process-live-p inferior-octave-process))
 
 (define-derived-mode inferior-octave-mode comint-mode "Inferior Octave"
   "Major mode for interacting with an inferior Octave process."

=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el       2013-11-09 10:49:42 +0000
+++ b/lisp/progmodes/sh-script.el       2013-12-02 07:13:01 +0000
@@ -1478,7 +1478,7 @@
 (defun sh-shell-process (force)
   "Get a shell process for interaction.
 If FORCE is non-nil and no process found, create one."
-  (if (and sh-shell-process (process-live-p sh-shell-process))
+  (if (process-live-p sh-shell-process)
       sh-shell-process
     (setq sh-shell-process
           (let ((found nil) proc

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2013-11-24 08:49:44 +0000
+++ b/lisp/subr.el      2013-12-02 07:13:01 +0000
@@ -1885,9 +1885,11 @@
 (defun process-live-p (process)
   "Returns non-nil if PROCESS is alive.
 A process is considered alive if its status is `run', `open',
-`listen', `connect' or `stop'."
-  (memq (process-status process)
-        '(run open listen connect stop)))
+`listen', `connect' or `stop'.  Value is nil if PROCESS is not a
+process."
+  (and (processp process)
+       (memq (process-status process)
+            '(run open listen connect stop))))
 
 ;; compatibility