]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Mon, 10 Sep 2018 20:12:38 +0000 (13:12 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 10 Sep 2018 20:12:38 +0000 (13:12 -0700)
commit0407733ef3d4e8e133e91917097dbc9bcc688b47
tree9223757d1d54460b3ca0e7867636072a51cd55f2
parent6e050694f247671e67c1eabace36cf9792ab4451
parent7efcdf7b3e70f0334caa328cbb5b05a4e30099bd
Merge from origin/emacs-26

7efcdf7 (origin/emacs-26) Clarify completion text in the ELisp manual
30b0b0e Fix handling of abbreviated control command in gdb-mi.el
5cf282d Clarify documentation of functions reading character events
96281c5 Record :version for built-in variables while dumping
82160cf * src/process.c (connect_network_socket): Fix memory leak.  (...
6c616e4 * Makefile.in (appdatadir): Use the non-obsolete location "me...
9618e16 Better fix for bug#32550
30d94e4 Fix Bug#32550
57bcdc7 Don't call XGetGeometry for frames without outer X window (Bu...
82fc6b6 * lisp/calculator.el: Fix doc typo.
ddc7c64 Standardize calc bug reporting instructions

Conflicts:
lisp/cus-start.el
12 files changed:
Makefile.in
doc/lispref/minibuf.texi
doc/misc/calc.texi
lisp/calc/calc.el
lisp/cus-start.el
lisp/net/tramp.el
lisp/progmodes/gdb-mi.el
lisp/rfn-eshadow.el
src/keymap.c
src/lread.c
src/process.c
src/xfns.c