ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-11-22 10:52:53 +01:00
parent 7a726dd137 b88b5d4fd1
commit 0a4d192b79
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org-compat.el
View File

@ -190,10 +190,12 @@ If DELETE is non-nil, delete all those overlays."
found)) found))
(defun org-get-x-clipboard (value) (defun org-get-x-clipboard (value)
"Get the value of the x clipboard, compatible with XEmacs, and GNU Emacs 21." "Get the value of the x or Windows clipboard, compatible with XEmacs, and GNU Emacs 21."
(if (eq window-system 'x) (cond ((eq window-system 'x)
(let ((x (org-get-x-clipboard-compat value))) (let ((x (org-get-x-clipboard-compat value)))
(if x (org-no-properties x))))) (if x (org-no-properties x))))
((and (eq window-system 'w32) (fboundp 'w32-get-clipboard-data))
(w32-get-clipboard-data))))
(defsubst org-decompose-region (beg end) (defsubst org-decompose-region (beg end)
"Decompose from BEG to END." "Decompose from BEG to END."