Browse Source

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:
	lisp/ChangeLog
Carsten Dominik 16 years ago
parent
commit
dc0f321e94
2 changed files with 5 additions and 1 deletions
  1. 4 0
      lisp/ChangeLog
  2. 1 1
      lisp/org-clock.el

+ 4 - 0
lisp/ChangeLog

@@ -20,6 +20,10 @@
 	(org-agenda-set-mode-name): Add entry text mode to the mode line
 	string.
 
+2009-08-26  Bernt Hansen  <bernt@norang.ca>  (tiny change)
+
+	* org-clock.el (org-notify): Bugfix.
+
 2009-08-25  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-agenda.el (org-agenda-open-link): Handle multiple links and

+ 1 - 1
lisp/org-clock.el

@@ -446,7 +446,7 @@ Notification is shown only once."
 
 (defun org-notify (notification &optional play-sound)
   "Send a NOTIFICATION and maybe PLAY-SOUND."
-  (org-show-notification (notification))
+  (org-show-notification notification)
   (if play-sound (org-clock-play-sound)))
 
 (defun org-show-notification (notification)