bug#24238: 25.1.50; error in capf in sh-script if imenu-index is empty

[Andreas Politz <politza@hochschule-trier.de>]

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


The completion function sh--cmd-completion-table in sh-script.el may use
imenu--make-index-alist to create a list of candidates.  But this
function signals the error imenu-unavailable, if the index is empty.
This is a commonly the case, e.g. if the scripts is new.

Solution: Catch the error condition.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: sh-script.diff --]
[-- Type: text/x-diff, Size: 754 bytes --]

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 7a9e6c7..5d362e4 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1744,7 +1744,10 @@ sh--vars-before-point
 (defun sh--cmd-completion-table (string pred action)
   (let ((cmds
          (append (when (fboundp 'imenu--make-index-alist)
-                   (mapcar #'car (imenu--make-index-alist)))
+                   (mapcar #'car
+                           (condition-case nil
+                               (imenu--make-index-alist)
+                             (imenu-unavailable nil))))
                  (mapcar (lambda (v) (concat v "="))
                          (sh--vars-before-point))
                  (locate-file-completion-table

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


-ap