[Emacs-diffs] Changes to emacs/lisp/org/org-compat.el,v

[Carsten Dominik]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Carsten Dominik <cdominik>      08/10/12 06:12:47

Index: org-compat.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-compat.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- org-compat.el       25 Jul 2008 23:02:14 -0000      1.6
+++ org-compat.el       12 Oct 2008 06:12:45 -0000      1.7
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06b
+;; Version: 6.09a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -30,6 +30,8 @@
 
 ;;; Code:
 
+(require 'org-macs)
+
 (defconst org-xemacs-p (featurep 'xemacs)) ; not used by org.el itself
 (defconst org-format-transports-properties-p
   (let ((x "a"))
@@ -246,6 +248,22 @@
                              (cadr ext-inv-spec))))
    (move-to-column column force)))
  
+(defun org-get-x-clipboard-compat (value)
+  "Get the clipboard value on XEmacs or Emacs 21"
+  (cond (org-xemacs-p (org-no-warnings (get-selection-no-error value)))
+       ((fboundp 'x-get-selection)
+        (condition-case nil
+            (or (x-get-selection value 'UTF8_STRING)
+                (x-get-selection value 'COMPOUND_TEXT)
+                (x-get-selection value 'STRING)
+                (x-get-selection value 'TEXT))
+          (error nil)))))
+
+(defun org-propertize (string &rest properties)
+  (if (featurep 'xemacs)
+      (add-text-properties 0 (length string) properties string)
+    (apply 'propertize string properties)))
+ 
 (provide 'org-compat)
 
 ;; arch-tag: a0a0579f-e68c-4bdf-9e55-93768b846bbe