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

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
This commit is contained in:
Glenn Morris 2018-04-20 18:55:04 -04:00 committed by Kyle Meyer
parent 3d11e4c69b
commit f73cc4811b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org.el
View File

@ -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.