Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 04:21:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from origin/emacs-31

Browse source 
2487984685 * lisp/shell.el (shell): Fix typo: use process-live-p (bu...
545bbc6ebe widget-image-find: Use 'image-load-path' (bug#81140)
69286be27d ; Fix an overwide docstring line.
This commit is contained in:
Sean Whitton 2026-05-29 11:01:26 +01:00
commit ee1092aaac
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/shell.el
View file

@ -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)

2
lisp/vc/vc-dir.el
View file

@ -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'.

3
lisp/wid-edit.el
View file

@ -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))