]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Sun, 21 Apr 2019 14:51:36 +0000 (07:51 -0700)
committerGlenn Morris <rgm@gnu.org>
Sun, 21 Apr 2019 14:51:36 +0000 (07:51 -0700)
037970f Document insert-image-file's return value (Bug#32978)
598b45a Autoload cua-toggle-rectangle-mark (Bug#34947)
95bd56d Tell xclip not to expect job-control under eshell (Bug#35257)
9997bbb ; * src/emacs.c: Fix typo in comment (Bug#35320).
a4ad7be Fix off-by-one-link error in image--set-property

1  2 
lisp/emulation/cua-base.el
lisp/eshell/esh-proc.el
lisp/image-file.el
lisp/image.el
src/emacs.c

Simple merge
Simple merge
Simple merge
diff --cc lisp/image.el
Simple merge
diff --cc src/emacs.c
Simple merge