diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-05-26 16:29:27 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-05-26 16:29:40 +0200 |
| commit | 0dfb046983f1a78824d5a961acc6ca72775ee88d (patch) | |
| tree | 10e8cbdbc9d275bfe7da127e25540fb12a38f0d0 | |
| parent | bf5ebe1fdda066a7795126fee3663ab0eebaf45f (diff) | |
| download | org-mode-0dfb046983f1a78824d5a961acc6ca72775ee88d.tar.gz | |
org-compat: Silence byte-compiler
| -rw-r--r-- | lisp/org-compat.el | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 808ecd0..15e7308 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -33,6 +33,26 @@ (require 'cl)) (require 'org-macs) +;; As of Emacs 25.1, `outline-mode' functions are under the 'outline-' +;; prefix, `find-tag' is replaced with `xref-find-definition' and +;; `x-get-selection' with `gui-get-selection'. +(when (< emacs-major-version 25) + (defalias 'outline-hide-entry 'hide-entry) + (defalias 'outline-hide-sublevels 'hide-sublevels) + (defalias 'outline-hide-subtree 'hide-subtree) + (defalias 'outline-show-all 'show-all) + (defalias 'outline-show-branches 'show-branches) + (defalias 'outline-show-children 'show-children) + (defalias 'outline-show-entry 'show-entry) + (defalias 'outline-show-subtree 'show-subtree) + (defalias 'xref-find-definitions 'find-tag) + (defalias 'gui-get-selection 'x-get-selection)) + +(defmacro org-with-silent-modifications (&rest body) + (if (fboundp 'with-silent-modifications) + `(with-silent-modifications ,@body) + `(org-unmodified ,@body))) + (defun org-compatible-face (inherits specs) "Make a compatible face specification. If INHERITS is an existing face and if the Emacs version supports it, @@ -346,21 +366,6 @@ With two arguments, return floor and remainder of their quotient." (buffer-narrowed-p) (/= (- (point-max) (point-min)) (buffer-size)))) -;; As of Emacs 25.1, `outline-mode' functions are under the 'outline-' -;; prefix, `find-tag' is replaced with `xref-find-definition' and -;; `x-get-selection' with `gui-get-selection'. -(when (< emacs-major-version 25) - (defalias 'outline-hide-entry 'hide-entry) - (defalias 'outline-hide-sublevels 'hide-sublevels) - (defalias 'outline-hide-subtree 'hide-subtree) - (defalias 'outline-show-all 'show-all) - (defalias 'outline-show-branches 'show-branches) - (defalias 'outline-show-children 'show-children) - (defalias 'outline-show-entry 'show-entry) - (defalias 'outline-show-subtree 'show-subtree) - (defalias 'xref-find-definitions 'find-tag) - (defalias 'gui-get-selection 'x-get-selection)) - (defmacro org-with-silent-modifications (&rest body) (if (fboundp 'with-silent-modifications) `(with-silent-modifications ,@body) |