Permalink
Browse files

Merge branch 'master' into guns

* master: (127 commits)
  ruby: fix crash with Ruby 2.0: use one array for the last 6 arguments of function config_new_option (bug #31050)
  irc: fix default completion (like nicks) in commands /msg, /notice, /query and /topic
  irc: fix prefix color for nick when the prefix is not in irc.color.nick_prefixes: use default color (key "*")
  doc: use listing style for commands in quickstart guide
  doc: change style for listings in asciidoc CSS
  irc: add option irc.look.pv_buffer: automatically merge private buffers (optionally by server) (task #11924)
  core: fix refresh of item "completion" (bug #38214) (patch from Nils Görs)
  scripts: create directories (language and language/autoload) on each action (install/remove/autoload), just in case they have been removed (bug #38473)
  script: create "script" directory on each action (just in case it has been removed) (bug #38472)
  relay: rename compression "gzip" to "zlib" (compression is zlib, not gzip) (thanks to Dominik Honnef)
  core: fix typos in french translations
  rmodifier: add info about "groups" in /help rmodifier
  core: fix typos in many comments and some strings
  core: fix typos in ChangeLog
  core: add support of multiple layouts (task #11274)
  doc: add link to weechat.org/info in scripting guide (URL transfer) and plugin API reference (function hook_process)
  lua: fix crash on stack overflow: call lua_pop() for values returned by lua functions (bug #38510)
  doc: add range for integer/long integer objects, add examples with negative numbers (relay protocol)
  relay: add missing "id" in raw messages sent to clients when compression is off (weechat protocol)
  relay: add negative numbers (integer: -123456 and long: -1234567890L) in command "test" (weechat protocol)
  ...
  • Loading branch information...
2 parents b529331 + 4fdbb83 commit a81d38eae60da81c6a1c5bdf9d82517880074e4c @guns committed Mar 24, 2013
Showing with 15,749 additions and 10,858 deletions.
  1. +5 −0 .gitattributes
  2. +0 −1 .gitignore
  3. +1 −3 CMakeLists.txt
  4. +150 −59 ChangeLog
  5. +3 −1 Makefile.am
  6. +411 −207 NEWS
  7. +4 −18 cmake/FindGuile.cmake
  8. +5 −4 cmake/FindIconv.cmake
  9. +1 −1 cmake/FindPython.cmake
  10. +0 −18 config.h.cmake
  11. +20 −38 configure.in
  12. +16 −0 debian/changelog
  13. +2 −2 debian/control
  14. +11 −2 doc/asciidoc.css
  15. +5 −1 doc/de/autogen/plugin_api/completions.txt
  16. +5 −0 doc/de/autogen/plugin_api/hdata.txt
  17. +2 −0 doc/de/autogen/plugin_api/infos.txt
  18. +2 −3 doc/de/autogen/user/alias_commands.txt
  19. +3 −3 doc/de/autogen/user/aspell_commands.txt
  20. +22 −12 doc/de/autogen/user/irc_options.txt
  21. +3 −1 doc/de/autogen/user/relay_commands.txt
  22. +5 −0 doc/de/autogen/user/relay_options.txt
  23. +16 −16 doc/de/autogen/user/rmodifier_commands.txt
  24. +21 −17 doc/de/autogen/user/script_commands.txt
  25. +5 −0 doc/de/autogen/user/script_options.txt
  26. +51 −44 doc/de/autogen/user/weechat_commands.txt
  27. +1 −1 doc/de/autogen/user/weechat_options.txt
  28. +1 −17 doc/de/weechat_faq.de.txt
  29. +116 −40 doc/de/weechat_quickstart.de.txt
  30. +120 −23 doc/de/weechat_scripting.de.txt
  31. +80 −44 doc/de/weechat_user.de.txt
  32. +5 −1 doc/en/autogen/plugin_api/completions.txt
  33. +5 −0 doc/en/autogen/plugin_api/hdata.txt
  34. +2 −0 doc/en/autogen/plugin_api/infos.txt
  35. +2 −3 doc/en/autogen/user/alias_commands.txt
  36. +3 −3 doc/en/autogen/user/aspell_commands.txt
  37. +22 −12 doc/en/autogen/user/irc_options.txt
  38. +3 −1 doc/en/autogen/user/relay_commands.txt
  39. +5 −0 doc/en/autogen/user/relay_options.txt
  40. +1 −1 doc/en/autogen/user/rmodifier_commands.txt
  41. +19 −15 doc/en/autogen/user/script_commands.txt
  42. +5 −0 doc/en/autogen/user/script_options.txt
  43. +14 −7 doc/en/autogen/user/weechat_commands.txt
  44. +1 −1 doc/en/autogen/user/weechat_options.txt
  45. +14 −20 doc/en/weechat_dev.en.txt
  46. +1 −17 doc/en/weechat_faq.en.txt
  47. +152 −33 doc/en/weechat_plugin_api.en.txt
  48. +113 −38 doc/en/weechat_quickstart.en.txt
  49. +774 −108 doc/en/weechat_relay_protocol.en.txt
  50. +113 −20 doc/en/weechat_scripting.en.txt
  51. +79 −45 doc/en/weechat_user.en.txt
  52. +117 −41 doc/es/weechat_quickstart.es.txt
  53. +8 −4 doc/fr/autogen/plugin_api/completions.txt
  54. +6 −1 doc/fr/autogen/plugin_api/hdata.txt
  55. +1 −1 doc/fr/autogen/plugin_api/infolists.txt
  56. +2 −0 doc/fr/autogen/plugin_api/infos.txt
  57. +2 −3 doc/fr/autogen/user/alias_commands.txt
  58. +3 −3 doc/fr/autogen/user/aspell_commands.txt
  59. +1 −1 doc/fr/autogen/user/aspell_options.txt
  60. +7 −7 doc/fr/autogen/user/irc_commands.txt
  61. +29 −19 doc/fr/autogen/user/irc_options.txt
  62. +3 −1 doc/fr/autogen/user/relay_commands.txt
  63. +7 −2 doc/fr/autogen/user/relay_options.txt
  64. +1 −1 doc/fr/autogen/user/rmodifier_commands.txt
  65. +19 −15 doc/fr/autogen/user/script_commands.txt
  66. +7 −2 doc/fr/autogen/user/script_options.txt
  67. +21 −14 doc/fr/autogen/user/weechat_commands.txt
  68. +7 −7 doc/fr/autogen/user/weechat_options.txt
  69. +1 −17 doc/fr/weechat_faq.fr.txt
  70. +147 −27 doc/fr/weechat_plugin_api.fr.txt
  71. +114 −39 doc/fr/weechat_quickstart.fr.txt
  72. +116 −20 doc/fr/weechat_scripting.fr.txt
  73. +86 −47 doc/fr/weechat_user.fr.txt
  74. +9 −5 doc/it/autogen/plugin_api/completions.txt
  75. +7 −2 doc/it/autogen/plugin_api/hdata.txt
  76. +1 −1 doc/it/autogen/plugin_api/infolists.txt
  77. +3 −1 doc/it/autogen/plugin_api/infos.txt
  78. +20 −21 doc/it/autogen/user/alias_commands.txt
  79. +13 −13 doc/it/autogen/user/aspell_commands.txt
  80. +13 −13 doc/it/autogen/user/guile_commands.txt
  81. +8 −8 doc/it/autogen/user/irc_commands.txt
  82. +22 −12 doc/it/autogen/user/irc_options.txt
  83. +13 −13 doc/it/autogen/user/lua_commands.txt
  84. +13 −13 doc/it/autogen/user/perl_commands.txt
  85. +13 −13 doc/it/autogen/user/python_commands.txt
  86. +5 −3 doc/it/autogen/user/relay_commands.txt
  87. +8 −3 doc/it/autogen/user/relay_options.txt
  88. +14 −14 doc/it/autogen/user/rmodifier_commands.txt
  89. +13 −13 doc/it/autogen/user/ruby_commands.txt
  90. +20 −16 doc/it/autogen/user/script_commands.txt
  91. +25 −20 doc/it/autogen/user/script_options.txt
  92. +13 −13 doc/it/autogen/user/tcl_commands.txt
  93. +98 −91 doc/it/autogen/user/weechat_commands.txt
  94. +7 −7 doc/it/autogen/user/weechat_options.txt
  95. +2 −17 doc/it/weechat_faq.it.txt
  96. +182 −34 doc/it/weechat_plugin_api.it.txt
  97. +113 −40 doc/it/weechat_quickstart.it.txt
  98. +120 −20 doc/it/weechat_scripting.it.txt
  99. +79 −42 doc/it/weechat_user.it.txt
  100. +5 −1 doc/ja/autogen/plugin_api/completions.txt
  101. +5 −0 doc/ja/autogen/plugin_api/hdata.txt
  102. +2 −0 doc/ja/autogen/plugin_api/infos.txt
  103. +19 −20 doc/ja/autogen/user/alias_commands.txt
  104. +12 −12 doc/ja/autogen/user/aspell_commands.txt
  105. +22 −12 doc/ja/autogen/user/irc_options.txt
  106. +25 −23 doc/ja/autogen/user/relay_commands.txt
  107. +5 −0 doc/ja/autogen/user/relay_options.txt
  108. +14 −14 doc/ja/autogen/user/rmodifier_commands.txt
  109. +50 −46 doc/ja/autogen/user/script_commands.txt
  110. +5 −0 doc/ja/autogen/user/script_options.txt
  111. +98 −91 doc/ja/autogen/user/weechat_commands.txt
  112. +2 −2 doc/ja/autogen/user/weechat_options.txt
  113. +2 −17 doc/ja/weechat_faq.ja.txt
  114. +121 −41 doc/ja/weechat_quickstart.ja.txt
  115. +122 −20 doc/ja/weechat_scripting.ja.txt
  116. +77 −40 doc/ja/weechat_user.ja.txt
  117. +2 −17 doc/pl/weechat_faq.pl.txt
  118. +113 −38 doc/pl/weechat_quickstart.pl.txt
  119. +120 −20 doc/pl/weechat_scripting.pl.txt
  120. +115 −39 doc/ru/weechat_quickstart.ru.txt
  121. +30 −9 po/CMakeLists.txt
  122. +10 −10 po/POTFILES.in
  123. +267 −184 po/cs.po
  124. +345 −363 po/de.po
  125. +496 −451 po/es.po
  126. +399 −287 po/fr.po
  127. +245 −174 po/hu.po
  128. +547 −459 po/it.po
  129. +285 −191 po/ja.po
  130. +945 −644 po/pl.po
  131. +269 −184 po/pt_BR.po
  132. +254 −182 po/ru.po
  133. +10 −10 po/srcfiles.cmake
  134. +241 −154 po/weechat.pot
  135. +0 −35 src/CMakeLists.txt
  136. +0 −1 src/core/CMakeLists.txt
  137. +2 −2 src/core/wee-backtrace.c
  138. +216 −101 src/core/wee-command.c
  139. +32 −1 src/core/wee-completion.c
  140. +2 −2 src/core/wee-config-file.h
  141. +144 −72 src/core/wee-config.c
  142. +18 −2 src/core/wee-debug.c
  143. +1 −0 src/core/wee-debug.h
  144. +3 −3 src/core/wee-eval.c
  145. +80 −27 src/core/wee-hashtable.c
  146. +2 −2 src/core/wee-hashtable.h
  147. +11 −11 src/core/wee-hdata.c
  148. +4 −4 src/core/wee-hook.c
  149. +2 −2 src/core/wee-hook.h
  150. +2 −2 src/core/wee-log.c
  151. +9 −9 src/core/wee-network.c
  152. +10 −4 src/core/wee-string.c
  153. +23 −25 src/core/wee-upgrade.c
  154. +30 −0 src/core/wee-version.c
  155. +1 −0 src/core/wee-version.h
  156. +6 −12 src/core/weechat.c
  157. +0 −4 src/gui/CMakeLists.txt
  158. +1 −5 src/gui/Makefile.am
  159. +2 −2 src/gui/curses/gui-curses-chat.c
  160. +3 −4 src/gui/curses/gui-curses-key.c
  161. +3 −4 src/gui/curses/gui-curses-main.c
  162. +3 −3 src/gui/curses/gui-curses-mouse.c
  163. +6 −5 src/gui/curses/gui-curses-window.c
  164. +0 −72 src/gui/gtk/CMakeLists.txt
  165. +0 −46 src/gui/gtk/Makefile.am
  166. +0 −122 src/gui/gtk/gui-gtk-bar-window.c
  167. +0 −371 src/gui/gtk/gui-gtk-chat.c
  168. +0 −357 src/gui/gtk/gui-gtk-color.c
  169. +0 −284 src/gui/gtk/gui-gtk-main.c
  170. +0 −104 src/gui/gtk/gui-gtk-mouse.c
  171. +0 −935 src/gui/gtk/gui-gtk-window.c
  172. +0 −109 src/gui/gtk/gui-gtk.h
  173. +4 −4 src/gui/gui-bar.c
  174. +44 −23 src/gui/gui-buffer.c
  175. +3 −0 src/gui/gui-buffer.h
  176. +4 −3 src/gui/gui-chat.c
  177. +2 −2 src/gui/gui-color.c
  178. +11 −8 src/gui/gui-completion.c
  179. +2 −3 src/gui/gui-completion.h
  180. +3 −1 src/gui/gui-cursor.c
  181. +43 −28 src/gui/gui-filter.c
  182. +4 −2 src/gui/gui-filter.h
  183. +1 −1 src/gui/gui-focus.h
  184. +2 −2 src/gui/gui-hotlist.c
  185. +56 −30 src/gui/gui-input.c
  186. +2 −1 src/gui/gui-input.h
  187. +4 −4 src/gui/gui-key.c
  188. +358 −134 src/gui/gui-layout.c
  189. +44 −21 src/gui/gui-layout.h
  190. +36 −34 src/gui/gui-line.c
  191. +3 −3 src/gui/gui-line.h
  192. +69 −4 src/gui/gui-nicklist.c
  193. +98 −92 src/gui/gui-window.c
  194. +4 −7 src/gui/gui-window.h
  195. +4 −3 src/plugins/alias/alias.c
  196. +3 −0 src/plugins/aspell/CMakeLists.txt
  197. +6 −0 src/plugins/aspell/Makefile.am
  198. +410 −0 src/plugins/aspell/weechat-aspell-command.c
  199. +5 −15 src/{gui/gtk/gui-gtk-term.c → plugins/aspell/weechat-aspell-command.h}
  200. +106 −0 src/plugins/aspell/weechat-aspell-completion.c
  201. +5 −8 src/plugins/{irc/irc-display.h → aspell/weechat-aspell-completion.h}
  202. +29 −11 src/plugins/aspell/weechat-aspell-config.c
  203. +89 −0 src/plugins/aspell/weechat-aspell-info.c
  204. +5 −36 src/{gui/gtk/gui-gtk-key.c → plugins/aspell/weechat-aspell-info.h}
  205. +254 −79 src/plugins/aspell/weechat-aspell-speller.c
  206. +13 −12 src/plugins/aspell/weechat-aspell-speller.h
  207. +123 −550 src/plugins/aspell/weechat-aspell.c
  208. +4 −1 src/plugins/aspell/weechat-aspell.h
  209. +5 −3 src/plugins/fifo/fifo.c
  210. +3 −2 src/plugins/guile/CMakeLists.txt
  211. +1 −1 src/plugins/guile/weechat-guile-api.c
  212. +50 −27 src/plugins/guile/weechat-guile.c
  213. +0 −1 src/plugins/irc/CMakeLists.txt
  214. +0 −2 src/plugins/irc/Makefile.am
  215. +1 −1 src/plugins/irc/irc-bar-item.c
  216. +44 −3 src/plugins/irc/irc-buffer.c
  217. +2 −1 src/plugins/irc/irc-buffer.h
  218. +284 −2 src/plugins/irc/irc-channel.c
  219. +12 −1 src/plugins/irc/irc-channel.h
  220. +438 −22 src/plugins/irc/irc-command.c
  221. +147 −21 src/plugins/irc/irc-config.c
  222. +13 −2 src/plugins/irc/irc-config.h
  223. +0 −481 src/plugins/irc/irc-display.c
  224. +2 −23 src/plugins/irc/irc-ignore.c
  225. +2 −2 src/plugins/irc/irc-info.c
  226. +2 −2 src/plugins/irc/irc-message.c
  227. +2 −2 src/plugins/irc/irc-mode.c
  228. +20 −24 src/plugins/irc/irc-nick.c
  229. +1 −1 src/plugins/irc/irc-nick.h
  230. +133 −44 src/plugins/irc/irc-protocol.c
  231. +2 −2 src/plugins/irc/irc-redirect.c
  232. +1 −1 src/plugins/irc/irc-redirect.h
  233. +67 −35 src/plugins/irc/irc-server.c
  234. +2 −1 src/plugins/irc/irc-server.h
  235. +37 −2 src/plugins/irc/irc-upgrade.c
  236. +62 −30 src/plugins/lua/weechat-lua.c
  237. +64 −116 src/plugins/perl/weechat-perl.c
  238. +188 −48 src/plugins/plugin-script.c
  239. +3 −0 src/plugins/plugin-script.h
  240. +29 −4 src/plugins/python/weechat-python.c
  241. +4 −1 src/plugins/relay/CMakeLists.txt
  242. +7 −3 src/plugins/relay/Makefile.am
  243. +43 −42 src/plugins/relay/irc/relay-irc.c
  244. +2 −2 src/plugins/relay/irc/relay-irc.h
  245. +419 −25 src/plugins/relay/relay-client.c
  246. +20 −1 src/plugins/relay/relay-client.h
  247. +6 −1 src/plugins/relay/relay-command.c
  248. +49 −9 src/plugins/relay/relay-config.c
  249. +1 −0 src/plugins/relay/relay-config.h
  250. +86 −42 src/plugins/relay/relay-raw.c
  251. +2 −1 src/plugins/relay/relay-raw.h
  252. +33 −16 src/plugins/relay/relay-server.c
  253. +384 −0 src/plugins/relay/relay-websocket.c
  254. +39 −0 src/plugins/relay/relay-websocket.h
  255. +147 −108 src/plugins/relay/weechat/relay-weechat-msg.c
  256. +4 −1 src/plugins/relay/weechat/relay-weechat-msg.h
  257. +155 −0 src/plugins/relay/weechat/relay-weechat-nicklist.c
  258. +57 −0 src/plugins/relay/weechat/relay-weechat-nicklist.h
  259. +444 −216 src/plugins/relay/weechat/relay-weechat-protocol.c
  260. +16 −1 src/plugins/relay/weechat/relay-weechat-protocol.h
  261. +54 −89 src/plugins/relay/weechat/relay-weechat.c
  262. +5 −4 src/plugins/relay/weechat/relay-weechat.h
  263. +3 −2 src/plugins/rmodifier/rmodifier-command.c
  264. +5 −2 src/plugins/rmodifier/rmodifier-config.c
  265. +20 −18 src/plugins/ruby/weechat-ruby-api.c
  266. +33 −3 src/plugins/ruby/weechat-ruby.c
  267. +1 −4 src/plugins/script/CMakeLists.txt
  268. +103 −5 src/plugins/script/script-action.c
  269. +23 −21 src/plugins/script/script-buffer.c
  270. +26 −16 src/plugins/script/script-command.c
  271. +8 −0 src/plugins/script/script-config.c
  272. +1 −0 src/plugins/script/script-config.h
  273. +3 −3 src/plugins/script/script-repo.c
  274. +1 −1 src/plugins/script/script.c
  275. +34 −4 src/plugins/tcl/weechat-tcl.c
  276. +145 −47 src/plugins/xfer/xfer-dcc.c
  277. +25 −11 src/plugins/xfer/xfer-network.c
  278. +5 −3 src/plugins/xfer/xfer.c
  279. +9 −6 src/plugins/xfer/xfer.h
  280. +3 −1 weechat.spec
View
@@ -0,0 +1,5 @@
+# files/directories excluded from tarballs
+
+.git* export-ignore
+debian export-ignore
+weechat.spec export-ignore
View
@@ -47,4 +47,3 @@ weechat.pc
stamp*
src/gui/curses/weechat-curses
-src/gui/gtk/weechat-gtk
View
@@ -33,7 +33,7 @@ ENDIF(PREFIX)
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "0-rc3")
+SET(VERSION_PATCH "1-dev")
SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
SET(LICENSE "GPL3")
SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -64,7 +64,6 @@ ELSE(DEFINED INCLUDEDIR)
ENDIF(DEFINED INCLUDEDIR)
OPTION(ENABLE_NCURSES "Enable Ncurses interface" ON)
-OPTION(ENABLE_GTK "Enable GTK interface" OFF)
OPTION(ENABLE_NLS "Enable Native Language Support" ON)
OPTION(ENABLE_GNUTLS "Enable SSLv3/TLS support" ON)
OPTION(ENABLE_LARGEFILE "Enable Large File Support" ON)
@@ -157,7 +156,6 @@ SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
"/ltmain\\\\.sh$" "/\\\\.deps/" "/html/" "/html1/" "/Makefile$"
"/Makefile\\\\.in$" "stamp" "/po/.*\\\\.header$" "\\\\.gmo$" "~$" "\\\\.o$"
"\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat-curses$"
- "/weechat-gtk$"
)
INCLUDE(CPack)
View
209 ChangeLog
Oops, something went wrong.
View
@@ -57,11 +57,13 @@ EXTRA_DIST = CMakeLists.txt \
cmake/cmake_uninstall.cmake.in \
po/CMakeLists.txt \
po/srcfiles.cmake \
- weechat.spec \
weechat_icon_32.png \
weechat.pc.in
ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = weechat.pc
+
+clean-local:
+ $(RM) config-git.h
Oops, something went wrong.

0 comments on commit a81d38e

Please sign in to comment.