emacs: lisp/type-break.el comparison

comparison lisp/type-break.el @ 30391:246b2f521192

(type-break): perform autosave. Suggested by Stephen Gildea <gildea@intouchsys.com>. (type-break-do-query): Cancel query schedule while performing actual query, to avoid possibility of a second query being made while first one is already in progress. (type-break-time-stamp-format): New variable. (type-break-time-stamp): New function. (type-break-time-warning): Use it. (type-break-keystroke-warning): Use it. (type-break-noninteractive-query): Use it.

author	Noah Friedman <friedman@splode.com>
date	Mon, 24 Jul 2000 00:49:09 +0000
parents	cbe304a26771
children	a877c0e4875a

comparison

equal deleted inserted replaced

-:91ee387fb19e
+:246b2f521192
 ;;; type-break.el --- encourage rests from typing at appropriate intervals
-;; Copyright (C) 1994, 1995, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 95, 97, 2000 Free Software Foundation, Inc.
 ;; Author: Noah Friedman
 ;; Maintainer: Noah Friedman <friedman@splode.com>
 ;; Keywords: extensions, timers
 ;; Status: Works in GNU Emacs 19.25 or later, some versions of XEmacs
 ;; Created: 1994-07-13
-;; $Id: type-break.el,v 1.22 1999/04/27 19:00:42 fx Exp kwzh $
+;; $Id: type-break.el,v 1.23 2000/03/13 11:16:00 friedman Exp $
 ;; This file is part of GNU Emacs.
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; This program has no hope of working in Emacs 18.
 ;; This package was inspired by Roland McGrath's hanoi-break.el.
 ;; Several people contributed feedback and ideas, including
 ;;      Roland McGrath <roland@gnu.org>
