diff --git a/lisp/shell.el b/lisp/shell.el index 2730c417b49..acaa8e1f860 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -996,7 +996,7 @@ Make the shell buffer the current buffer, and return it. (lambda (proc event) (when sentinel (funcall sentinel proc event)) - (unless (buffer-live-p proc) + (unless (process-live-p proc) (kill-buffer buffer)))))) buffer) diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index c79ac50cfc3..98c69b48691 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -161,7 +161,7 @@ proceed to mark and unmark other entries, without asking." :version "31.1") (defcustom vc-dir-auto-hide-up-to-date nil - "Whether VC-Dir automatically removes \\+`up-to-date'/\\+`ignored' files from display. + "Whether VC-Dir auto-removes \\+`up-to-date'/\\+`ignored' files from display. If the value is nil, files shown in the VC-Dir buffer will remain on display if they become \\+`up-to-date' or \\+`ignored'. diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index 353d546fce4..3871d0f64c4 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -868,7 +868,8 @@ extension (xpm, xbm, gif, jpg, or png) located in image) ((stringp image) ;; A string. Look it up in relevant directories. - (let* ((load-path (cons widget-image-directory load-path)) + (let* ((image-load-path (cons widget-image-directory + image-load-path)) specs) (dolist (elt widget-image-conversion) (dolist (ext (cdr elt))