]> git.eshelyaron.com Git - emacs.git/commit
Merge from emacs-26
authorNoam Postavsky <npostavs@gmail.com>
Wed, 26 Jun 2019 02:04:13 +0000 (22:04 -0400)
committerNoam Postavsky <npostavs@gmail.com>
Wed, 26 Jun 2019 02:04:13 +0000 (22:04 -0400)
commit9552ee4df7d2ceebb8728a61d00598aa981b580c
tree5bd393a52f3f1b0510ff77fb2bd38e4a2c00ad8c
parentc7a59d87b5726725cffa51a1f432f0961548dbe3
parente62ad04963982ea9cc7622b32484778845bc2ec1
Merge from emacs-26

e62ad04963 Fix sgml-mode handling of quotes within parens (Bug#36347)
06b35b2f92 ; * lisp/frame.el: Enhance add-variable-watcher commentary.
572e34bb6f Rename 'make-symbolic-link' argument NEWNAME to LINKNAME
04477adedc Check that length of data returned by sysctl is non-zero
81535eeadb * test/lisp/progmodes/python-tests.el (python-virt-bin): D...
9d48979ca8 Fix Python tests depending on system-type
fcf6cc3177 Fix problem with wdired test when symlinks cannot be created.
4701e0663e Improve wording of documentation of click events

# Conflicts:
# lisp/textmodes/sgml-mode.el
# test/lisp/textmodes/sgml-mode-tests.el
doc/lispref/commands.texi
doc/lispref/files.texi
lisp/frame.el
lisp/textmodes/sgml-mode.el
src/fileio.c
src/filelock.c
src/sysdep.c
test/lisp/progmodes/python-tests.el
test/lisp/textmodes/sgml-mode-tests.el
test/lisp/wdired-tests.el