forked from calculate/calculate-overlay
parent
ab9828d55a
commit
728f128f46
@ -1 +0,0 @@
|
||||
# Calculate merge()!= append=skip
|
||||
@ -1,14 +0,0 @@
|
||||
# Calculate format=diff
|
||||
diff --git a/tdtd-font-maker.el b/tdtd-font-maker.el
|
||||
index 30dd5fc..e0981a0 100644
|
||||
--- a/tdtd-font-maker.el
|
||||
+++ b/tdtd-font-maker.el
|
||||
@@ -875,7 +875,7 @@
|
||||
(kill-region (point-min) (point-max))
|
||||
(insert ";;;; tdtd-font.el --- Font-lock keywords for Tony's DTD mode\n")
|
||||
(insert ";; $\Id$\n")
|
||||
- (insert ";; $\Name$\n")
|
||||
+ (insert ";; $\\Name$\n")
|
||||
(insert ";;\n")
|
||||
(insert ";; Copyright (C) 1999, Tony Graham\n")
|
||||
(insert ";;\n")
|
||||
@ -1 +0,0 @@
|
||||
# Calculate append=skip
|
||||
@ -1 +0,0 @@
|
||||
# Calculate merge()!= append=skip
|
||||
@ -1,14 +0,0 @@
|
||||
# Calculate format=diff merge(app-emulation/bochs)=>2.6.9,2.7
|
||||
Index: iodev/network/slirp/slirp.h
|
||||
===================================================================
|
||||
--- iodev/network/slirp/slirp.h (revision 11848)
|
||||
+++ iodev/network/slirp/slirp.h (working copy)
|
||||
@@ -45,7 +45,7 @@
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
-#if defined(__OpenBSD__)
|
||||
+#if defined(__OpenBSD__) || (__linux__)
|
||||
#include <stdint.h>
|
||||
#include <sys/wait.h>
|
||||
#endif
|
||||
@ -1 +0,0 @@
|
||||
# Calculate merge()!= append=skip
|
||||
@ -1,40 +0,0 @@
|
||||
# Calculate format=diff merge(dev-qt/qt-creator)=>4.8,4.9
|
||||
--- a/src/shared/clang/clang_installation.pri
|
||||
+++ b/src/shared/clang/clang_installation.pri
|
||||
@@ -150,16 +150,6 @@
|
||||
output = $$system($$llvm_config --version, lines)
|
||||
LLVM_VERSION = $$extractVersion($$output)
|
||||
|
||||
-!isEmpty(LLVM_VERSION) {
|
||||
- versionIsAtLeast($$LLVM_VERSION, 7, 0, 0): {
|
||||
- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
|
||||
- win32:CLANGFORMAT_LIBS += -lversion
|
||||
- } else:versionIsAtLeast($$LLVM_VERSION, 6, 0, 0): {
|
||||
- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
|
||||
- win32:CLANGFORMAT_LIBS += -lversion
|
||||
- }
|
||||
-}
|
||||
-
|
||||
isEmpty(LLVM_VERSION) {
|
||||
$$llvmWarningOrError(\
|
||||
"Cannot determine clang version. Set LLVM_INSTALL_DIR to build the Clang Code Model",\
|
||||
@@ -210,6 +200,19 @@
|
||||
$$llvmWarningOrError("Cannot find Clang shared library in $$LLVM_LIBDIR")
|
||||
}
|
||||
|
||||
+ versionIsAtLeast($$LLVM_VERSION, 7, 0, 0): {
|
||||
+ exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) {
|
||||
+ CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
|
||||
+ win32:CLANGFORMAT_LIBS += -lversion
|
||||
+ } else {
|
||||
+ CLANGFORMAT_LIBS=-lclang-cpp
|
||||
+ ALL_CLANG_LIBS=-lclang-cpp
|
||||
+ }
|
||||
+ } else:versionIsAtLeast($$LLVM_VERSION, 6, 0, 0): {
|
||||
+ CLANGFORMAT_LIBS=-lclangFormat -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
|
||||
+ win32:CLANGFORMAT_LIBS += -lversion
|
||||
+ }
|
||||
+
|
||||
!contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBCLANG_LIBS = -L$${LLVM_LIBDIR}
|
||||
LIBCLANG_LIBS += $${CLANG_LIB}
|
||||
|
||||
@ -1 +0,0 @@
|
||||
# Calculate append=skip merge()=>0.16.8,0.17
|
||||
@ -1,33 +0,0 @@
|
||||
# Calculate format=diff
|
||||
diff --git a/src/message_window.py b/src/message_window.py
|
||||
index 7fd6b44..86968bc 100644
|
||||
--- a/src/message_window.py
|
||||
+++ b/src/message_window.py
|
||||
@@ -1227,16 +1227,17 @@ class MessageWindowMgr(gobject.GObject):
|
||||
gajim.config.set_per('accounts', acct, pos_y_key, y)
|
||||
|
||||
else:
|
||||
- win_maximized = msg_win.window.window.get_state() == \
|
||||
- gtk.gdk.WINDOW_STATE_MAXIMIZED
|
||||
- gajim.config.set(max_win_key, win_maximized)
|
||||
- width += width_adjust
|
||||
- gajim.config.set(size_width_key, width)
|
||||
- gajim.config.set(size_height_key, height)
|
||||
-
|
||||
- if self.mode != self.ONE_MSG_WINDOW_NEVER:
|
||||
- gajim.config.set(pos_x_key, x)
|
||||
- gajim.config.set(pos_y_key, y)
|
||||
+ if msg_win.window.window:
|
||||
+ win_maximized = msg_win.window.window.get_state() == \
|
||||
+ gtk.gdk.WINDOW_STATE_MAXIMIZED
|
||||
+ gajim.config.set(max_win_key, win_maximized)
|
||||
+ width += width_adjust
|
||||
+ gajim.config.set(size_width_key, width)
|
||||
+ gajim.config.set(size_height_key, height)
|
||||
+
|
||||
+ if self.mode != self.ONE_MSG_WINDOW_NEVER:
|
||||
+ gajim.config.set(pos_x_key, x)
|
||||
+ gajim.config.set(pos_y_key, y)
|
||||
|
||||
def reconfig(self):
|
||||
for w in self.windows():
|
||||
Loading…
Reference in new issue