]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Mon, 10 Dec 2018 17:43:05 +0000 (09:43 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 10 Dec 2018 17:43:05 +0000 (09:43 -0800)
commit3d353ce585e4f9726b59b054218aaa0923d77fea
tree985b48667adc151eff87dfd85ac598c2c23c3fd0
parent874f69acecf0c6c3c4886375c092fb389d207241
parent908af9dfc46f783c89d06cb48d9499eb6a582d3e
Merge from origin/emacs-26

908af9d Indexing followup to recent changes
505ac9a Improve documentation of cursor-sensor.el (bug#33664)
d817d2c * doc/lispref/commands.texi (Adjusting Point): Bug#33662
18442da Tramp multi-hop methods must be inline
1e3e24d ; * src/xterm.c (x_update_begin): Fix whitespace.
1d743d2 Fix scaling problem in Cairo builds
2b9e993 ; * doc/lispref/text.texi (Special Properties): Fix wording. ...
e568202 * lisp/simple.el (next-line-or-history-element): Use current-...
c7897c2 A few further fixes of window internals description

# Conflicts:
# doc/misc/tramp.texi
doc/lispref/internals.texi
doc/lispref/text.texi
doc/misc/tramp.texi
lisp/simple.el
src/window.h
src/xterm.c