]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:09:09 +0000 (14:09 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:09:09 +0000 (14:09 -0700)
9a41cd1 ; Fix typo
9356fe2 Expand FIXME near definition of fboundp
219b39f kill-rectangle should mention killed-rectangle
59fa4c3 Avoid assertion violations in nhexl-mode

1  2 
lisp/rect.el
src/bidi.c
src/data.c

diff --cc lisp/rect.el
Simple merge
diff --cc src/bidi.c
Simple merge
diff --cc src/data.c
Simple merge