-;;      Kleanthes Koniaris <kgk@martigny.ai.mit.edu>
+;;      Kleanthes Koniaris <kgk@koniaris.com>
 ;;      Mark Ashton <mpashton@gnu.org>
 ;;      Matt Wilding <wilding@cli.com>
 ;;      Robert S. Boyer <boyer@cs.utexas.edu>
 ;;; Code:
 (defgroup type-break nil
 "Encourage the user to take a rest from typing at suitable intervals."
 :prefix "type-break"
+:group 'type-break
 :group 'keyboard)
 ;;;###autoload
 (defcustom type-break-mode nil
 "Toggle typing break mode.
 If so, call the function specified in the value of the variable
 `type-break-query-function' to do the asking."
 :type 'boolean
 :group 'type-break)
-(defvar type-break-query-function 'yes-or-no-p
+(defcustom type-break-query-function 'yes-or-no-p
-"Function to use for making query for a typing break.
+"*Function to use for making query for a typing break.
 It should take a string as an argument, the prompt.
 Usually this should be set to `yes-or-no-p' or `y-or-n-p'.
-To avoid being queried at all, set `type-break-query-mode' to `nil'.")
+To avoid being queried at all, set `type-break-query-mode' to `nil'."
+:type '(radio function
+(function-item yes-or-no-p)
+(function-item y-or-n-p))
+:group 'type-break)
 (defcustom type-break-query-interval 60
 "*Number of seconds between queries to take a break, if put off.
 The user will continue to be prompted at this interval until he or she
 finally submits to taking a typing break."
 If either this variable or the upper threshold is set, then no warnings
 will occur."
 :type '(repeat integer)
 :group 'type-break)
 (defcustom type-break-warning-repeat 40
 "*Number of keystrokes for which warnings should be repeated.
 That is, for each of this many keystrokes the warning is redisplayed
 in the echo area to make sure it's really seen."
 :type 'integer
+:group 'type-break)
+(defcustom type-break-time-stamp-format "[%H:%M] "
+"*Timestamp format used to prefix messages.
+Format specifiers are as used by `format-time-string'."
+:type 'string
 :group 'type-break)
 (defcustom type-break-demo-functions
 '(type-break-demo-boring type-break-demo-life type-break-demo-hanoi)
 "*List of functions to consider running as demos during typing breaks.
 (defvar type-break-mode-line-break-message
 '(type-break-mode-line-break-message-p
 type-break-mode-line-break-string))
 (defvar type-break-mode-line-break-message-p nil)
-(defvar type-break-mode-line-break-string " *** TAKE A TYPING BREAK ***")
+(defvar type-break-mode-line-break-string " *** TAKE A TYPING BREAK NOW ***")
 (defvar type-break-mode-line-warning
 '(type-break-mode-line-break-message-p
 ("")
 (type-break-warning-countdown-string
-(" ***Break in "
+(" *** "
+"Break in "
 type-break-warning-countdown-string
 " "
 type-break-warning-countdown-string-type
 "***"))))
 `type-break-demo-functions' is run.
 After the typing break is finished, the next break is scheduled
 as per the function `type-break-schedule'."
 (interactive)
+(do-auto-save)
 (type-break-cancel-schedule)
 (let ((continue t)
 (start-time (current-time)))
 (setq type-break-time-last-break start-time)
 (while continue
 ;; below if you're in that much of a hurry.
 ;((> 60 (abs (- break-secs type-break-good-rest-interval)))
 ; (setq continue nil))
 ((funcall
 type-break-query-function
-(format "You really ought to rest %s more.  Continue break? "
+(format "%sYou really ought to rest %s more.  Continue break? "
+(type-break-time-stamp)
 (type-break-format-time (- type-break-good-rest-interval
 break-secs)))))
 (t
 (setq continue nil)))))
 (t (setq continue nil)))))
 (setq type-break-time-last-break (current-time))
 (type-break-schedule)))
 (setq type-break-time-last-command (current-time))))
 (and type-break-keystroke-threshold
-	 ;; next line is test for 20.2 that can be deleted
-	 ;;(setq type-break-keystroke-count (1+ type-break-keystroke-count))
 (let ((keys (this-command-keys)))
 (cond
 ;; Ignore mouse motion
 ((and (vectorp keys)
 (consp (aref keys 0))
 ((let ((type-break-mode nil)
 ;; yes-or-no-p sets this-command to exit-minibuffer,
 ;; which hoses undo or yank-pop (if you happened to be
 ;; yanking just when the query occurred).
 (this-command this-command))
+;; Cancel schedule to prevent possibility of a second query
+;; from taking place before this one has even returned.
+;; The condition-case wrapper will reschedule on quit.
+(type-break-cancel-schedule)
 (funcall type-break-query-function
-"Take a break from typing now? "))
+(format "%s%s"
+(type-break-time-stamp)
+"Take a break from typing now? ")))
 (type-break))
 (t
 (type-break-schedule type-break-query-interval)))
 (quit
 (type-break-schedule type-break-query-interval)))
 this or ask the user to start one right now."
 (cond
 (type-break-mode-line-message-mode)
 (t
 (beep t)
-(message "You should take a typing break now.  Do `M-x type-break'.")
+(message "%sYou should take a typing break now.  Do `M-x type-break'."
+(type-break-time-stamp))
 (sit-for 1)
 (beep t)
 ;; return nil so query caller knows to reset reminder, as if user
 ;; said "no" in response to yes-or-no-p.
 nil)))
 ;; delay redisplay when one types sequences like `C-u -1 C-l'.
 ((memq this-command '(digit-argument universal-argument)))
 ((not type-break-mode-line-message-mode)
 ;; Pause for a moment so any previous message can be seen.
 (sit-for 2)
-(message "Warning: typing break due in %s."
+(message "%sWarning: typing break due in %s."
+(type-break-time-stamp)
 (type-break-format-time timeleft))
 (setq type-break-time-warning-count
 (1- type-break-time-warning-count))))))
 (t
 (remove-hook 'type-break-post-command-hook 'type-break-time-warning)
 ;; Otherwise, it is particularly annoying for the sit-for below to
 ;; delay redisplay when one types sequences like `C-u -1 C-l'.
 ((memq this-command '(digit-argument universal-argument)))
 ((not type-break-mode-line-message-mode)
 (sit-for 2)
-(message "Warning: typing break due in %s keystrokes."
+(message "%sWarning: typing break due in %s keystrokes."
+(type-break-time-stamp)
 (- (cdr type-break-keystroke-threshold)
 type-break-keystroke-count))
 (setq type-break-keystroke-warning-count
 (1- type-break-keystroke-warning-count)))))
 (t
 (progn
 (setq low (logand low 65535))
 (setq high (+ high tem))))
 (list high low micro)))
+(defun type-break-time-stamp (&optional when)
+(if (fboundp 'format-time-string)
+(format-time-string type-break-time-stamp-format when)
+;; Emacs 19.28 and prior do not have format-time-string.
+;; In that case, result is not customizable.  Upgrade today!
+(format "[%s] " (substring (current-time-string when) 11 16))))
 (defun type-break-format-time (secs)
 (let ((mins (/ secs 60)))
 (cond
 ((= mins 1) (format "%d minute" mins))
 (provide 'type-break)
 (if type-break-mode
 (type-break-mode 1))
 ;;; type-break.el ends here

Mercurial > emacs

comparison lisp/type-break.el @ 30391:246b2f521192