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

org-compat.el: Fix indentation.

This commit is contained in:
Bastien Guerry 2013-06-11 03:17:27 +02:00
parent 693dda67e6
commit ef98a614f6
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lisp/org-compat.el
View File

@ -125,28 +125,28 @@ Don't do the aliasing when `defvaralias' is not bound."
(boundp 'user-init-directory)) (boundp 'user-init-directory))
(org-defvaralias 'user-emacs-directory 'user-init-directory))) (org-defvaralias 'user-emacs-directory 'user-init-directory)))
(when (featurep 'xemacs) (when (featurep 'xemacs)
(defadvice custom-handle-keyword (defadvice custom-handle-keyword
(around org-custom-handle-keyword (around org-custom-handle-keyword
activate preactivate) activate preactivate)
"Remove custom keywords not recognized to avoid producing an error." "Remove custom keywords not recognized to avoid producing an error."
(cond (cond
((eq (ad-get-arg 1) :package-version)) ((eq (ad-get-arg 1) :package-version))
(t ad-do-it))) (t ad-do-it)))
(defadvice define-obsolete-variable-alias (defadvice define-obsolete-variable-alias
(around org-define-obsolete-variable-alias (around org-define-obsolete-variable-alias
(obsolete-name current-name &optional when docstring) (obsolete-name current-name &optional when docstring)
activate preactivate) activate preactivate)
"Declare arguments defined in later versions of Emacs." "Declare arguments defined in later versions of Emacs."
ad-do-it) ad-do-it)
(defadvice define-obsolete-function-alias (defadvice define-obsolete-function-alias
(around org-define-obsolete-function-alias (around org-define-obsolete-function-alias
(obsolete-name current-name &optional when docstring) (obsolete-name current-name &optional when docstring)
activate preactivate) activate preactivate)
"Declare arguments defined in later versions of Emacs." "Declare arguments defined in later versions of Emacs."
ad-do-it) ad-do-it)
(defvar customize-package-emacs-version-alist nil) (defvar customize-package-emacs-version-alist nil)
(defvar temporary-file-directory (temp-directory))) (defvar temporary-file-directory (temp-directory)))
;; Keys ;; Keys
(defconst org-xemacs-key-equivalents (defconst org-xemacs-key-equivalents
@ -413,11 +413,11 @@ TIME defaults to the current time."
"Suppress popup windows. "Suppress popup windows.
Let-bind some variables to nil around BODY to achieve the desired Let-bind some variables to nil around BODY to achieve the desired
effect, which variables to use depends on the Emacs version." effect, which variables to use depends on the Emacs version."
(if (org-version-check "24.2.50" "" :predicate) (if (org-version-check "24.2.50" "" :predicate)
`(let (pop-up-frames display-buffer-alist) `(let (pop-up-frames display-buffer-alist)
,@body) ,@body)
`(let (pop-up-frames special-display-buffer-names special-display-regexps special-display-function) `(let (pop-up-frames special-display-buffer-names special-display-regexps special-display-function)
,@body))) ,@body)))
(if (fboundp 'string-match-p) (if (fboundp 'string-match-p)
(defalias 'org-string-match-p 'string-match-p) (defalias 'org-string-match-p 'string-match-p)