1 files changed, 6 insertions, 7 deletions
diff --git a/cape.el b/cape.el
index 1e9587b..ec9cbba 100644
--- a/cape.el
+++ b/cape.el
@@ -138,14 +138,13 @@ The buffers are scanned for completion candidates by `cape-line'."
 
 (defun cape--case-replace (flag input str)
   "Replace case of STR depending on INPUT and FLAG."
-  (if (and (if (eq flag 'case-replace) case-replace flag)
+  (or (and (if (eq flag 'case-replace) case-replace flag)
            (not (equal input ""))
-           (string-prefix-p input str t))
-      (save-match-data
-        (if (string-match input input)
-            (replace-match str nil nil input)
-          str))
-    str))
+           (string-prefix-p input str t)
+           (save-match-data
+             (and (string-match input input)
+                  (replace-match str nil nil input))))
+      str))
 
 (defmacro cape--silent (&rest body)
   "Silence BODY."