diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-04-20 18:55:04 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-04-20 18:55:04 -0400 |
| commit | 18de2ada243653ece98b18044233e5d29eee5903 (patch) | |
| tree | dbac02f9fa7ee6e7f6bd592bd2f775be4cdcf5f6 /lisp/org | |
| parent | 9c3eeba4db26ddaeead100beea7a96f9fa640918 (diff) | |
| download | emacs-18de2ada243653ece98b18044233e5d29eee5903.tar.gz | |
More alias-related tedium
* lisp/comint.el (comint-scroll-to-bottom-on-output):
* lisp/completion.el (cmpl-syntax-table):
* lisp/erc/erc-button.el (erc-button-google-url):
* lisp/font-lock.el (font-lock-reference-face):
* lisp/hfy-cmap.el (hfy-fallback-colour-map, hfy-rgb-txt-colour-map):
* lisp/isearch.el (isearch-regexp-function, isearch-new-word):
* lisp/startup.el (argv):
* lisp/version.el (emacs-bzr-version):
* lisp/org/org.el (org-CUA-compatible)
(org-popup-calendar-for-date-prompt):
Move aliases before targets, to silence new compiler warning.
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el index 7f4c6d5936b..e45bc55b244 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -1071,6 +1071,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. Org mode uses S-<cursor> keys for changing timestamps and priorities. @@ -1095,8 +1097,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)]) @@ -3343,6 +3343,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 @@ -3350,8 +3353,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. |