- (unless (zerop (car boundaries))
- (let ((before (substring arg 0 (car boundaries))))
- (setq candidates
- (mapcar (lambda (candidate)
- (concat before candidate))
- candidates))))
- (if sortfun (funcall sortfun candidates) candidates)))))
+ (when sortfun
+ (setq candidates (funcall sortfun candidates)))
+ (if (not (zerop (car boundaries)))
+ (let ((before (substring arg 0 (car boundaries))))
+ (mapcar (lambda (candidate)
+ (concat before candidate))
+ candidates))
+ candidates)))))