]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ffd6a03 9fc9988)
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2016 20:39:17 +0000 (13:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2016 20:39:17 +0000 (13:39 -0700)
commita2513667af6c1cfc58e971b9a5476cd5edfaef1c
tree1e02fcc7d96e31aedb28ebb618b8e3f484be9c9atree | snapshot
parentffd6a03521de0a177db217e56cd6564ef60348fecommit | diff
parent9fc9988d4d08028fb37c588f5e0483ac85b713d3commit | diff
Merge from origin/emacs-25

9fc9988 Improve documentation of 'expand-abbrev' and wrapper hooks
c14a1d4 Minor copyedits of MS-Windows installation instructions
f281924 Fix display of cursor when 'blink-cursor-delay' has small value

# Conflicts:
# lisp/minibuffer.el
doc/lispref/text.texi diff1 | diff2 | blob | history
lisp/abbrev.el diff1 | diff2 | blob | history
lisp/frame.el diff1 | diff2 | blob | history
lisp/minibuffer.el diff1 | diff2 | blob | history
lisp/simple.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.