瀏覽代碼

Revert "Check if variables are unbound"

This commit fixed some compiler warnings for some people, but apparently
generates a lot more for other people. Of course, I've never been able
to reproduce any of these warnings myself.

This reverts commit d4cb80a391b5da9843d09315278b37d03b9eca7b.
Ryan C. Thompson 10 年之前
父節點
當前提交
271c5e2b1d
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      ido-completing-read+.el

+ 3 - 3
ido-completing-read+.el

@@ -52,7 +52,7 @@ not be updated until you restart Emacs.")
 
 ;;; Debug messages
 
-(defvar ido-cr+-debug-mode nil)
+(defvar ido-cr+-debug-mode)
 
 ;; Defined as a macro for efficiency (args are not evaluated unless
 ;; 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+
        ido-cr+-enable-this-call
        ;; Only if require-match is non-nil
-       (bound-and-true-p ido-require-match)
+       ido-require-match
        ;; Only if current text is non-empty
        (not (string= ido-text ""))
        ;; 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
         (ido-cr+--debug-message
          "Overriding C-j behavior for require-match: performing completion instead of exiting.")