diff options
| author | Alan Third <alan@idiocy.org> | 2016-03-02 17:20:47 +0000 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-03-02 17:21:38 +0000 |
| commit | 5aba61ea21069f38896845ece2f5b4850535698c (patch) | |
| tree | 48a831e2eb676b573d9653019118ff5fd80bad78 /lisp/dabbrev.el | |
| parent | 6287381da495ac5cc2a2a4acb7f49825677a44c8 (diff) | |
| download | emacs-5aba61ea21069f38896845ece2f5b4850535698c.tar.gz | |
Use the correct dabbrev expansion
lisp/dabbrev.el (dabbrev--substitute-expansion): Return EXPANSION after
any processing.
lisp/dabbrev.el (dabbrev-expand): Set EXPANSION to the return value of
DABBREV--SUBSTITUTE-EXPANSION.
test/automated/dabbrev-tests.el (dabbrev-expand-test): Test for bug#1948.
Diffstat (limited to 'lisp/dabbrev.el')
| -rw-r--r-- | lisp/dabbrev.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index 3557041f51c..d9f36b15290 100644 --- a/lisp/dabbrev.el +++ b/lisp/dabbrev.el @@ -546,8 +546,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]." (copy-marker dabbrev--last-expansion-location))) ;; Success: stick it in and return. (setq buffer-undo-list (cons orig-point buffer-undo-list)) - (dabbrev--substitute-expansion old abbrev expansion - record-case-pattern) + (setq expansion (dabbrev--substitute-expansion old abbrev expansion + record-case-pattern)) ;; Save state for re-expand. (setq dabbrev--last-expansion expansion) @@ -902,7 +902,9 @@ to record whether we upcased the expansion, downcased it, or did neither." ;; and (2) the replacement itself is all lower case. (dabbrev--safe-replace-match expansion (not use-case-replace) - t))) + t)) + ;; Return the expansion actually used. + expansion) ;;;---------------------------------------------------------------- |