diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2026-05-29 11:01:26 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2026-05-29 11:01:26 +0100 |
| commit | ee1092aaace1dfa18597be2c2d8a90911d5cbc23 (patch) | |
| tree | 2bb703ffe617f9bf0634b7b5fa4bed399429e3ad /lisp | |
| parent | 00771a87c3bd42f497412c3420fac79be6fcab38 (diff) | |
| parent | 24879846852a577a348eb45c935ac2b31b632d94 (diff) | |
Merge from origin/emacs-31
24879846852 * lisp/shell.el (shell): Fix typo: use process-live-p (bu...
545bbc6ebe8 widget-image-find: Use 'image-load-path' (bug#81140)
69286be27db ; Fix an overwide docstring line.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/shell.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-dir.el | 2 | ||||
| -rw-r--r-- | lisp/wid-edit.el | 3 |
3 files changed, 4 insertions, 3 deletions
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)) |