emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/bash-completion dda29cb470 137/313: Fix backward-compatibi


From: ELPA Syncer
Subject: [nongnu] elpa/bash-completion dda29cb470 137/313: Fix backward-compatibility code for supporting pre-24 Emacs versions,
Date: Sat, 3 Dec 2022 10:59:24 -0500 (EST)

branch: elpa/bash-completion
commit dda29cb47047d77d6c44ba7b3889a3754ddf3156
Author: Stephane Zermatten <szermatt@gmx.net>
Commit: Stephane Zermatten <szermatt@gmx.net>

    Fix backward-compatibility code for supporting pre-24 Emacs versions,
    broken by f639154.
---
 bash-completion.el | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/bash-completion.el b/bash-completion.el
index 24fff16cc3..a58bf9486f 100644
--- a/bash-completion.el
+++ b/bash-completion.el
@@ -308,18 +308,16 @@ When doing completion outside of a comint buffer, call
             (if bash-completion-comint-uses-standard-completion
                 result
               ;; pre-emacs 24.1 compatibility code
-              (let ((result (bash-completion-dynamic-complete-0)))
-                (when result
-                  (let ((stub (buffer-substring-no-properties
-                               (nth 0 result)
-                               (nth 1 result)))
-                        (completions (nth 2 result))
-                        ;; Setting comint-completion-addsuffix overrides
-                        ;; configuration for comint-dynamic-simple-complete.
-                        ;; Bash adds a space suffix automatically.
-                        (comint-completion-addsuffix nil))
-                    (with-no-warnings
-                      (comint-dynamic-simple-complete stub completions)))))))
+              (let ((stub (buffer-substring-no-properties
+                           (nth 0 result)
+                           (nth 1 result)))
+                    (completions (nth 2 result))
+                    ;; Setting comint-completion-addsuffix overrides
+                    ;; configuration for comint-dynamic-simple-complete.
+                    ;; Bash adds a space suffix automatically.
+                    (comint-completion-addsuffix nil))
+                (with-no-warnings
+                  (comint-dynamic-simple-complete stub completions)))))
         ;; cleanup
         (if message-timer
             (cancel-timer message-timer)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]