(dabbrev-expand): When no more expansions,

Put back the original abbrev with its original case pattern.

1 files changed, 4 insertions, 2 deletions

diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index a28c9023571..8dbe0629239 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -490,8 +490,10 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
       (if old
           (save-excursion
             (setq buffer-undo-list (cons orig-point buffer-undo-list))
-            (search-backward (substring old (length abbrev)))
-            (delete-region (match-beginning 0) (match-end 0))))
+            ;; Put back the original abbrev with its original case pattern.
+            (search-backward old)
+            (insert abbrev)
+            (delete-region (point) (+ (point) (length old)))))
       (error "No%s dynamic expansion for `%s' found"
              (if old " further" "") abbrev))
      (t