diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-03-11 13:32:13 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-03-11 13:32:13 -0800 |
| commit | a934bf445ffaa7920aa1dfea47fe08920bbbc94c (patch) | |
| tree | dae27dd7ebeb733768ac5091c1c4d6b4749689e1 /lisp/dabbrev.el | |
| parent | b7ad5db04ba068ac9cbcfb9a02291e957d093a32 (diff) | |
| parent | 620951fe22a6ecc2edc1f78d961f52566a7fe2b6 (diff) | |
| download | emacs-a934bf445ffaa7920aa1dfea47fe08920bbbc94c.tar.gz emacs-a934bf445ffaa7920aa1dfea47fe08920bbbc94c.tar.bz2 emacs-a934bf445ffaa7920aa1dfea47fe08920bbbc94c.zip | |
Merge from origin/emacs-25
620951f Fix previous fix of enlarge-/shrink-window
2e78353 * lisp/isearch.el (isearch-define-mode-toggle): Fix toggling logic
66d2717 Complete temperature units in calc-convert-temperature
dbb02bf Make sure to use case-sensitive search
8b01e69 Prevent infinite loop on not-well-formed xml. (Bug#16344)
100346a Add the missing test case for the previous patch
5aba61e Use the correct dabbrev expansion
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) ;;;---------------------------------------------------------------- |