diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-10 16:56:50 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-10 16:56:50 -0800 |
| commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
| tree | c8129448cbbf387fe82667ccac02983592c688f1 /lisp/dframe.el | |
| parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lisp/dframe.el')
| -rw-r--r-- | lisp/dframe.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/dframe.el b/lisp/dframe.el index 93d9e7948cf..b4f44e1a308 100644 --- a/lisp/dframe.el +++ b/lisp/dframe.el @@ -82,7 +82,7 @@ ;; c) If successful (your -frame variable has a value), call ;; timer setup if applicable. ;; your-frame-reposition- -- Function to call from after-create-hook to -;; reposition your frame with `dframe-repsoition-frame'. +;; reposition your frame with `dframe-reposition-frame'. ;; your-mode -- Set up the major mode of the buffer for your app. ;; Set these variables: dframe-track-mouse-function, ;; dframe-help-echo-function, @@ -96,7 +96,7 @@ ;; dframe-track-mouse, dframe-help-echo-function -- ;; These variables need to be set to functions that display info ;; based on the mouse's position. -;; Text propert 'help-echo, set to `dframe-help-echo', which will +;; Text property 'help-echo, set to `dframe-help-echo', which will ;; call `dframe-help-echo-function'. ;; Have a `-click' function, it can call `dframe-quick-mouse' for ;; positioning. If the variable `dframe-power-click' is non-nil, @@ -136,7 +136,7 @@ This is nil for terminals, since updating a frame in a terminal is not useful to the user.") (defcustom dframe-update-speed - (if (featurep 'xemacs) 2 ; 1 is too obrusive in XEmacs + (if (featurep 'xemacs) 2 ; 1 is too obtrusive in XEmacs 1) "Idle time in seconds needed before dframe will update itself. Updates occur to allow dframe to display directory information @@ -718,7 +718,7 @@ Argument PROMPT is the prompt to use." (defun dframe-set-timer (timeout fn &optional _null-on-error) "Apply a timer with TIMEOUT, to call FN, or remove a timer if TIMEOUT is nil. -TIMEOUT is the number of seconds until the dframe controled program +TIMEOUT is the number of seconds until the dframe controlled program timer is called again. When TIMEOUT is nil, turn off all timeouts. This function must be called from the buffer belonging to the program who requested the timer. NULL-ON-ERROR is ignored." @@ -726,7 +726,7 @@ who requested the timer. NULL-ON-ERROR is ignored." (if timeout (add-to-list 'dframe-client-functions fn) (setq dframe-client-functions (delete fn dframe-client-functions))) - ;; Now decided what to do about the timout. + ;; Now decided what to do about the timeout. (if (or ;; We have a timer, restart the timer with the new time. timeout |