Browse Source

Use (featurep 'xemacs) to help the byte compiler

Carsten Dominik 15 years ago
parent
commit
d3b8ca4a3e
2 changed files with 8 additions and 2 deletions
  1. 2 0
      lisp/ChangeLog
  2. 6 2
      lisp/org-compat.el

+ 2 - 0
lisp/ChangeLog

@@ -1,5 +1,7 @@
 2010-04-22  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-compat.el (org-get-x-clipboard-compat): Use (featurep 'xemacs).
+
 	* org-publish.el (org-publish-project-alist): Update docstring.
 	(org-publish-file-title-cache): New variable.
 	(org-publish-initialize-files-alist): Initialize

+ 6 - 2
lisp/org-compat.el

@@ -39,7 +39,10 @@
 (declare-function find-library-name "find-func"  (library))
 (declare-function w32-focus-frame "term/w32-win" (frame))
 
-(defconst org-xemacs-p (featurep 'xemacs)) ; not used by org.el itself
+;; The following constant is for backward compatibility.  We do not use
+;; it in org-mode, because the Byte compiler evaluates (featurep 'xemacs)
+;; at compilation time and can therefore optimize code better.
+(defconst org-xemacs-p (featurep 'xemacs))
 (defconst org-format-transports-properties-p
   (let ((x "a"))
     (add-text-properties 0 1 '(test t) x)
@@ -235,7 +238,8 @@ Works on both Emacs and XEmacs."
 
 (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)))
+  (cond ((featurep 'xemacs)
+	 (org-no-warnings (get-selection-no-error value)))
 	((fboundp 'x-get-selection)
 	 (condition-case nil
 	     (or (x-get-selection value 'UTF8_STRING)