Improve cape--case-replace

1 files changed, 6 insertions, 2 deletions

diff --git a/cape.el b/cape.el
index ec9cbba..0d570ab 100644
--- a/cape.el
+++ b/cape.el
@@ -132,16 +132,20 @@ The buffers are scanned for completion candidates by `cape-line'."
 (defun cape--case-replace-list (flag input strs)
   "Replace case of STRS depending on INPUT and FLAG."
   (if (and (if (eq flag 'case-replace) case-replace flag)
-           (not (equal input "")))
+           (string-match-p "\\`[[:upper:]]" input))
       (mapcar (apply-partially #'cape--case-replace flag input) strs)
     strs))
 
 (defun cape--case-replace (flag input str)
   "Replace case of STR depending on INPUT and FLAG."
   (or (and (if (eq flag 'case-replace) case-replace flag)
-           (not (equal input ""))
            (string-prefix-p input str t)
+           (string-match-p "\\`[[:upper:]]" input)
            (save-match-data
+             ;; Ensure that single character uppercase input does not lead to an
+             ;; all uppercase result.
+             (when (and (= (length input) 1) (> (length str) 1))
+               (setq input (concat input (substring str 1 2))))
              (and (string-match input input)
                   (replace-match str nil nil input))))
       str))