From 67186c357974a7acb81b514380c8155d023ee70d Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sun, 22 Dec 2024 12:53:12 +0100 Subject: [PATCH] update eldoc Signed-off-by: Andreas Gerler --- elpa/eldoc-1.14.0.signed | 1 - elpa/eldoc-1.15.0.signed | 1 + .../eldoc-autoloads.el | 64 +++++++-------- .../eldoc-pkg.el | 2 +- elpa/{eldoc-1.14.0 => eldoc-1.15.0}/eldoc.el | 80 +++++++++++-------- 5 files changed, 78 insertions(+), 70 deletions(-) delete mode 100644 elpa/eldoc-1.14.0.signed create mode 100644 elpa/eldoc-1.15.0.signed rename elpa/{eldoc-1.14.0 => eldoc-1.15.0}/eldoc-autoloads.el (73%) rename elpa/{eldoc-1.14.0 => eldoc-1.15.0}/eldoc-pkg.el (54%) rename elpa/{eldoc-1.14.0 => eldoc-1.15.0}/eldoc.el (95%) diff --git a/elpa/eldoc-1.14.0.signed b/elpa/eldoc-1.14.0.signed deleted file mode 100644 index 161a4079..00000000 --- a/elpa/eldoc-1.14.0.signed +++ /dev/null @@ -1 +0,0 @@ -Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) (trust undefined) created at 2023-04-03T11:05:02+0200 using RSA \ No newline at end of file diff --git a/elpa/eldoc-1.15.0.signed b/elpa/eldoc-1.15.0.signed new file mode 100644 index 00000000..bc2fadb3 --- /dev/null +++ b/elpa/eldoc-1.15.0.signed @@ -0,0 +1 @@ +Good signature from 645357D2883A0966 GNU ELPA Signing Agent (2023) (trust undefined) created at 2024-03-31T11:25:02+0200 using EDDSA \ No newline at end of file diff --git a/elpa/eldoc-1.14.0/eldoc-autoloads.el b/elpa/eldoc-1.15.0/eldoc-autoloads.el similarity index 73% rename from elpa/eldoc-1.14.0/eldoc-autoloads.el rename to elpa/eldoc-1.15.0/eldoc-autoloads.el index 51131f88..5875d694 100644 --- a/elpa/eldoc-1.14.0/eldoc-autoloads.el +++ b/elpa/eldoc-1.15.0/eldoc-autoloads.el @@ -1,36 +1,22 @@ -;;; eldoc-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; +;;; eldoc-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + ;;; Code: -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + -;;;### (autoloads nil "eldoc" "eldoc.el" (0 0 0 0)) ;;; Generated autoloads from eldoc.el (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\ String to display in mode line when ElDoc Mode is enabled; nil for none.") - (custom-autoload 'eldoc-minor-mode-string "eldoc" t) - (autoload 'eldoc-mode "eldoc" "\ Toggle echo area display of Lisp objects at point (ElDoc mode). -This is a minor mode. If called interactively, toggle the `Eldoc -mode' mode. If the prefix argument is positive, enable the mode, -and if it is zero or negative, disable the mode. - -If called from Lisp, toggle the mode if ARG is `toggle'. Enable -the mode if ARG is nil, omitted, or is a positive number. -Disable the mode if ARG is a negative number. - -To check whether the minor mode is enabled in the current buffer, -evaluate `eldoc-mode'. - -The mode's hook is called both when the mode is enabled and when -it is disabled. - ElDoc mode is a buffer-local minor mode. When enabled, the echo area displays information about a function or variable in the text where point is. If point is on a documented variable, it @@ -38,10 +24,22 @@ displays the first line of that variable's doc string. Otherwise it displays the argument list of the function called in the expression point is on. -\(fn &optional ARG)" t nil) +This is a minor mode. If called interactively, toggle the `Eldoc mode' +mode. If the prefix argument is positive, enable the mode, and if it is +zero or negative, disable the mode. -(put 'global-eldoc-mode 'globalized-minor-mode t) +If called from Lisp, toggle the mode if ARG is `toggle'. Enable the +mode if ARG is nil, omitted, or is a positive number. Disable the mode +if ARG is a negative number. +To check whether the minor mode is enabled in the current buffer, +evaluate the variable `eldoc-mode'. + +The mode's hook is called both when the mode is enabled and when it is +disabled. + +(fn &optional ARG)" t) +(put 'global-eldoc-mode 'globalized-minor-mode t) (defcustom global-eldoc-mode t "\ Non-nil if Global Eldoc mode is enabled. See the `global-eldoc-mode' command @@ -49,9 +47,7 @@ for a description of this minor mode. Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') or call the function `global-eldoc-mode'." :set #'custom-set-minor-mode :initialize 'custom-initialize-delay :type 'boolean) - (custom-autoload 'global-eldoc-mode "eldoc" nil) - (autoload 'global-eldoc-mode "eldoc" "\ Toggle Eldoc mode in all buffers. With prefix ARG, enable Global Eldoc mode if ARG is positive; @@ -66,24 +62,22 @@ do it. See `eldoc-mode' for more information on Eldoc mode. -\(fn &optional ARG)" t nil) - +(fn &optional ARG)" t) (autoload 'turn-on-eldoc-mode "eldoc" "\ Turn on `eldoc-mode' if the buffer has ElDoc support enabled. -See `eldoc-documentation-strategy' for more detail." nil nil) - +See `eldoc-documentation-strategy' for more detail.") (register-definition-prefixes "eldoc" '("eldoc")) - -;;;*** -;;;### (autoloads nil nil ("eldoc-pkg.el") (0 0 0 0)) +;;; End of scraped data + +(provide 'eldoc-autoloads) -;;;*** - ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 +;; no-native-compile: t +;; coding: utf-8-emacs-unix ;; End: + ;;; eldoc-autoloads.el ends here diff --git a/elpa/eldoc-1.14.0/eldoc-pkg.el b/elpa/eldoc-1.15.0/eldoc-pkg.el similarity index 54% rename from elpa/eldoc-1.14.0/eldoc-pkg.el rename to elpa/eldoc-1.15.0/eldoc-pkg.el index efc83608..67d0eab9 100644 --- a/elpa/eldoc-1.14.0/eldoc-pkg.el +++ b/elpa/eldoc-1.15.0/eldoc-pkg.el @@ -1,2 +1,2 @@ ;; Generated package description from eldoc.el -*- no-byte-compile: t -*- -(define-package "eldoc" "1.14.0" "Show function arglist or variable docstring in echo area" '((emacs "26.3")) :commit "f2357df91f0262949618bd4da571d3267c1b1dfa" :url "https://elpa.gnu.org/packages/eldoc.html" :authors '(("Noah Friedman" . "friedman@splode.com")) :maintainer '("Noah Friedman" . "friedman@splode.com") :keywords '("extensions")) +(define-package "eldoc" "1.15.0" "Show function arglist or variable docstring in echo area" '((emacs "26.3")) :commit "dc744fe6f3cd185bd9d29f61b08cd4c524e3969e" :url "https://elpa.gnu.org/packages/eldoc.html" :authors '(("Noah Friedman" . "friedman@splode.com")) :maintainer '("Noah Friedman" . "friedman@splode.com") :keywords '("extensions")) diff --git a/elpa/eldoc-1.14.0/eldoc.el b/elpa/eldoc-1.15.0/eldoc.el similarity index 95% rename from elpa/eldoc-1.14.0/eldoc.el rename to elpa/eldoc-1.15.0/eldoc.el index 1eb0d38c..e28d73c3 100644 --- a/elpa/eldoc-1.14.0/eldoc.el +++ b/elpa/eldoc-1.15.0/eldoc.el @@ -5,7 +5,7 @@ ;; Author: Noah Friedman ;; Keywords: extensions ;; Created: 1995-10-06 -;; Version: 1.14.0 +;; Version: 1.15.0 ;; Package-Requires: ((emacs "26.3")) ;; This is a GNU ELPA :core package. Avoid functionality that is not @@ -65,7 +65,8 @@ If this variable is set to 0, display the documentation without any delay." (defcustom eldoc-print-after-edit nil "If non-nil, eldoc info is only shown after editing commands. Changing the value requires toggling `eldoc-mode'." - :type 'boolean) + :type 'boolean + :version "24.4") (defcustom eldoc-echo-area-display-truncation-message t "If non-nil, provide verbose help when a message has been truncated. @@ -132,7 +133,10 @@ documentation in the echo area if the dedicated documentation buffer (displayed by `eldoc-doc-buffer') is already displayed in some window. If the value is the symbol `maybe', then the echo area is only skipped if the documentation needs to be truncated there." - :type 'boolean) + :type '(choice (const :tag "Prefer ElDoc's documentation buffer" t) + (const :tag "Prefer echo area" nil) + (const :tag "Skip echo area if truncating" maybe)) + :version "28.1") (defface eldoc-highlight-function-argument '((t (:inherit bold))) @@ -601,25 +605,29 @@ known to be truncated." 'maybe))) (get-buffer-window eldoc--doc-buffer t))) -(defun eldoc-display-in-echo-area (docs _interactive) +(defun eldoc-display-in-echo-area (docs interactive) "Display DOCS in echo area. -Honor `eldoc-echo-area-use-multiline-p' and +INTERACTIVE is non-nil if user explictly invoked ElDoc. Honor +`eldoc-echo-area-use-multiline-p' and `eldoc-echo-area-prefer-doc-buffer'." (cond - (;; Check if we have permission to mess with echo area at all. For - ;; example, if this-command is non-nil while running via an idle - ;; timer, we're still in the middle of executing a command, e.g. a - ;; query-replace where it would be annoying to overwrite the echo - ;; area. - (or - (not (eldoc-display-message-no-interference-p)) - this-command - (not (eldoc--message-command-p last-command)))) - (;; If we do but nothing to report, clear the echo area. + ((and (not interactive) + ;; When called non-interactively, check if we have permission + ;; to mess with echo area at all. For example, if + ;; this-command is non-nil while running via an idle timer, + ;; we're still in the middle of executing a command, e.g. a + ;; query-replace where it would be annoying to overwrite the + ;; echo area. + (or + (not (eldoc-display-message-no-interference-p)) + this-command + (not (eldoc--message-command-p last-command))))) + (;; If nothing to report, clear the echo area. (null docs) (eldoc--message nil)) (t - ;; Otherwise, establish some parameters. + ;; Otherwise, proceed to change the echo area. Start by + ;; establishing some parameters. (let* ((width (1- (window-width (minibuffer-window)))) (val (if (and (symbolp eldoc-echo-area-use-multiline-p) @@ -681,29 +689,34 @@ This is the default value for `eldoc-documentation-strategy'." (lambda (f) (funcall f (eldoc--make-callback :eager f))))) -(defun eldoc--documentation-compose-1 (eagerlyp) - "Helper function for composing multiple doc strings. -If EAGERLYP is non-nil show documentation as soon as possible, -else wait for all doc strings." - (run-hook-wrapped 'eldoc-documentation-functions - (lambda (f) - (let* ((callback (eldoc--make-callback - (if eagerlyp :eager :patient) - f)) - (str (funcall f callback))) - (if (or (null str) (stringp str)) (funcall callback str)) - nil))) - t) - (defun eldoc-documentation-compose () "Show multiple documentation strings together after waiting for all of them. This is meant to be used as a value for `eldoc-documentation-strategy'." - (eldoc--documentation-compose-1 nil)) + (let (fns-and-callbacks) + ;; Make all the callbacks, setting up state inside + ;; `eldoc--invoke-strategy' to know how many callbacks to wait for + ;; before displaying the result (bug#62816). + (run-hook-wrapped 'eldoc-documentation-functions + (lambda (f) + (push (cons f (eldoc--make-callback :patient f)) + fns-and-callbacks) + nil)) + ;; Now call them. The last one will trigger the display. + (cl-loop for (f . callback) in fns-and-callbacks + for str = (funcall f callback) + when (or (null str) (stringp str)) do (funcall callback str))) + t) (defun eldoc-documentation-compose-eagerly () "Show multiple documentation strings one by one as soon as possible. This is meant to be used as a value for `eldoc-documentation-strategy'." - (eldoc--documentation-compose-1 t)) + (run-hook-wrapped 'eldoc-documentation-functions + (lambda (f) + (let* ((callback (eldoc--make-callback :eager f)) + (str (funcall f callback))) + (if (or (null str) (stringp str)) (funcall callback str)) + nil))) + t) (defun eldoc-documentation-enthusiast () "Show most important documentation string produced so far. @@ -986,7 +999,8 @@ the docstrings eventually produced, using "mark-paragraph" "mouse-set-point" "move-" "move-beginning-of-" "move-end-of-" "newline" "next-" "other-window" "pop-global-mark" "previous-" "recenter" "right-" "scroll-" "self-insert-command" - "split-window-" "up-list") + "split-window-" "up-list" "touch-screen-handle-touch" + "analyze-text-conversion") (provide 'eldoc) -- 2.47.3