]> code.delx.au - gnu-emacs/commit
delx.au / code / gnu-emacs / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: b7ad5db 620951f)
Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Fri, 11 Mar 2016 21:32:13 +0000 (13:32 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Fri, 11 Mar 2016 21:32:13 +0000 (13:32 -0800)
commita934bf445ffaa7920aa1dfea47fe08920bbbc94c
treedae27dd7ebeb733768ac5091c1c4d6b4749689e1tree
parentb7ad5db04ba068ac9cbcfb9a02291e957d093a32commit | diff
parent620951fe22a6ecc2edc1f78d961f52566a7fe2b6commit | diff
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
lisp/window.el diff1 | diff2 | blob | history
test/lisp/xml-tests.el diff1 | diff2 | blob | history