From: Bastien Guerry <bzg@altern.org>
Date: Sun, 13 Jan 2013 10:17:56 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: release_8.0-pre~542
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/7369cada30110d602f248c780aab55956ad9f1ae

Merge branch 'maint'
---

7369cada30110d602f248c780aab55956ad9f1ae
diff --cc lisp/org-clock.el
index c4cca8b2a,c043dd19e..914f5ff25
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@@ -220,9 -203,9 +220,9 @@@ file name  Play this sound file, fall b
    :type '(choice
  	  (const :tag "No sound" nil)
  	  (const :tag "Standard beep" t)
 -	  (file :tag "Play sound file")))
 +	  (file  :tag "Play sound file")))
  
- (org-define-obsolete-variable-alias 'org-clock-modeline-total
+ (define-obsolete-variable-alias 'org-clock-modeline-total
    'org-clock-mode-line-total "24.3")
  
  (defcustom org-clock-mode-line-total 'auto