diff options
| author | Eli Zaretskii | 2023-08-26 05:25:50 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2023-08-26 05:25:50 -0400 |
| commit | db56d2b041565bf4b4063896fdd07154af19bd68 (patch) | |
| tree | 2322039cd988e48267a6d2203a28ef6b6b0a156b /src | |
| parent | 91830b8bf383b8cfdb7d9bd18895047cff820df7 (diff) | |
| parent | 39d2285bdc958c929981707d790a600242cc9cba (diff) | |
| download | emacs-db56d2b041565bf4b4063896fdd07154af19bd68.tar.gz emacs-db56d2b041565bf4b4063896fdd07154af19bd68.zip | |
Merge from origin/emacs-29
39d2285bdc9 ; * doc/emacs/sending.texi (Mail Aliases): Add some usefu...
f3fa436bc0f ; Fix doc string of 'current-idle-time'
02532bb5821 Fix custom :type of dired-mouse-drag-files
fc5de406be3 ; Improve SMTPmail documentation about OAuth2
1aaeaf22cef Account for string names in active file
48604565847 Fix 'makefile-browser-client' variable initialization
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 78c88a2859b..6ab1cdebc12 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -4833,7 +4833,8 @@ The value when Emacs is idle is a Lisp timestamp in the style of | |||
| 4833 | 4833 | ||
| 4834 | The value when Emacs is not idle is nil. | 4834 | The value when Emacs is not idle is nil. |
| 4835 | 4835 | ||
| 4836 | PSEC is a multiple of the system clock resolution. */) | 4836 | If the value is a list of four integers (HIGH LOW USEC PSEC), then PSEC |
| 4837 | is a multiple of the system clock resolution. */) | ||
| 4837 | (void) | 4838 | (void) |
| 4838 | { | 4839 | { |
| 4839 | if (timespec_valid_p (timer_idleness_start_time)) | 4840 | if (timespec_valid_p (timer_idleness_start_time)) |