diff options
| author | Eli Zaretskii | 2015-11-13 15:33:29 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-11-13 15:33:29 +0200 |
| commit | 695a6f932b208c6e840bda9ddb5f01e81e830c45 (patch) | |
| tree | f084641bf82e84152eca38f50ba0a31fe13f7b86 /src | |
| parent | a731c2f163071ed6efe7d93fa9585dd66ddf2fbb (diff) | |
| download | emacs-695a6f932b208c6e840bda9ddb5f01e81e830c45.tar.gz emacs-695a6f932b208c6e840bda9ddb5f01e81e830c45.zip | |
Remove support for ':timeout' from w32 tray notifications
* src/w32fns.c (Fw32_notification_notify): Delete the code that
supports ':timeout'.
(syms_of_w32fns): Don't DEFSYM ':timeout'. This avoids clashes
with dbusbind.c when D-Bus is compiled in.
* doc/lispref/os.texi (Desktop Notifications): Don't mention
':timeout'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32fns.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index f2d286d6364..f3391cb98f0 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -9111,13 +9111,6 @@ The following parameters are supported: | |||
| 9111 | parameter (see below) is also specified and is a | 9111 | parameter (see below) is also specified and is a |
| 9112 | string. | 9112 | string. |
| 9113 | 9113 | ||
| 9114 | :timeout TIMEOUT -- TIMEOUT is the time in seconds after which the | ||
| 9115 | notification disappears. The value can be integer | ||
| 9116 | or floating-point. This is ignored on Vista and | ||
| 9117 | later systems, where the duration is fixed at 9 sec | ||
| 9118 | and can only be customized via system-wide | ||
| 9119 | Accessibility settings. | ||
| 9120 | |||
| 9121 | :title TITLE -- The title of the notification. If TITLE is a string, | 9114 | :title TITLE -- The title of the notification. If TITLE is a string, |
| 9122 | it is displayed in a larger font immediately above | 9115 | it is displayed in a larger font immediately above |
| 9123 | the body text. The title text can be up to 63 | 9116 | the body text. The title text can be up to 63 |
| @@ -9179,13 +9172,6 @@ usage: (w32-notification-notify &rest PARAMS) */) | |||
| 9179 | else | 9172 | else |
| 9180 | severity = Ni_Info; | 9173 | severity = Ni_Info; |
| 9181 | 9174 | ||
| 9182 | /* Timeout. */ | ||
| 9183 | lres = Fplist_get (arg_plist, QCtimeout); | ||
| 9184 | if (NUMBERP (lres)) | ||
| 9185 | timeout = 1000 * (INTEGERP (lres) ? XINT (lres) : XFLOAT_DATA (lres)); | ||
| 9186 | else | ||
| 9187 | timeout = 0; | ||
| 9188 | |||
| 9189 | /* Title. */ | 9175 | /* Title. */ |
| 9190 | lres = Fplist_get (arg_plist, QCtitle); | 9176 | lres = Fplist_get (arg_plist, QCtitle); |
| 9191 | if (STRINGP (lres)) | 9177 | if (STRINGP (lres)) |
| @@ -9300,7 +9286,6 @@ syms_of_w32fns (void) | |||
| 9300 | DEFSYM (QClevel, ":level"); | 9286 | DEFSYM (QClevel, ":level"); |
| 9301 | DEFSYM (Qinfo, "info"); | 9287 | DEFSYM (Qinfo, "info"); |
| 9302 | DEFSYM (Qwarning, "warning"); | 9288 | DEFSYM (Qwarning, "warning"); |
| 9303 | DEFSYM (QCtimeout, ":timeout"); | ||
| 9304 | DEFSYM (QCtitle, ":title"); | 9289 | DEFSYM (QCtitle, ":title"); |
| 9305 | DEFSYM (QCbody, ":body"); | 9290 | DEFSYM (QCbody, ":body"); |
| 9306 | #endif | 9291 | #endif |