Browse Source

Continue previous commit and document it in etc/ORG-NEWS

* lisp/org.el (org-priority-enable-commands)
(org-priority-highest, org-priority-get-priority-function):
Define aliases.

(org-priority): Use `org-priority-show'.

* lisp/org-agenda.el (org-agenda-priority, org-agenda-menu):
Ditto.
Bastien 5 years ago
parent
commit
e11f506484
3 changed files with 18 additions and 4 deletions
  1. 8 0
      etc/ORG-NEWS
  2. 2 2
      lisp/org-agenda.el
  3. 8 2
      lisp/org.el

+ 8 - 0
etc/ORG-NEWS

@@ -111,6 +111,14 @@ the attachment.
 
 
 The new value uses emacs as the application for opening directory.
 The new value uses emacs as the application for opening directory.
 
 
+*** Priority options have been renamed
+
+From ~org-lowest-priority~ to ~org-priority-lowest~.
+From ~org-default-priority~ to ~org-priority-default~.
+From ~org-highest-priority~ to ~org-priority-highest~.
+From ~org-enable-priority-commands~ to ~org-priority-enable-commands~.
+From ~org-show-priority~ to ~org-priority-show~.
+
 * Version 9.3
 * Version 9.3
 
 
 ** Incompatible changes
 ** Incompatible changes

+ 2 - 2
lisp/org-agenda.el

@@ -2562,7 +2562,7 @@ The following commands are available:
      ["Set Priority" org-agenda-priority t]
      ["Set Priority" org-agenda-priority t]
      ["Increase Priority" org-agenda-priority-up t]
      ["Increase Priority" org-agenda-priority-up t]
      ["Decrease Priority" org-agenda-priority-down t]
      ["Decrease Priority" org-agenda-priority-down t]
-     ["Show Priority" org-show-priority t])
+     ["Show Priority" org-priority-show t])
     ("Calendar/Diary"
     ("Calendar/Diary"
      ["New Diary Entry" org-agenda-diary-entry (org-agenda-check-type nil 'agenda)]
      ["New Diary Entry" org-agenda-diary-entry (org-agenda-check-type nil 'agenda)]
      ["Goto Calendar" org-agenda-goto-calendar (org-agenda-check-type nil 'agenda)]
      ["Goto Calendar" org-agenda-goto-calendar (org-agenda-check-type nil 'agenda)]
@@ -9335,7 +9335,7 @@ the same tree node, and the headline of the tree node in the Org file.
 Called with a universal prefix arg, show the priority instead of setting it."
 Called with a universal prefix arg, show the priority instead of setting it."
   (interactive "P")
   (interactive "P")
   (if (equal force-direction '(4))
   (if (equal force-direction '(4))
-      (org-show-priority)
+      (org-priority-show)
     (unless org-priority-enable-commands
     (unless org-priority-enable-commands
       (error "Priority commands are disabled"))
       (error "Priority commands are disabled"))
     (org-agenda-check-no-diary)
     (org-agenda-check-no-diary)

+ 8 - 2
lisp/org.el

@@ -2556,6 +2556,7 @@ property to one or more of these keywords."
   :tag "Org Priorities"
   :tag "Org Priorities"
   :group 'org-todo)
   :group 'org-todo)
 
 
+(defvaralias 'org-enable-priority-commands 'org-priority-enable-commands)
 (defcustom org-priority-enable-commands t
 (defcustom org-priority-enable-commands t
   "Non-nil means priority commands are active.
   "Non-nil means priority commands are active.
 When nil, these commands will be disabled, so that you never accidentally
 When nil, these commands will be disabled, so that you never accidentally
@@ -2563,18 +2564,21 @@ set a priority."
   :group 'org-priorities
   :group 'org-priorities
   :type 'boolean)
   :type 'boolean)
 
 
+(defvaralias 'org-highest-priority 'org-priority-highest)
 (defcustom org-priority-highest ?A
 (defcustom org-priority-highest ?A
   "The highest priority of TODO items.  A character like ?A, ?B etc.
   "The highest priority of TODO items.  A character like ?A, ?B etc.
 Must have a smaller ASCII number than `org-priority-lowest'."
 Must have a smaller ASCII number than `org-priority-lowest'."
   :group 'org-priorities
   :group 'org-priorities
   :type 'character)
   :type 'character)
 
 
+(defvaralias 'org-lowest-priority 'org-priority-lowest)
 (defcustom org-priority-lowest ?C
 (defcustom org-priority-lowest ?C
   "The lowest priority of TODO items.  A character like ?A, ?B etc.
   "The lowest priority of TODO items.  A character like ?A, ?B etc.
 Must have a larger ASCII number than `org-priority-highest'."
 Must have a larger ASCII number than `org-priority-highest'."
   :group 'org-priorities
   :group 'org-priorities
   :type 'character)
   :type 'character)
 
 
+(defvaralias 'org-default-priority 'org-priority-default)
 (defcustom org-priority-default ?B
 (defcustom org-priority-default ?B
   "The default priority of TODO items.
   "The default priority of TODO items.
 This is the priority an item gets if no explicit priority is given.
 This is the priority an item gets if no explicit priority is given.
@@ -2596,6 +2600,7 @@ See also `org-priority-default'."
   :group 'org-priorities
   :group 'org-priorities
   :type 'boolean)
   :type 'boolean)
 
 
+(defvaralias 'org-get-priority-function 'org-priority-get-priority-function)
 (defcustom org-priority-get-priority-function nil
 (defcustom org-priority-get-priority-function nil
   "Function to extract the priority from a string.
   "Function to extract the priority from a string.
 The string is normally the headline.  If this is nil Org computes the
 The string is normally the headline.  If this is nil Org computes the
@@ -11654,7 +11659,7 @@ or a character."
     ;; passed the SHOW argument should be removed.
     ;; passed the SHOW argument should be removed.
     (warn "`org-priority' called with deprecated SHOW argument"))
     (warn "`org-priority' called with deprecated SHOW argument"))
   (if (equal action '(4))
   (if (equal action '(4))
-      (org-show-priority)
+      (org-priority-show)
     (unless org-priority-enable-commands
     (unless org-priority-enable-commands
       (user-error "Priority commands are disabled"))
       (user-error "Priority commands are disabled"))
     (setq action (or action 'set))
     (setq action (or action 'set))
@@ -11732,7 +11737,8 @@ or a character."
 	  (message "Priority removed")
 	  (message "Priority removed")
 	(message "Priority of current item set to %s" news)))))
 	(message "Priority of current item set to %s" news)))))
 
 
-(defun org-show-priority ()
+(defalias 'org-show-priority 'org-priority-show)
+(defun org-priority-show ()
   "Show the priority of the current item.
   "Show the priority of the current item.
 This priority is composed of the main priority given with the [#A] cookies,
 This priority is composed of the main priority given with the [#A] cookies,
 and by additional input from the age of a schedules or deadline entry."
 and by additional input from the age of a schedules or deadline entry."