Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25

3 files changed, 13 insertions, 6 deletions

diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index f5375612c34..4443383cdf5 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -347,10 +347,14 @@ the mode if ARG is omitted or nil."
    :modifier-p nil)
   (shell-command (concat command " "
                          (shell-quote-argument
-                          (if buffer-file-name
-                              buffer-file-name
-                            (make-temp-file
-                             (substring (buffer-name) 0 (min 10 (length (buffer-name))))))))))
+                          (or buffer-file-name
+                              (let ((file
+                                     (make-temp-file
+                                      (substring
+                                       (buffer-name) 0
+                                       (min 10 (length (buffer-name)))))))
+                                (write-region nil nil file nil 0)
+                                file))))))
 
 ;;;###autoload (autoload 'ibuffer-do-eval "ibuf-ext")
 (define-ibuffer-op eval (form)
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 9d23e64cd81..1295ed7a82d 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2336,7 +2336,8 @@ FORMATS is the value to use for `ibuffer-formats'.
     (setq other-window-p t))
   (let ((buf (get-buffer-create (or name "*Ibuffer*"))))
     (if other-window-p
-        (funcall (if noselect (lambda (buf) (display-buffer buf t)) #'pop-to-buffer) buf)
+        (or (and noselect (display-buffer buf t))
+            (pop-to-buffer buf t))
       (funcall (if noselect #'display-buffer #'switch-to-buffer) buf))
     (with-current-buffer buf
       (save-selected-window
diff --git a/lisp/simple.el b/lisp/simple.el
index c43fe548c82..67c02665ea1 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3749,6 +3749,7 @@ support pty association, if PROGRAM is nil."
 (define-derived-mode process-menu-mode tabulated-list-mode "Process Menu"
   "Major mode for listing the processes called by Emacs."
   (setq tabulated-list-format [("Process" 15 t)
+                               ("PID"      7 t)
                                ("Status"   7 t)
                                ("Buffer"  15 t)
                                ("TTY"     12 t)
@@ -3775,6 +3776,7 @@ Also, delete any process that is exited or signaled."
                (process-query-on-exit-flag p))
            (let* ((buf (process-buffer p))
                   (type (process-type p))
+                  (pid  (if (process-id p) (format "%d" (process-id p)) "--"))
                   (name (process-name p))
                   (status (symbol-name (process-status p)))
                   (buf-label (if (buffer-live-p buf)
@@ -3810,7 +3812,7 @@ Also, delete any process that is exited or signaled."
                                          (format " at %s b/s" speed)
                                        "")))))
                      (mapconcat 'identity (process-command p) " "))))
-             (push (list p (vector name status buf-label tty cmd))
+             (push (list p (vector name pid status buf-label tty cmd))
                    tabulated-list-entries))))))
 
 (defun process-menu-visit-buffer (button)