Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org

[gnu-emacs] / lisp / calendar / timeclock.el

diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index 8ca14b37d708451dff59fd2e79c506ffd7431daa..a872e86dcf233165613c26515e2e993fbc731ae8 100644 (file)
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -1,6 +1,6 @@
 ;;; timeclock.el --- mode for keeping track of how much you work
 
-;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Created: 25 Mar 1999
@@ -49,7 +49,7 @@
 ;; If you want Emacs to display the amount of time "left" to your
 ;; workday in the mode-line, you can either set the value of
 ;; `timeclock-mode-line-display' to t using M-x customize, or you can
-;; add this code to your .emacs file:
+;; add this code to your init file:
 ;;
 ;;   (require 'timeclock)
 ;;   (timeclock-mode-line-display)
@@ -60,7 +60,7 @@
 ;; You may also want Emacs to ask you before exiting, if you are
 ;; currently working on a project.  This can be done either by setting
 ;; `timeclock-ask-before-exiting' to t using M-x customize (this is
-;; the default), or by adding the following to your .emacs file:
+;; the default), or by adding the following to your init file:
 ;;
 ;;   (add-hook 'kill-emacs-query-functions 'timeclock-query-out)
 
@@ -268,7 +268,7 @@ The time is bracketed by <> if you are clocked in, otherwise by [].")
 ;;; User Functions:
 
 (define-obsolete-function-alias 'timeclock-modeline-display
-  'timeclock-mode-line-display "24.2")
+  'timeclock-mode-line-display "24.3")
 
 ;;;###autoload
 (defun timeclock-mode-line-display (&optional arg)
@@ -321,6 +321,9 @@ display (non-nil means on)."
     (force-mode-line-update)
     (setq timeclock-mode-line-display on-p)))
 
+(define-obsolete-variable-alias 'timeclock-modeline-display
+  'timeclock-mode-line-display "24.3")
+
 ;; This has to be here so that the function definition of
 ;; `timeclock-mode-line-display' is known to the "set" function.
 (defcustom timeclock-mode-line-display nil
@@ -649,7 +652,7 @@ arguments of `completing-read'."
                             (mapcar 'list timeclock-reason-list)))
 
 (define-obsolete-function-alias 'timeclock-update-modeline
-  'timeclock-update-mode-line "24.2")
+  'timeclock-update-mode-line "24.3")
 
 (defun timeclock-update-mode-line ()
   "Update the `timeclock-mode-string' displayed in the mode line.