[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 f8d8e0b 03/14: Fix last change
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 f8d8e0b 03/14: Fix last change |
Date: |
Fri, 13 Nov 2015 20:03:32 +0000 |
branch: emacs-25
commit f8d8e0b7aac45706354dd0e4c8044ba4103ff208
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix last change
* src/w32fns.c (syms_of_w32fns) [WINDOWSNT && !HAVE_DBUS]:
Don't DEFSYM tray notification symbols if D-Bus is being used.
Backport.
---
src/w32fns.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/w32fns.c b/src/w32fns.c
index 475864b..f2d286d 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -9294,6 +9294,7 @@ syms_of_w32fns (void)
DEFSYM (Qframes, "frames");
DEFSYM (Qtip_frame, "tip-frame");
DEFSYM (Qunicode_sip, "unicode-sip");
+#if defined WINDOWSNT && !defined HAVE_DBUS
DEFSYM (QCicon, ":icon");
DEFSYM (QCtip, ":tip");
DEFSYM (QClevel, ":level");
@@ -9302,6 +9303,7 @@ syms_of_w32fns (void)
DEFSYM (QCtimeout, ":timeout");
DEFSYM (QCtitle, ":title");
DEFSYM (QCbody, ":body");
+#endif
/* Symbols used elsewhere, but only in MS-Windows-specific code. */
DEFSYM (Qgnutls_dll, "gnutls");
- [Emacs-diffs] emacs-25 updated (26e7624 -> 84c7b38), Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 82f3dc0 02/14: Another fix for MinGW64 and Cygwin builds due to notifications, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 e0d2dc5 04/14: Fix last change in shr.el, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 071b2e1 01/14: Remove intern calls and XXX comments from Fx_export_frames, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 a95781e 07/14: Add a few more variables to redisplay--variables, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 e53f226 09/14: * lisp/progmodes/elisp-mode.el: Declare function `project-roots', Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 d6b046c 08/14: * src/undo.c: Small fixes for previous change, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 93e7db1 10/14: * test/automated/simple-test.el: Add test for bug#20698 (bug#21885), Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 f8d8e0b 03/14: Fix last change,
Eli Zaretskii <=
- [Emacs-diffs] emacs-25 27b93ec 05/14: Fix point positioning after transposing with negative arg, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 afd3e98 06/14: * lisp/loadup.el: Enlarge the size of the hash table to 80000., Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 9722634 12/14: * src/undo.c (run_undoable_change): Now static., Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 84c7b38 14/14: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 3453057 11/14: Remove support for ':timeout' from w32 tray notifications, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 da05685 13/14: Port recent XCB changes to 64-bit ‘long int’, Eli Zaretskii, 2015/11/13