bug#35663: 27.0.50; Eldoc support for apply

[Michael Heerdegen <michael_heerdegen@web.de>]

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]


Hello,

when editing something like

(apply #'call-process
  (car command)
  nil
  (if stderr-file (list t stderr-file) t)
  nil
  (append (cdr command) (list archive name)))

eldoc support would be useful to see the argument names of
'call-process' instead of the signature of 'apply'.

Would doing something like this be acceptable?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-WIP-Make-eldoc-handle-apply-specially.patch --]
[-- Type: text/x-diff, Size: 1540 bytes --]

From 5eb45fe4a22bb8d130e5318335439b11ef00623b Mon Sep 17 00:00:00 2001
From: Michael Heerdegen <michael_heerdegen@web.de>
Date: Fri, 10 May 2019 02:00:18 +0200
Subject: [PATCH] WIP: Make eldoc handle 'apply' specially

---
 lisp/progmodes/elisp-mode.el | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index cb1b17b447..7631bc60b1 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -1356,6 +1356,16 @@ elisp-eldoc-documentation-function
 	  ((eq current-symbol (car current-fnsym))
 	   (or (apply #'elisp-get-fnsym-args-string current-fnsym)
 	       (elisp-get-var-docstring current-symbol)))
+          ((and (memq (car current-fnsym) '(apply apply-partially))
+                (< 1 (cadr current-fnsym))
+                (let ((args (save-excursion
+                              (let ((argument-index (- (elisp--beginning-of-sexp) 2)))
+                                (forward-sexp)
+                                (save-match-data
+                                  (and (looking-at (rx (* (or space "\n")) (or "`" "'" "#'")))
+                                       (goto-char (match-end 0))
+                                       (list (elisp--current-symbol) argument-index)))))))
+                  (and args (apply #'elisp-get-fnsym-args-string args)))))
 	  (t
 	   (or (elisp-get-var-docstring current-symbol)
 	       (apply #'elisp-get-fnsym-args-string current-fnsym))))))
--
2.20.1


[-- Attachment #3: Type: text/plain, Size: 288 bytes --]


We could also make the displayed text more special to show that this is
actually an 'apply' call and handle the last argument specially but I
think it would be overkill to add so much code for this side case.  OTOH
the suggested patch above already feels like a big relief.


Michael.