1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Merge from origin/emacs-26

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
This commit is contained in:
Glenn Morris 2019-04-21 07:51:36 -07:00
commit 50d00e7153
6 changed files with 57 additions and 6 deletions

View file

@ -602,6 +602,7 @@ a cons (TYPE . COLOR), then both properties are affected."
(autoload 'cua-set-rectangle-mark "cua-rect"
"Start rectangle at mouse click position." t nil)
(autoload 'cua-toggle-rectangle-mark "cua-rect" nil t)
;; Stub definitions until it is loaded
(defvar cua--rectangle)