|
@@ -52,7 +52,7 @@ not be updated until you restart Emacs.")
|
|
|
|
|
|
;;; Debug messages
|
|
;;; Debug messages
|
|
|
|
|
|
-(defvar ido-cr+-debug-mode nil)
|
|
|
|
|
|
+(defvar ido-cr+-debug-mode)
|
|
|
|
|
|
;; Defined as a macro for efficiency (args are not evaluated unless
|
|
;; Defined as a macro for efficiency (args are not evaluated unless
|
|
;; debug mode is on)
|
|
;; debug mode is on)
|
|
@@ -285,11 +285,11 @@ sets up C-j to be equivalent to TAB in the same situation."
|
|
;; Only if using ico-cr+
|
|
;; Only if using ico-cr+
|
|
ido-cr+-enable-this-call
|
|
ido-cr+-enable-this-call
|
|
;; Only if require-match is non-nil
|
|
;; Only if require-match is non-nil
|
|
- (bound-and-true-p ido-require-match)
|
|
|
|
|
|
+ ido-require-match
|
|
;; Only if current text is non-empty
|
|
;; Only if current text is non-empty
|
|
(not (string= ido-text ""))
|
|
(not (string= ido-text ""))
|
|
;; Only if current text is not a complete choice
|
|
;; Only if current text is not a complete choice
|
|
- (not (member ido-text (bound-and-true-p ido-cur-list))))
|
|
|
|
|
|
+ (not (member ido-text ido-cur-list)))
|
|
(progn
|
|
(progn
|
|
(ido-cr+--debug-message
|
|
(ido-cr+--debug-message
|
|
"Overriding C-j behavior for require-match: performing completion instead of exiting.")
|
|
"Overriding C-j behavior for require-match: performing completion instead of exiting.")
|