Skip to content

Commit

Permalink
No need to handle 'confirm at end of cr fns now it is handled elsewhere.
Browse files Browse the repository at this point in the history
* helm-mode.el (helm-comp-read): Do it.
(helm-read-file-name):           Do it.
  • Loading branch information
Thierry Volpiatto committed Jun 16, 2016
1 parent ba76728 commit 38b12a6
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions helm-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -525,19 +525,7 @@ that use `helm-comp-read' See `helm-M-x' for example."
(setcar history result))
(t ; Possibly a symbol with a nil value.
(set history (list result)))))
(or
result
(when (and (eq helm-exit-status 0)
(eq must-match 'confirm))
;; Return empty string only if it is the DEFAULT
;; value and helm-pattern is empty.
;; otherwise return helm-pattern
(if (and (string= helm-pattern "") default)
default (identity helm-pattern)))
(unless (or (eq helm-exit-status 1)
must-match) ; FIXME this should not be needed now.
default)
(helm-mode--keyboard-quit)))))
(or result (helm-mode--keyboard-quit)))))

;; Generic completing-read
;;
Expand Down Expand Up @@ -909,10 +897,6 @@ Keys description:
((and result (listp result))
(mapcar #'expand-file-name result))
(t result))
(when (and (not (string= helm-pattern ""))
(eq helm-exit-status 0)
(eq must-match 'confirm))
(identity helm-pattern))
(helm-mode--keyboard-quit))))

(defun helm-mode--default-filename (fname dir initial)
Expand Down

0 comments on commit 38b12a6

Please sign in to comment.