procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better handle errors after sync man invocations

Browse source 
* lisp/man.el (Man-start-calling): Declare as debuggable.
(Man-getpage-in-background): Call `Man-bgproc-sentinel' with a
cons (BUFFER . EXIT-STATUS) as PROCESS argument for synchronous calls.
(Man-bgproc-sentinel): Use that information to handle those more
similarly to asynchronous calls.  Do not employ window selection hacks
for synchronous calls.  (Bug#77755)
This commit is contained in:
Jens Schmidt 2025-04-12 00:02:56 +02:00 • committed by Juri Linkov
parent 1d3b1b7d88
commit f67e64028e
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
lisp/man.el
View file

@ -1166,6 +1166,7 @@ for the current invocation."
(defmacro Man-start-calling (&rest body)
"Start the man command in `body' after setting up the environment."
(declare (debug t))
`(let ((process-environment (copy-sequence process-environment))
;; The following is so Awk script gets \n intact
;; But don't prevent decoding of the outside.
@ -1253,7 +1254,7 @@ Return the buffer in which the manpage will appear."
exit-status)))
(setq msg exit-status))
(man--maybe-fontify-manpage)
(Man-bgproc-sentinel bufname msg))))))
(Man-bgproc-sentinel (cons buffer exit-status) msg))))))
buffer))
(defun Man-update-manpage ()
@ -1541,17 +1542,26 @@ command is run. Second argument STRING is the entire string of output."
"Manpage background process sentinel.
When manpage command is run asynchronously, PROCESS is the process
object for the manpage command; when manpage command is run
synchronously, PROCESS is the name of the buffer where the manpage
command is run. Second argument MSG is the exit message of the
manpage command."
(let ((Man-buffer (if (stringp process) (get-buffer process)
(process-buffer process)))
synchronously, PROCESS is a cons (BUFFER . EXIT-STATUS) of the buffer
where the manpage command has run and the exit status of the manpage
command. Second argument MSG is the exit message of the manpage
command."
(let ((asynchronous (processp process))
Man-buffer process-status exit-status
(delete-buff nil)
message)
(if asynchronous
(setq Man-buffer (process-buffer process)
process-status (process-status process)
exit-status (process-exit-status process))
(setq Man-buffer (car process)
process-status 'exit
exit-status (cdr process)))
(if (not (buffer-live-p Man-buffer)) ;; deleted buffer
(or (stringp process)
(set-process-buffer process nil))
(and asynchronous
(set-process-buffer process nil))
(with-current-buffer Man-buffer
(save-excursion
@ -1570,15 +1580,14 @@ manpage command."
;; `Man-highlight-references'. The \\s- bits here are
;; meant to allow for multiple options with -k among them.
((and (string-match "\\(\\`\\|\\s-\\)-k\\s-" Man-arguments)
(eq (process-status process) 'exit)
(= (process-exit-status process) 0)
(eq process-status 'exit)
(= exit-status 0)
(= (point-min) (point-max)))
(setq message (format "%s: no matches" Man-arguments)
delete-buff t))
((or (stringp process)
(not (and (eq (process-status process) 'exit)
(= (process-exit-status process) 0))))
((not (and (eq process-status 'exit)
(= exit-status 0)))
(or (zerop (length msg))
(progn
(setq message
@ -1630,10 +1639,13 @@ manpage command."
(progn
(quit-restore-window
(get-buffer-window Man-buffer t) 'kill)
;; Ensure that we end up in the correct window.
(let ((old-window (old-selected-window)))
(when (window-live-p old-window)
(select-window old-window))))
;; Ensure that we end up in the correct window. Which is
;; only relevant in rather special cases and if we have
;; been called in an asynchronous fashion, see bug#38164.
(and asynchronous
(let ((old-window (old-selected-window)))
(when (window-live-p old-window)
(select-window old-window)))))
(kill-buffer Man-buffer)))
(when message