mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-16 16:46:26 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2012-10-24 11:21:48 +02:00
parent 866d28d48e facb889b19
commit 886e4f56e5
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/org-clock.el
View file

@ -201,7 +201,10 @@ file name Play this sound file, fall back to beep"
(const :tag "Standard beep" t) (const :tag "Standard beep" t)
(file :tag "Play sound file"))) (file :tag "Play sound file")))
(defcustom org-clock-modeline-total 'auto (define-obsolete-variable-alias 'org-clock-modeline-total
'org-clock-mode-line-total "24.3")
(defcustom org-clock-mode-line-total 'auto
"Default setting for the time included for the mode line clock. "Default setting for the time included for the mode line clock.
This can be overruled locally using the CLOCK_MODELINE_TOTAL property. This can be overruled locally using the CLOCK_MODELINE_TOTAL property.
Allowed values are: Allowed values are:
@ -1324,10 +1327,10 @@ for a todo state to switch to, overriding the existing value
This is for the currently running clock as it is displayed This is for the currently running clock as it is displayed
in the mode line. This function looks at the properties in the mode line. This function looks at the properties
LAST_REPEAT and in particular CLOCK_MODELINE_TOTAL and the LAST_REPEAT and in particular CLOCK_MODELINE_TOTAL and the
corresponding variable `org-clock-modeline-total' and then corresponding variable `org-clock-mode-line-total' and then
decides which time to use." decides which time to use."
(let ((cmt (or (org-entry-get nil "CLOCK_MODELINE_TOTAL") (let ((cmt (or (org-entry-get nil "CLOCK_MODELINE_TOTAL")
(symbol-name org-clock-modeline-total))) (symbol-name org-clock-mode-line-total)))
(lr (org-entry-get nil "LAST_REPEAT"))) (lr (org-entry-get nil "LAST_REPEAT")))
(cond (cond
((equal cmt "current") ((equal cmt "current")

8
lisp/org-faces.el
View file

@ -692,13 +692,13 @@ month and 365.24 days for a year)."
:group 'org-faces) :group 'org-faces)
(defface org-agenda-filter-tags (defface org-agenda-filter-tags
(org-compatible-face 'modeline (org-compatible-face 'mode-line
nil) nil)
"Face for tag(s) in the mode-line when filtering the agenda." "Face for tag(s) in the mode-line when filtering the agenda."
:group 'org-faces) :group 'org-faces)
(defface org-agenda-filter-category (defface org-agenda-filter-category
(org-compatible-face 'modeline (org-compatible-face 'mode-line
nil) nil)
"Face for tag(s) in the mode-line when filtering the agenda." "Face for tag(s) in the mode-line when filtering the agenda."
:group 'org-faces) :group 'org-faces)
@ -770,9 +770,9 @@ level org-n-level-faces"
"Face used to highlight math latex and other special exporter stuff." "Face used to highlight math latex and other special exporter stuff."
:group 'org-faces) :group 'org-faces)
(org-copy-face 'modeline 'org-mode-line-clock (org-copy-face 'mode-line 'org-mode-line-clock
"Face used for clock display in mode line.") "Face used for clock display in mode line.")
(org-copy-face 'modeline 'org-mode-line-clock-overrun (org-copy-face 'mode-line 'org-mode-line-clock-overrun
"Face used for clock display for overrun tasks in mode line." "Face used for clock display for overrun tasks in mode line."
:background "red") :background "red")