diff options
author | Glenn Morris <rgm@gnu.org> | 2018-04-20 18:55:04 -0400 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2019-01-13 12:43:04 -0500 |
commit | f73cc4811bf38687fcd134e6a75f84e2bcc52803 (patch) | |
tree | 86c9f4b2eb6de4f13998d63ea6037c1e01e0f3ec | |
parent | 3d11e4c69bfa96cee5749adbbea85adfdc9f7c0d (diff) | |
download | org-mode-f73cc4811bf38687fcd134e6a75f84e2bcc52803.tar.gz |
Backport commit 18de2ada2 from Emacs
* lisp/org.el (org-CUA-compatible)
(org-popup-calendar-for-date-prompt):
Move aliases before targets, to silence new compiler warning.
More alias-related tedium
18de2ada243653ece98b18044233e5d29eee5903
Glenn Morris
Fri Apr 20 18:55:04 2018 -0400
-rw-r--r-- | lisp/org.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/org.el b/lisp/org.el index c542bde..5bb1e50 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -1119,6 +1119,8 @@ has been set." :group 'org-startup :type 'boolean) +(defvaralias 'org-CUA-compatible 'org-replace-disputed-keys) + (defcustom org-replace-disputed-keys nil "Non-nil means use alternative key bindings for some keys. @@ -1143,8 +1145,6 @@ loading Org." :group 'org-startup :type 'boolean) -(defvaralias 'org-CUA-compatible 'org-replace-disputed-keys) - (defcustom org-disputed-keys '(([(shift up)] . [(meta p)]) ([(shift down)] . [(meta n)]) @@ -3361,6 +3361,9 @@ This display will be in an overlay, in the minibuffer." :group 'org-time :type 'boolean) +(defvaralias 'org-popup-calendar-for-date-prompt + 'org-read-date-popup-calendar) + (defcustom org-read-date-popup-calendar t "Non-nil means pop up a calendar when prompting for a date. In the calendar, the date can be selected with mouse-1. However, the @@ -3368,8 +3371,6 @@ minibuffer will also be active, and you can simply enter the date as well. When nil, only the minibuffer will be available." :group 'org-time :type 'boolean) -(defvaralias 'org-popup-calendar-for-date-prompt - 'org-read-date-popup-calendar) (defcustom org-extend-today-until 0 "The hour when your day really ends. Must be an integer. |