(dabbrev-expand): When no more expansions,

Put back the original abbrev with its original case pattern.

diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index a28c90235711516fdeee38b851266dfb21a4d867..8dbe0629239ce3c6222b2e3e081fc42ec1021263 100644 (file)
--- 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