branch: elpa/bash-completion
commit dda29cb47047d77d6c44ba7b3889a3754ddf3156
Author: Stephane Zermatten <[email protected]>
Commit: Stephane Zermatten <[email protected]>
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)))))
