Version 0.4.2-rc2

core: update german translations
aspell: fix detection of word start/end when there are apostrophes or minus chars before/after word (thanks to Nils Görs)
2026-06-12 14:14:48 +02:00 · 2013-09-20 23:22:40 +02:00 · 2013-09-20 23:10:04 +02:00 · 2013-09-20 19:31:34 +02:00 · 2013-09-20 16:47:34 +02:00 · 2013-09-20 15:34:24 +02:00
704 changed files with 184812 additions and 93844 deletions
@@ -0,0 +1,5 @@
+# files/directories excluded from tarballs
+
+.git*         export-ignore
+debian        export-ignore
+weechat.spec  export-ignore
@@ -13,12 +13,15 @@
 *.so
 *.so.0
 *.so.0.0.0
+*.1

 ABOUT-NLS
 autom4te*
 build*/*
 config.guess
-config.h*
+config.h
+config.h.in*
+config-git.h
 config.log
 config.rpath
 config.status
@@ -40,12 +43,8 @@ POTFILES
 remove-potcdate.sed
 Rules-quot
 weechat.pc
-doc/de/build/*
-doc/en/build/*
-doc/fr/build/*

 *stamp
 stamp*

-src/gui/curses/weechat-curses
-src/gui/gtk/weechat-gtk
+src/gui/curses/weechat
@@ -6,48 +6,66 @@ Developers

 * General code

-** Sébastien Helleu <flashcode@flashtux.org>
-*** Web: http://www.weechat.org/
-*** IRC: 'FlashCode' on irc.freenode.net
-
+** Sébastien Helleu (FlashCode) <flashcode@flashtux.org>

 * Scripts plugins, debian packager

-** Emmanuel Bouthenot <kolter@openics.org>
-*** IRC: 'kolter' on irc.freenode.net
+** Emmanuel Bouthenot (kolter) <kolter@openics.org>


 Contributors
 ------------

-* Julien Louis <ptitlouis@sysif.net>, IRC: 'ptitlouis'
-* Rudolf Polzer <rpolzer-rp@durchnull.de>, IRC: 'divVerent'
-* Jiri Golembiovsky <golemj@gmail.com>, IRC: 'GolemJ'
-* Jim Ramsay <i.am@jimramsay.com>, IRC: 'lack'
-* Odin <odin@dtdm.org>, IRC: 'Odin'
-* Pistos, IRC: 'pistos'
-* Gwenn, IRC: 'gwenn'
-* Voroskoi, IRC: 'voroskoi'
-* Frank Zacharias
-* Pavel Shevchuk, IRC: 'Stalwart'
-* soltys
-* Nils Görs
-* rettub
-* Elián Hanisch, IRC: 'm4v'
-* Marco Paolone
+Alphabetically:
+
+* Ailin Nemui (Nei)
+* Aleksey V Zapparov
+* Andrew Potter
+* Antoine Pietri (seirl)
+* Arvydas Sidorenko
+* Benoit Papillault (benoit)
 * Dmitry Kobylin
 * Dominik Honnef
-* JD Horelick, IRC: 'jdhore'
-* Stefano Pigozzi
-* Ivan Sichmann Freitas
+* Elián Hanisch (m4v)
+* Elizabeth Myers (Elizacat)
+* Esteban I. Ruiz Moreno (Exio)
+* Frank Zacharias
 * Gu1ll4um3r0m41n
+* gwenn
+* Hasan Kiran (turgay)
+* Ivan Sichmann Freitas
+* JD Horelick (jdhore)
+* Jim Ramsay (lack)
+* Jiri Golembiovsky (GolemJ)
+* Julien Louis (ptitlouis)
+* Krzysztof Koroscik (soltys)
+* Kyle Fuller (kylef)
+* Lázaro A.
+* Marco Paolone
+* Mantas Mikulėnas (grawity)
+* Mateusz Poszwa
+* Nicolas Cavigneaux
+* Nils Görs (nils_2)
+* Odin
+* Pavel Shevchuk (Stalwart)
+* Peter Boström (pbos)
+* pistos
+* Quentin Glidic (SardemFF7)
+* Quico Noizeux
+* rettub
+* Rudolf Polzer (divVerent)
+* Ryuunosuke Ayanokouzi
+* Sergio Durigan Junior
+* Simon Arlott
+* Simon Kuhnle
+* Stefano Pigozzi
+* voroskoi


 Contact
 -------

-Whole team is connected to IRC:
-server: 'irc.freenode.net', channels: '#weechat' (english) and '#weechat-fr' (french)
+Developers are connected to IRC:

-
-See README file for license detail.
+* server: 'irc.freenode.net'
+* channels: '#weechat' (english) and '#weechat-fr' (french)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007-2008 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2008-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -32,8 +32,8 @@ IF(PREFIX)
 ENDIF(PREFIX)

 SET(VERSION_MAJOR "0")
-SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "6-rc3")
+SET(VERSION_MINOR "4")
+SET(VERSION_PATCH "2-rc2")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -49,6 +49,10 @@ IF(NOT DEFINED SHAREDIR)
  SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
 ENDIF(NOT DEFINED SHAREDIR)

+IF(NOT DEFINED MANDIR)
+  SET(MANDIR ${SHAREDIR}/man)
+ENDIF(NOT DEFINED MANDIR)
+
 IF(NOT DEFINED LOCALEDIR)
  SET(LOCALEDIR ${SHAREDIR}/locale)
 ENDIF(NOT DEFINED LOCALEDIR)
@@ -59,29 +63,49 @@ ELSE(DEFINED INCLUDEDIR)
  SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
 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_GCRYPT    "Enable libgcrypt support"         ON)
-OPTION(ENABLE_GNUTLS    "Enable SSLv3/TLS support"         ON)
-OPTION(ENABLE_LARGEFILE "Enable Large File Support"        ON)
-OPTION(ENABLE_ALIAS     "Enable Alias plugin"              ON)
-OPTION(ENABLE_ASPELL    "Enable Aspell plugin"             ON)
-OPTION(ENABLE_CHARSET   "Enable Charset plugin"            ON)
-OPTION(ENABLE_DEMO      "Enable Demo plugin"               OFF)
-OPTION(ENABLE_FIFO      "Enable FIFO plugin"               ON)
-OPTION(ENABLE_IRC       "Enable IRC plugin"                ON)
-OPTION(ENABLE_LOGGER    "Enable Logger plugin"             ON)
-OPTION(ENABLE_RELAY     "Enable Relay plugin"              ON)
-OPTION(ENABLE_RMODIFIER "Enable Rmodifier plugin"          ON)
-OPTION(ENABLE_SCRIPTS   "Enable script plugins"            ON)
-OPTION(ENABLE_PERL      "Enable Perl scripting language"   ON)
-OPTION(ENABLE_PYTHON    "Enable Python scripting language" ON)
-OPTION(ENABLE_RUBY      "Enable Ruby scripting language"   ON)
-OPTION(ENABLE_LUA       "Enable Lua scripting language"    ON)
-OPTION(ENABLE_TCL       "Enable Tcl scripting language"    ON)
-OPTION(ENABLE_XFER      "Enable Xfer plugin"               ON)
-OPTION(ENABLE_DOC       "Enable Documentation"             ON)
+OPTION(ENABLE_NCURSES   "Enable Ncurses interface"                  ON)
+OPTION(ENABLE_NLS       "Enable Native Language Support"            ON)
+OPTION(ENABLE_GNUTLS    "Enable SSLv3/TLS support"                  ON)
+OPTION(ENABLE_LARGEFILE "Enable Large File Support"                 ON)
+OPTION(ENABLE_ALIAS     "Enable Alias plugin"                       ON)
+OPTION(ENABLE_ASPELL    "Enable Aspell plugin"                      ON)
+OPTION(ENABLE_ENCHANT   "Enable Enchant lib for Aspell plugin"      OFF)
+OPTION(ENABLE_CHARSET   "Enable Charset plugin"                     ON)
+OPTION(ENABLE_FIFO      "Enable FIFO plugin"                        ON)
+OPTION(ENABLE_IRC       "Enable IRC plugin"                         ON)
+OPTION(ENABLE_LOGGER    "Enable Logger plugin"                      ON)
+OPTION(ENABLE_RELAY     "Enable Relay plugin"                       ON)
+OPTION(ENABLE_RMODIFIER "Enable Rmodifier plugin"                   ON)
+OPTION(ENABLE_SCRIPT    "Enable Script plugin (scripts manager)"    ON)
+OPTION(ENABLE_SCRIPTS   "Enable script plugins (perl, python, ...)" ON)
+OPTION(ENABLE_PERL      "Enable Perl scripting language"            ON)
+OPTION(ENABLE_PYTHON    "Enable Python scripting language"          ON)
+OPTION(ENABLE_PYTHON3   "Use Python 3.x if found (NOT recommended)" OFF)
+OPTION(ENABLE_RUBY      "Enable Ruby scripting language"            ON)
+OPTION(ENABLE_LUA       "Enable Lua scripting language"             ON)
+OPTION(ENABLE_TCL       "Enable Tcl scripting language"             ON)
+OPTION(ENABLE_GUILE     "Enable Scheme (guile) scripting language"  ON)
+OPTION(ENABLE_XFER      "Enable Xfer plugin"                        ON)
+OPTION(ENABLE_MAN       "Enable build of man page"                  OFF)
+OPTION(ENABLE_DOC       "Enable build of documentation"             OFF)
+
+# option WEECHAT_HOME
+IF(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
+  SET(WEECHAT_HOME "~/.weechat")
+ENDIF(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
+SET(WEECHAT_HOME "${WEECHAT_HOME}" CACHE
+  STRING "WeeChat home directory for config, logs, scripts.. (default is \"~/.weechat\")"
+  FORCE)
+MARK_AS_ADVANCED(CLEAR WEECHAT_HOME)
+
+# option CA_FILE
+IF(NOT DEFINED CA_FILE OR "${CA_FILE}" STREQUAL "")
+  SET(CA_FILE "/etc/ssl/certs/ca-certificates.crt")
+ENDIF(NOT DEFINED CA_FILE OR "${CA_FILE}" STREQUAL "")
+SET(CA_FILE "${CA_FILE}" CACHE
+  STRING "File containing the certificate authorities (default is \"/etc/ssl/certs/ca-certificates.crt\"). This is the default value of option \"weechat.network.gnutls_ca_file\"."
+  FORCE)
+MARK_AS_ADVANCED(CLEAR CA_FILE)

 IF(ENABLE_NLS)
  ADD_SUBDIRECTORY( po )
@@ -92,10 +116,10 @@ ADD_SUBDIRECTORY( doc )

 CONFIGURE_FILE(config.h.cmake config.h @ONLY)

-CONFIGURE_FILE(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/makedist.sh.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/makedist.sh" IMMEDIATE
-  @ONLY)
+# set the git version in "config-git.h"
+ADD_CUSTOM_TARGET(version_git ALL
+  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
+  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")

 CONFIGURE_FILE(
  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
@@ -106,9 +130,8 @@ ADD_CUSTOM_TARGET(uninstall
  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

 ADD_CUSTOM_TARGET(dist
-  "${CMAKE_BINARY_DIR}/makedist.sh"
-  DEPENDS doc
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+  "${CMAKE_CURRENT_SOURCE_DIR}/makedist.sh" "${VERSION}" "HEAD"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

 # pkgconfig file
 SET(PACKAGE "${PROJECT_NAME}")
@@ -119,6 +142,9 @@ SET(includedir "\${prefix}/include")
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig)

+# icon
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/32x32/apps)
+
 # packages
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
 SET(CPACK_PACKAGE_VENDOR "Sebastien Helleu")
@@ -142,8 +168,7 @@ SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
  "/install-sh$" "/missing$" "/intl/" "/libtool$" "/\\\\.libs/"
  "/ltmain\\\\.sh$" "/\\\\.deps/" "/html/" "/html1/" "/Makefile$"
  "/Makefile\\\\.in$" "stamp" "/po/.*\\\\.header$" "\\\\.gmo$" "~$" "\\\\.o$"
-  "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat-curses$"
-  "/weechat-gtk$"
+  "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat$"
 )

 INCLUDE(CPack)
@@ -1,11 +1,40 @@
 WeeChat Installation instructions
 =================================

-You can build WeeChat with cmake (recommended way) or autotools.
+WeeChat can be built with cmake (recommended) or autotools.
+
+[NOTE]
+Only cmake is officially supported to build WeeChat. You should use autotools
+only if you are not able to use cmake. +
+Build with autotools requires more dependencies and is slower than with cmake.


-With cmake
----------
+Dependencies
+------------
+
+Following packages are *required*:
+
+* cmake
+* libncurses
+* libcurl
+* zlib
+* libgcrypt
+
+Following packages are all optional:
+
+* for i18n: gettext
+* for SSL: gnutls, ca-certificates
+* for spell checking: aspell
+* for scripting: python, perl, ruby, lua, tcl, guile
+* for building doc: asciidoc, source-highlight
+  (for man page: xsltproc, docbook-xml, docbook-xsl)
+
+For a complete list of dependencies and versions recommended, please look at
+'User's guide'.
+
+
+Installation With cmake
+-----------------------

 ------------------------------------------------------------------
 mkdir build
@@ -15,22 +44,5 @@ make
 make install     (as root for installation in system directories)
 ------------------------------------------------------------------

-
-With autotools
--------------
-
----------------------------------------------------------------------
-./autogen.sh     (for cloned git repository only, not .tar.XX package)
-./configure --prefix=/where/you/want/install
-make
-make install     (as root for installation in system directories)
----------------------------------------------------------------------
-
-
-If you want to report bugs/crashes to developers, please:
-
- compile with debug info (type "Debug" for cmake build, default for autotools),
- enable core files (for bash shell, add "ulimit -c unlimited" to your ~/.bashrc).
-
-
-See AUTHORS for support, feel free to contact us for any problem.
+For more information or installation with autotools, please look at
+'User's guide': http://weechat.org/doc
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2006-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -19,39 +19,51 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-if DOC
-doc_dir = doc
-endif
+# This target will update file config-git.h with output of command "git describe"
+# (if needed, and only for a devel/rc version).
+BUILT_SOURCES = build-config-git.h
+build-config-git.h:
+	-$(abs_top_srcdir)/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h

-SUBDIRS = po $(doc_dir) intl src
+SUBDIRS = po doc intl src

 EXTRA_DIST = CMakeLists.txt \
             config.rpath \
             config.h.cmake \
-             cmake/cmake_uninstall.cmake.in \
+             git-version.sh \
+             makedist.sh \
+             cmake/CMakeParseArguments.cmake \
             cmake/FindAsciidoc.cmake \
             cmake/FindAspell.cmake \
-             cmake/FindGcrypt.cmake \
+             cmake/FindENCHANT.cmake \
+             cmake/FindGCRYPT.cmake \
             cmake/FindGettext.cmake \
             cmake/FindGnuTLS.cmake \
+             cmake/FindGuile.cmake \
             cmake/FindIconv.cmake \
             cmake/FindLua.cmake \
             cmake/FindNcurses.cmake \
+             cmake/FindPackageHandleStandardArgs.cmake \
             cmake/FindPerl.cmake \
             cmake/FindPkgConfig.cmake \
             cmake/FindPython.cmake \
             cmake/FindRuby.cmake \
             cmake/FindSourcehighlight.cmake \
             cmake/FindTCL.cmake \
-             cmake/makedist.sh.in \
+             cmake/FindZLIB.cmake \
+             cmake/cmake_uninstall.cmake.in \
             po/CMakeLists.txt \
             po/srcfiles.cmake \
-             weechat.spec \
-             weechat_icon_32.png \
-             weechat.pc.in \
-             UPGRADE_0.3
+             weechat.png \
+             weechat.pc.in

 ACLOCAL_AMFLAGS = -I m4

 pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = weechat.pc
+
+icondir   = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = weechat.png
+
+clean-local:
+	$(RM) config-git.h
@@ -1,114 +1,593 @@
-WeeChat News
-============
+WeeChat Release Notes
+=====================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.6-rc3, 2011-10-20
+v0.4.2-rc2, 2013-09-20


-Version 0.3.6 (under dev!)
+This document lists important changes for each version, that require manual
+actions. It is recommended to read it when upgrading to a new stable
+version.
+
+For a complete list of changes, please look at
+http://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
+(file 'ChangeLog' in sources).
+
+
+Version 0.4.2 (under dev!)
 --------------------------

-Important release notes:
+=== Day change message ===

-* bold is not used any more for basic colors (used only if terminal has less
-  than 16 colors), a new option has been added to force bold if needed:
-  'weechat.look.color_basic_force_bold'
-* option 'weechat.look.hline_char' has been renamed to
-  'weechat.look.separator_horizontal'
+The day change message is now dynamically displayed, and therefore is not stored
+as a line in buffer any more.
+
+Option 'weechat.look.day_change_time_format' has been split into two options
+'weechat.look.day_change_message_{1date|2dates}' (color codes are allowed in
+these options, see `/help eval`).
+
+New color option 'weechat.color.chat_day_change' has been added.
+
+After `/upgrade` from an old version, you will see two messages for each day
+change. This is a normal behavior and will not happen again with the next day
+changes.
+
+=== Regex search in buffer ===
+
+Search with regular expression has been added, and therefore some keys in search
+context have been changed.
+
+The key ctrl+"r" in search context is now used to switch string/regex search
+(instead of searching exact text).
+
+If you never changed keys in search context, you can reset them all with one
+command:
+
+----------------------------------------
+/key resetall -yes search
+----------------------------------------
+
+Or the manual method:
+
+----------------------------------------
+/key missing search
+/key bindctxt search ctrl-R /input search_switch_regex
+----------------------------------------
+
+To view keys in search context:
+
+----------------------------------------
+/key list search
+----------------------------------------
+
+For more information, see the chapter about keys in the 'WeeChat User's guide'.
+
+=== New rmodifier ===
+
+A new rmodifier "secure" has been added to hide passphrase and passwords
+displayed by command "/secure". Use command `/rmodifier missing` to add it.
+
+=== Color codes in options ===
+
+The format for color codes in some options has changed. The options are
+evaluated with the function "string_eval_expression", which uses the format
+`${color:xxx}`.
+
+Following options are affected:
+
+* 'weechat.look.buffer_time_format'
+* 'weechat.look.prefix_action'
+* 'weechat.look.prefix_error'
+* 'weechat.look.prefix_join'
+* 'weechat.look.prefix_network'
+* 'weechat.look.prefix_quit'
+
+The options using old format `${xxx}` must be changed with new format
+`${color:xxx}` (where xxx is a color name or number, with optional color
+attributes).
+
+Example:
+
+----------------------------------------
+/set weechat.look.buffer_time_format "${color:251}%H${color:243}%M${color:238}%S"
+----------------------------------------
+
+=== Binary and man page ===
+
+WeeChat binary and man page have been renamed from `weechat-curses` to
+`weechat`.
+
+A symbolic link has been added for binary: `weechat-curses` -> `weechat`
+(so that the /upgrade from a old version will still work).
+
+If you upgrade from an old version, it is recommended to force the use of the
+new binary name with the command: `/upgrade /path/to/weechat` (replace the path
+accordingly).
+
+[NOTE]
+For packagers: you should create the link `weechat-curses` -> `weechat` if it's
+not automatically created in the package (both cmake and configure are creating
+this link on make install).
+
+=== Man page / documentation ===
+
+Documentation is not built by default any more, you have to use option
+`-DENABLE_DOC=ON` in cmake to enable it.
+
+The man page is now built with asciidoc and translated in several
+languages. A new cmake option `ENABLE_MAN` has been added to compile man page
+(`OFF` by default).
+
+=== Aspell colors ===
+
+Option 'aspell.look.color' has been renamed to 'aspell.color.misspelled'.
+
+Version 0.4.1 (2013-05-20)
+--------------------------
+
+=== Nicklist diff in relay ===
+
+A new message with identifier "_nicklist_diff" has been added in relay (WeeChat
+protocol). WeeChat may decide to send full nicklist or this nicklist diff at any
+time (depending on size of message, the smaller is sent).
+
+Clients using nicklist must implement it.
+
+For more info about content of message, see document 'WeeChat Relay Protocol'.
+
+=== Dynamic nick prefix/suffix ===
+
+The nick prefix/suffix (for example: "<" and ">") are now dynamic and used on
+display (not stored any more in the line).
+
+Options moved from irc plugin (irc.conf) to core (weechat.conf):
+
+* 'irc.look.nick_prefix' moved to 'weechat.look.nick_prefix'
+* 'irc.look.nick_suffix' moved to 'weechat.look.nick_suffix'
+* 'irc.color.nick_prefix' moved to 'weechat.color.chat_nick_prefix'
+* 'irc.color.nick_suffix' moved to 'weechat.color.chat_nick_suffix'
+
+Types and default values for these four options remain unchanged.
+
+Two new options to customize the truncature char (by default "`+`"):
+
+* 'weechat.look.prefix_align_more_after' (boolean, 'on' by default)
+* 'weechat.look.prefix_buffer_align_more_after' (boolean, 'on' by default)
+
+When these options are enabled (default), the "`+`" is displayed after the
+text, replacing the space that should be displayed there. +
+When turned off, the "`+`" will replace last char of text.
+
+Example for a nicks "FlashCode" and "fc" with different values for options
+'weechat.look.prefix_align_max', 'weechat.look.prefix_align_more_after',
+'weechat.look.nick_prefix' and 'weechat.look.nick_suffix':
+
+----------------------------------------
+                      # align_max, more_after, prefix/suffix
+
+FlashCode │ test      # 0, on
+       fc │ test
+
+FlashCod+│ test       # 8, on
+      fc │ test
+
+FlashCo+ │ test       # 8, off
+      fc │ test
+
+<FlashCode> │ test    # 0, on,  < >
+       <fc> │ test
+
+<FlashC>+│ test       # 8, on,  < >
+    <fc> │ test
+
+<Flash+> │ test       # 8, off, < >
+    <fc> │ test
+----------------------------------------
+
+After `/upgrade`, if you set new options to non-empty strings, and if old
+options were set to non-empty strings too, you will see double prefix/suffix
+on old messages, this is normal behavior (lines displayed before `/upgrade`
+have prefix/suffix saved in prefix, but new lines don't have them any more).
+
+New options in logger plugin (logger.conf):
+
+* 'logger.file.nick_prefix': prefix for nicks in log files (default: empty
+  string)
+* 'logger.file.nick_suffix': suffix for nicks in log files (default: empty
+  string)
+
+=== IRC reconnection on important lag ===
+
+Option 'irc.network.lag_disconnect' has been renamed to
+'irc.network.lag_reconnect' and value is now a number of seconds (instead of
+minutes).
+
+=== IRC passwords hidden ===
+
+IRC plugin is now using modifiers "irc_command_auth" and "irc_message_auth" to
+hide passwords.
+
+The option 'irc.look.hide_nickserv_pwd' has been removed, and a new option
+'irc.look.nicks_hide_password' has been added (by default passwords are hidden
+only for "nickserv").
+
+A new rmodifier "message_auth" has been added to hide passwords displayed by
+command "/msg nickserv identify|register|ghost|release" and the rmodifier
+"nickserv" has been renamed to "command_auth".
+
+If you never added/changed rmodifiers, you can just reset all rmodifiers:
+
+----------------------------------------
+/rmodifier default -yes
+----------------------------------------
+
+If you added/changed some rmodifiers, do it manually with these commands:
+
+----------------------------------------
+/rmodifier del nickserv
+/rmodifier add command_auth history_add,input_text_display,irc_command_auth 1,4* ^(/(msg|quote) +nickserv +(id|identify|register|ghost \S+|release \S+) +)(.*)
+/rmodifier add message_auth irc_message_auth 1,3* ^(.*(id|identify|register|ghost \S+|release \S+) +)(.*)
+----------------------------------------
+
+=== Lua constants ===
+
+For consistency with other supported languages, the API constants in Lua have
+been redefined as constants instead of functions.
+
+Therefore, the use of a constant must be changed: the parentheses must be
+removed.
+
+The old syntax was:
+
+[source,lua]
+----------------------------------------
+return weechat.WEECHAT_RC_OK()
+----------------------------------------
+
+The new syntax is:
+
+[source,lua]
+----------------------------------------
+return weechat.WEECHAT_RC_OK
+----------------------------------------
+
+=== Guile callbacks ===
+
+The way to give arguments for guile callbacks has been fixed: now arguments are
+sent individually (instead of a list with all arguments inside).
+
+Therefore, existing guile scripts must be modified accordingly. Moreover,
+WeeChat now requires Guile ≥ 2.0 to compile.
+
+Version 0.4.0 (2013-01-20)
+--------------------------
+
+=== Conditions in bars ===
+
+Conditions in bars have changed, and now an expression is evaluated.
+
+If you have a value with many conditions in a bar, like: `nicklist,active`, you
+must now use an expression like: `${nicklist} && ${active}` (see the chapter
+about bars in the 'WeeChat User's guide').
+
+=== IPv6 by default ===
+
+==== IRC ====
+
+IPv6 is now used by default to connect to IRC servers, with fallback to
+IPv4. The option 'irc.server_default.ipv6' is now "on" by default. If IPv6 is
+not enabled or fails, IPv4 will be used. The "ipv6" option in server is now used
+to disable IPv6 and force IPv4 (if option is turned "off").
+
+==== Relay ====
+
+Relay plugin is now listening by default on an IPv6 socket (new option
+'relay.network.ipv6', on by default), so connections with IPv4 will have
+IPv4-mapped IPv6 addresses, like: "::ffff:127.0.0.1" (for "127.0.0.1"); check
+that value of option 'relay.network.allowed_ips' supports this mapping, or
+disable IPv6 in relay if you don't plan to use it at all:
+
+----------------------------------------
+/set relay.network.ipv6 off
+----------------------------------------
+
+Version 0.3.9.2 (2012-11-18)
+----------------------------
+
+This version fixes a security vulnerability when a plugin/script gives untrusted
+command to API function "hook_process".
+
+Version 0.3.9.1 (2012-11-09)
+----------------------------
+
+This version fixes crash when decoding IRC colors in strings.
+
+Version 0.3.9 (2012-09-29)
+--------------------------
+
+=== Options moved ===
+
+Options moved from core (weechat.conf) to irc plugin (irc.conf):
+
+* 'weechat.look.nickmode' moved to 'irc.look.nick_mode' (new type: integer
+   with values: none/prefix/action/both)
+* 'weechat.look.nickmode_empty' moved to 'irc.look.nick_mode_empty'
+
+=== New bar item buffer_modes ===
+
+A new bar item has been added: 'buffer_modes' and irc option
+'irc.look.item_channel_modes' has been removed; to display irc channel modes in
+status bar (after channel name), you have to manually add the new item
+'buffer_modes' (this is now used by default in status bar items), default value
+for status bar items becomes:
+
+----------------------------------------
+/set weechat.bar.status.items "[time],[buffer_count],[buffer_plugin],buffer_number+:+buffer_name+(buffer_modes)+{buffer_nicklist_count}+buffer_filter,[lag],[hotlist],completion,scroll"
+----------------------------------------
+
+=== Command /aspell ===
+
+New options in command `/aspell`:
+
+* `enable`: enable aspell
+* `disable`: disable aspell
+* `toggle`: toggle aspell (new default key: alt+"s")
+
+Options renamed in command `/aspell`:
+
+* `enable` renamed to `setdict` (set dictionary for current buffer)
+* `disable` renamed to `deldict` (delete dictionary used on current buffer)
+* `dictlist` renamed to `listdict` (show installed dictionaries)
+
+=== Horizontal separator ===
+
+An horizontal separator has been added between split windows, and two options
+have been added to toggle separators (both are enabled by default):
+
+* 'weechat.look.window_separator_horizontal'
+* 'weechat.look.window_separator_vertical'
+
+=== New keys ===
+
+New keys were added, use command `/key missing` to add them or `/key listdiff`
+to see differences between your current keys and WeeChat default keys.
+
+Version 0.3.8 (2012-06-03)
+--------------------------
+
+=== Options ===
+
+Options 'weechat.look.prefix_align_more' and
+'weechat.look.prefix_buffer_align_more' have been converted from type boolean to
+string:
+
+* if the value was on (default), new value is "+" and you can now customize this
+  char
+* if the value was off, you have to set " " (string with one space)
+
+=== Paste detection ===
+
+Option 'weechat.look.paste_max_lines' can now be used with value 0 to detect
+paste with one line (only if terminal "bracketed paste mode" is enabled when
+option 'weechat.look.paste_bracketed' is on); so now the value -1 is used to
+disable paste detection: if your value was 0, you should set it to -1
+
+----------------------------------------
+/set weechat.look.paste_max_lines -1
+----------------------------------------
+
+=== Rmodifier ===
+
+Rmodifier "nickserv" has a new default regex which includes option "release" for
+command "/msg nickserv".
+
+If you never added/changed rmodifiers, you can just reset all rmodifiers:
+
+----------------------------------------
+/rmodifier default -yes
+----------------------------------------
+
+If you added/changed some rmodifiers, do it manually with these commands:
+
+----------------------------------------
+/rmodifier del nickserv
+/rmodifier add nickserv history_add,input_text_display 1,4* ^(/(msg|quote) +nickserv +(id|identify|ghost \S+|release \S+) +)(.*)
+----------------------------------------
+
+Version 0.3.7 (2012-02-26)
+--------------------------
+
+=== Options ===
+
+Option `scroll_unread` has been moved from command `/input` to `/window`,
+therefore default command of key alt+"u" has been updated. To bind key with new
+default value:
+
+----------------------------------------
+/key bind meta-u /window scroll_unread
+----------------------------------------
+
+Option 'weechat.history.max_lines' has been renamed to
+'weechat.history.max_buffer_lines_number'.
+
+Option 'weechat.plugin.extension' now supports list of extensions, and new
+default value is ".so,.dll" (with this value, weechat.conf is compatible with
+Cygwin).
+
+=== Extended regex ===
+
+Extended regex is used in filters and irc ignore, so some chars that needed
+escape in past do not need any more (for example `[0-9]\+` becomes `[0-9]+`),
+filters and ignore have to be manually fixed.
+
+Option 'weechat.look.highlight_regex' becomes case insensitive by default, to
+make it case sensitive, use "(?-i)" at beginning of string, for example:
+"(?-i)FlashCode|flashy".
+
+Version 0.3.6 (2011-10-22)
+--------------------------
+
+=== Options ===
+
+Option 'weechat.look.hline_char' has been renamed to
+'weechat.look.separator_horizontal'.
+
+=== Bold in colors ===
+
+Bold is not used any more for basic colors (used only if terminal has less than
+16 colors), a new option has been added to force bold if needed:
+'weechat.look.color_basic_force_bold'.

 Version 0.3.5 (2011-05-15)
 --------------------------

-Important release notes:
+=== Colors ===

-* if you have some colors defined in section "palette" with version 0.3.4, you
-  should remove all colors defined, and add new aliases (it's not needed any
-  more to add colors before using them)
-* colors for nick prefixes (char for op, voice, ..) are defined in a single
-  option 'irc.color.nick_prefixes', therefore following options will be lost:
-  'irc.color.nick_prefix_op', 'irc.color.nick_prefix_halfop',
-  'irc.color.nick_prefix_voice', 'irc.color.nick_prefix_user'
-* count of messages have been added to hotlist by default, if you want to come
-  back to old behaviour, do that:
-** `/set weechat.look.hotlist_count_max 0`
-** `/set weechat.look.hotlist_buffer_separator ","`
-* when you are away, all buffers are now added to hotlist by default (even if
-  they are displayed in a window), if you want to come back to old behaviour, do
-  that:
-** `/set weechat.look.hotlist_add_buffer_if_away off`
-* new keys were added, use command `/key missing` to add them or `/key listdiff`
-  to see differences between your current keys and WeeChat default keys
+If you have some colors defined in section "palette" with version 0.3.4, you
+should remove all colors defined, and add new aliases (it's not needed any more
+to add colors before using them).
+
+Colors for nick prefixes (char for op, voice, ..) are defined in a single option
+'irc.color.nick_prefixes', therefore following options will be lost:
+'irc.color.nick_prefix_op', 'irc.color.nick_prefix_halfop',
+'irc.color.nick_prefix_voice', 'irc.color.nick_prefix_user'.
+
+=== Hotlist ===
+
+==== Counters ====
+
+Count of messages have been added to hotlist by default, if you want to come
+back to old behavior, do that:
+
+----------------------------------------
+/set weechat.look.hotlist_count_max 0
+/set weechat.look.hotlist_buffer_separator ","
+----------------------------------------
+
+==== Away and current buffer ====
+
+When you are away, all buffers are now added to hotlist by default (even if they
+are displayed in a window), if you want to come back to old behavior, do that:
+
+----------------------------------------
+/set weechat.look.hotlist_add_buffer_if_away off
+----------------------------------------
+
+=== New keys ===
+
+New keys were added, use command `/key missing` to add them or `/key listdiff`
+to see differences between your current keys and WeeChat default keys.

 Version 0.3.4 (2011-01-16)
 --------------------------

-Important release notes:
+=== After /upgrade ===

-* if you are using `/upgrade` from a previous release:
-** some nick prefixes can be wrong, so it is recommended to do `/allchan names`
-** nick colors are defined with a new option 'weechat.color.chat_nick_colors',
-   therefore old options 'weechat.color.chat_nick_color1..10' will be lost when
-   upgrading
-** nick colors in messages displayed will be wrong if you changed some nick colors
-   (old default colors will be used)
-* some IRC options have been renamed, before upgrading to this version, note
-  value for old options, and set them again with new name:
-** options moved from 'network' section to servers (with global value, and server
-   value, like other server options):
-*** 'irc.network.connection_timeout' moved to 'irc.server_default.connection_timeout'
-*** 'irc.network.anti_flood_prio_high' moved to 'irc.server_default.anti_flood_prio_high'
-*** 'irc.network.anti_flood_prio_low' moved to 'irc.server_default.anti_flood_prio_low'
-*** 'irc.network.away_check' moved to 'irc.server_default.away_check'
-*** 'irc.network.away_check_max_nicks' moved to 'irc.server_default.away_check_max_nicks'
-*** 'irc.network.default_msg_part' moved to 'irc.server_default.default_msg_part'
-*** 'irc.network.default_msg_quit' moved to 'irc.server_default.default_msg_quit'
-** other IRC options renamed:
-*** 'irc.look.open_channel_near_server' moved to 'irc.look.new_channel_position'
-    (old option was boolean, new is integer with value as string)
-*** 'irc.look.open_pv_near_server' moved to 'irc.look.new_pv_position'
-    (old option was boolean, new is integer with value as string)
+If you are using `/upgrade` from a previous release:
+
+* some nick prefixes can be wrong, so it is recommended to do `/allchan names`
+* nick colors are defined with a new option 'weechat.color.chat_nick_colors',
+  therefore old options 'weechat.color.chat_nick_color1..10' will be lost when
+  upgrading
+* nick colors in messages displayed will be wrong if you changed some nick colors
+  (old default colors will be used)
+
+=== Options ===
+
+Some IRC options have been renamed, before upgrading to this version, note
+value for old options, and set them again with new name:
+
+* options moved from 'network' section to servers (with global value, and server
+  value, like other server options):
+** 'irc.network.connection_timeout' moved to
+   'irc.server_default.connection_timeout'
+** 'irc.network.anti_flood_prio_high' moved to
+   'irc.server_default.anti_flood_prio_high'
+** 'irc.network.anti_flood_prio_low' moved to
+   'irc.server_default.anti_flood_prio_low'
+** 'irc.network.away_check' moved to 'irc.server_default.away_check'
+** 'irc.network.away_check_max_nicks' moved to
+   'irc.server_default.away_check_max_nicks'
+** 'irc.network.default_msg_part' moved to 'irc.server_default.default_msg_part'
+** 'irc.network.default_msg_quit' moved to 'irc.server_default.default_msg_quit'
+* other IRC options renamed:
+** 'irc.look.open_channel_near_server' moved to 'irc.look.new_channel_position'
+   (old option was boolean, new is integer with value as string)
+** 'irc.look.open_pv_near_server' moved to 'irc.look.new_pv_position'
+   (old option was boolean, new is integer with value as string)

 Version 0.3.3 (2010-08-07)
 --------------------------

-Important release notes:
+=== After /upgrade ===

-* if you are using `/upgrade` from a previous release, then you must reconnect
-  to IRC servers in order to use new command /wallchops.
-* option 'irc.network.lag_min_show' is now in milliseconds, you should set new
-  value: your current value multiplied by 1000 (new default value is 500).
+If you are using `/upgrade` from a previous release, then you must reconnect to
+IRC servers in order to use new command /wallchops.
+
+=== Options ===
+
+Option 'irc.look.show_away_once' has been renamed to
+'irc.look.display_pv_away_once'.
+
+Option 'irc.network.lag_min_show' is now in milliseconds, you should set new
+value: your current value multiplied by 1000 (new default value is 500).

 Version 0.3.2 (2010-04-18)
 --------------------------

+=== After /upgrade ===
+
 If you are using `/upgrade` from a previous release, then you must execute this
 command on all IRC servers/channels/private buffers and xfer DCC chats (not
-needed on WeeChat core buffer or buffers from other plugins/scripts): +
-`/buffer set highlight_words $nick`
+needed on WeeChat core buffer or buffers from other plugins/scripts):
+
+----------------------------------------
+/buffer set highlight_words $nick
+----------------------------------------

 Version 0.3.1.1 (2010-01-31)
 ----------------------------

-This version fixes crashs with SSL connection and purge of old DCC chats.
+This version fixes crashes with SSL connection and purge of old DCC chats.

-All users of version 0.2.2 should upgrade to this version.
+All users of version 0.3.1 should upgrade to this version.

 Version 0.3.1 (2010-01-23)
 --------------------------

+=== Aliases ===
+
 IRC commands /ame and /amsg are now aliases, if you are upgrading from version
-0.3.0, you must create aliases with following commands: +
-`/alias aaway allserv /away` +
-`/alias ame allchan /me` +
-`/alias amsg allchan /amsg *` +
-`/alias anick allserv /nick`
+0.3.0, you must create aliases with following commands:
+
+----------------------------------------
+/alias aaway allserv /away
+/alias ame allchan /me
+/alias amsg allchan /amsg *
+/alias anick allserv /nick
+----------------------------------------

 Version 0.3.0 (2009-09-06)
 --------------------------

-This version brings major changes, especially for configuration files and plugin
-API.
+This version brings *MAJOR* changes, especially for configuration files and
+plugin API and it not compatible with previous versions.

-For more information about this version, please read file 'UPGRADE_0.3'.
+Major differences:
+
+* it is *NOT POSSIBLE* to use command `/upgrade` from a version 0.2.x to 0.3.x;
+  you have to quit your old WeeChat, then run new version.
+* new configuration files (`*.conf`) are not compatible with old files (`*.rc`).
+* name of options is similar to old versions, but there is now one configuration
+  file by plugin, and one file for WeeChat core; there is
+  *no automatic conversion* for your old options to new configuration files,
+  so you'll have to setup again your IRC servers and all other options.
+* plugin API has been rewritten and is not compatible with previous versions;
+  accordingly, scripts and plugins must have been designed for version 0.3.x to
+  be loaded into WeeChat.
+
+More information about new API is available on wiki:
+http://wiki.flashtux.org/wiki/WeeChat_0.3.0
+and http://wiki.flashtux.org/wiki/WeeChat_0.3.0_API

 Version 0.2.6.3 (2009-06-13)
 ----------------------------
@@ -150,26 +629,47 @@ All users of version 0.2.2 should upgrade to this version.
 Version 0.2.2 (2007-01-06)
 --------------------------

-Important release notes:
+=== Charset plugin ===

-* new charset plugin:
-** for users of any previous version, all your charset settings in weechat.rc
-   will be LOST! You should save your weechat.rc to keep your values and set
-   them again with new 'charset' plugin.
-** for ISO users: history of channels may be without accents (after `/upgrade`),
-   this is not recoverable, but this is not a bug. All new messages should be
-   ok.
-** be careful, now default encode is UTF-8 for all channels (before it was
-   terminal charset). If you still want to send messages as 'ISO-8859-1', you
-   should send either global encode or server specific encode to 'ISO-8859-1':
-*** for global encode: `/setp charset.global.encode = "ISO-8859-1"`
-*** for server encode (on server buffer): `/charset encode ISO-8859-1`
-* new keys for topic scroll:
-** new keys for scrolling topic: F9/F10
-** key F10 was used for `infobar_clear` in previous WeeChat versions,
-   you have to manually rebind this key (except for new WeeChat users):
-*** `/key <press alt-k then F10> scroll_topic_right` (which gives something
-    like: `/key meta2-21~ scroll_topic_right`).
+For users of any previous version, all your charset settings in weechat.rc will
+be LOST! You should save your weechat.rc to keep your values and set them again
+with new 'charset' plugin.
+
+For ISO users: history of channels may be without accents (after `/upgrade`),
+this is not recoverable, but this is not a bug. All new messages should be OK.
+
+Be careful, now default encode is UTF-8 for all channels (before it was terminal
+charset). If you still want to send messages as 'ISO-8859-1', you should set
+either global encode or server specific encode to 'ISO-8859-1'.
+
+For global encode:
+
+----------------------------------------
+/setp charset.global.encode = "ISO-8859-1"
+----------------------------------------
+
+For server encode (on server buffer):
+
+----------------------------------------
+/charset encode ISO-8859-1
+----------------------------------------
+
+=== New keys ===
+
+New keys for topic scroll: F9/F10.
+
+Key F10 was used for `infobar_clear` in previous WeeChat versions, you have to
+manually rebind this key (except for new WeeChat users):
+
+----------------------------------------
+/key <press alt+"k" then F10> scroll_topic_right
+----------------------------------------
+
+Which gives something like:
+
+----------------------------------------
+/key meta2-21~ scroll_topic_right
+----------------------------------------

 Version 0.2.1 (2006-10-01)
 --------------------------
@@ -179,71 +679,98 @@ No release note.
 Version 0.2.0 (2006-08-19)
 --------------------------

-Important release notes:
+=== After /upgrade ===

-* if you upgraded with `/upgrade` in WeeChat, you should `/disconnect` and then
-  `/reconnect` on each server, to display properly channel/user modes.
-* if you're using plugins, you should remove some old plugins libraries in
-  WeeChat system library directory (commonly '/usr/local/lib/weechat/plugins'):
-  remove `lib*` files (like `libperl.*`, `libpython.*`, ..) and keep only new
-  libraries (`perl.*`, `python.*`, ..).
+If you upgraded with `/upgrade` in WeeChat, you should `/disconnect` and then
+`/reconnect` on each server, to display properly channel/user modes.
+
+=== Plugins ===
+
+If you're using plugins, you should remove some old plugins libraries in WeeChat
+system library directory (commonly '/usr/local/lib/weechat/plugins'): remove
+`lib*` files (like `libperl.*`, `libpython.*`, ..) and keep only new libraries
+(`perl.*`, `python.*`, ..).

 Version 0.1.9 (2006-05-25)
 --------------------------

-Important release notes:
+=== DCC chat ===

-* please close all DCC chat buffers before using /upgrade command, otherwise you
-  may experience problems with DCC chats.
-* some changes in script API: now timer handlers functions takes exactly
-  0 (zero) argument (in version 0.1.8, two arguments were mandatory but not
-  used: server and args).
+Please close all DCC chat buffers before using /upgrade command, otherwise you
+may experience problems with DCC chats.
+
+=== Script API ===
+
+Some changes in script API: now timer handlers functions takes exactly 0 (zero)
+argument (in version 0.1.8, two arguments were mandatory but not used: server
+and arguments).

 Version 0.1.8 (2006-03-18)
 --------------------------

-Important release notes:
+=== After /upgrade ===

-* it is recommended for users of version 0.1.7 (or any older), to
-  replace values in setup file ('~/.weechat/weechat.rc'):
-** option: log_path: replace '~/.weechat/logs' by '%h/logs'
-** option: plugins_path: replace '~/.weechat/plugins' by '%h/plugins' +
-   '%h' is replaced by WeeChat home (default: '~/.weechat', may be overriden
-   by new command line arg `--dir`).
-* after installing 0.1.8 (or with `/upgrade`), issue both commands (if you
-  didn't redefine these keys (alt-home/end):
-** `/key unbind meta-meta2-1~`
-** `/key unbind meta-meta2-4~`
-** then launch again WeeChat (or issue `/upgrade`).
-* Keys alt-home/end were used for nicklist scroll, they're now replaced by
-  alt-F11/F12.
+After installing 0.1.8 (or with `/upgrade`), issue both commands (if you didn't
+redefine these keys (alt+{home|end}):
+
+----------------------------------------
+/key unbind meta-meta2-1~
+/key unbind meta-meta2-4~
+----------------------------------------
+
+Then launch again WeeChat (or issue `/upgrade`).
+
+=== Configuration files ===
+
+It is recommended for users of version 0.1.7 (or any older), to replace values
+in setup file ('~/.weechat/weechat.rc'):
+
+* option: log_path: replace '~/.weechat/logs' by '%h/logs'
+* option: plugins_path: replace '~/.weechat/plugins' by '%h/plugins'
+
+The string '%h' is replaced by WeeChat home (default: '~/.weechat', may be
+overridden by new command line argument `--dir`).
+
+=== Keys ===
+
+Keys alt+{home|end} were used for nicklist scroll, they're now replaced by
+alt+{F11|F12}.

 Version 0.1.7 (2006-01-14)
 --------------------------

-Important release notes:
+=== Ruby ===

-* Ruby script plugin has been added but is experimental in this release.
-  You're warned!
-* `/away` command was changed to be RFC 2812 compliant. Now argument is required
-  to set away, and no argument means remove away ("back"). Option
-  'irc_default_msg_away' has been removed.
+Ruby script plugin has been added but is experimental in this release. You're
+warned!
+
+=== Command /away ===
+
+Command `/away` was changed to be RFC 2812 compliant. Now argument is required
+to set away, and no argument means remove away ("back").
+
+Option 'irc_default_msg_away' has been removed.

 Version 0.1.6 (2005-11-11)
 --------------------------

-Important release notes:
+=== Script API ===

-* incompatibility with some old scripts: now all handlers have to return a code
-  for completion, and to do some actions about message to ignore (please look at
-  documentation for detail).
-* on OpenBSD, the new option 'plugins_extension' should be set to '.so.0.0'
-  since the plugins names are ending by '.so.0.0' and not '.so'.
-* with new and full UTF-8 support, the option 'look_charset_internal' should be
-  set to blank for most cases. Forces it only if your locale is not properly
-  detected by WeeChat (you can set 'UTF-8' or 'ISO-8859-15' for example,
-  depending on your locale). WeeChat is looking for 'UTF-8' in your locale name
-  at startup.
+Incompatibility with some old scripts: now all handlers have to return a code
+for completion, and to do some actions about message to ignore (please look at
+documentation for detail).
+
+=== OpenBSD ===
+
+On OpenBSD, the new option 'plugins_extension' should be set to '.so.0.0' since
+the plugins names are ending by '.so.0.0' and not '.so'.
+
+=== UTF-8 ===
+
+With new and full UTF-8 support, the option 'look_charset_internal' should be
+set to blank for most cases. Forces it only if your locale is not properly
+detected by WeeChat (you can set 'UTF-8' or 'ISO-8859-15' for example, depending
+on your locale). WeeChat is looking for 'UTF-8' in your locale name at startup.

 Version 0.1.5 (2005-09-24)
 --------------------------
@@ -11,23 +11,18 @@ Features
 --------

 * chat client with multi-protocols/servers connection
-* many GUI (curses, Gtk, Qt) (1)
 * small, fast and very light
-* customizable and extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl)
+* customizable and extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl, Guile)
 * compliant with IRC RFCs 1459, 2810, 2811, 2812 and 2813
 * developed from scratch
-* multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other) (2)
+* multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other)
 * free software, released under GPLv3

-NOTE: (1) only Curses interface is available today
-      +
-      (2) Windows version is under construction
-

 Copyright
 ---------

-Copyright (C) 2003-2011 Sébastien Helleu <flashcode@flashtux.org>
+Copyright (C) 2003-2013 Sébastien Helleu <flashcode@flashtux.org>

 This file is part of WeeChat, the extensible chat client.

@@ -1,83 +0,0 @@
-WeeChat Upgrade to 0.3.x
-========================
-Sébastien Helleu <flashcode@flashtux.org>
-v0.3.0, 2009-09-06
-
-
-This document lists major changes introduced in version 0.3.0 and not compatible
-with versions 0.2.x.
-
-
-Upgrade to version 0.3.x
------------------------
-
-It is *NOT POSSIBLE* to use command `/upgrade` from a version 0.2.x to 0.3.x.
-You have to quit your old WeeChat, then run new version.
-
-Of course, command `/upgrade` is working fine once you'll be with 0.3.x to
-upgrade to another 0.3.x (unless this command is broken again, please look
-at release notes (file 'NEWS') for version you're currently installing).
-
-
-Configuration files
-------------------
-
-Changes with previous versions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-New configuration files (`*.conf`) are not compatible with old files (`*.rc`).
-
-Name of options is similar to old versions, but there is now one configuration
-file by plugin, and one file for WeeChat core.
-
-There is *no automatic conversion* for your old options to new configuration files,
-so you'll have to setup again your IRC servers and all other options.
-
-In WeeChat, option names are now with format: `plugin.section.option` (for
-WeeChat core, `plugin` is `weechat`).
-
-Examples:
-
-* WeeChat options: `weechat.xxx.yyy`
-* IRC options: `irc.xxx.yyy`
-
-You should read quickstart guide to be familiar with basic commands and syntax
-(some commands like `/server` have changed): http://www.weechat.org/doc
-
-
-List of configuration files
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Old configuration files:
-** weechat.rc
-** plugins.rc
-* New configuration files are now (with default plugins):
-** weechat.conf
-** alias.conf
-** aspell.conf
-** charset.conf
-** irc.conf
-** jabber.conf
-** logger.conf
-** plugins.conf
-** relay.conf
-** xfer.conf
-
-
-Plugin API
----------
-
-Plugin API has been rewritten and is not compatible with previous versions.
-Accordingly, scripts and plugins must have been designed for version 0.3.x to
-be loaded into WeeChat.
-
-There is no migration script today to convert old script to new API.
-Therefore, if you plan to use old script, you'll have to wait for new version
-or you can convert script yourself and send us new version ;)
-
-You can download scripts for new API on plugins page:
-http://www.weechat.org/plugins
-
-More information about new API is available on wiki:
-http://wiki.flashtux.org/wiki/WeeChat_0.3.0
-and http://wiki.flashtux.org/wiki/WeeChat_0.3.0_API
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -23,8 +23,6 @@
 ###
 ### common stuff
 ###
-OK="\\033[70G[\\033[1;32mOK\\033[1;00m]"
-FAIL="\\033[70G[\\033[1;31mFAILED\\033[1;00m]"

 AUTOGEN_LOG=autogen.log

@@ -40,12 +38,12 @@ err ()

 run ()
 {
-    echo -n "Running \"$@\""
+    echo -n "Running \"$@\"..."
    eval $@ >$AUTOGEN_LOG 2>&1
    if [ $? = 0 ] ; then
-        echo -e $OK
+        echo " OK"
    else
-        echo -e $FAIL
+        echo " FAILED"
        err
    fi
 }
@@ -0,0 +1,138 @@
+# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords> <multi_value_keywords> args...)
+#
+# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions for
+# parsing the arguments given to that macro or function.
+# It processes the arguments and defines a set of variables which hold the
+# values of the respective options.
+#
+# The <options> argument contains all options for the respective macro,
+# i.e. keywords which can be used when calling the macro without any value
+# following, like e.g. the OPTIONAL keyword of the install() command.
+#
+# The <one_value_keywords> argument contains all keywords for this macro
+# which are followed by one value, like e.g. DESTINATION keyword of the
+# install() command.
+#
+# The <multi_value_keywords> argument contains all keywords for this macro
+# which can be followed by more than one value, like e.g. the TARGETS or
+# FILES keywords of the install() command.
+#
+# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the
+# keywords listed in <options>, <one_value_keywords> and
+# <multi_value_keywords> a variable composed of the given <prefix>
+# followed by "_" and the name of the respective keyword.
+# These variables will then hold the respective value from the argument list.
+# For the <options> keywords this will be TRUE or FALSE.
+#
+# All remaining arguments are collected in a variable
+# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see whether
+# your macro was called with unrecognized parameters.
+#
+# As an example here a my_install() macro, which takes similar arguments as the
+# real install() command:
+#
+#   function(MY_INSTALL)
+#     set(options OPTIONAL FAST)
+#     set(oneValueArgs DESTINATION RENAME)
+#     set(multiValueArgs TARGETS CONFIGURATIONS)
+#     cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+#     ...
+#
+# Assume my_install() has been called like this:
+#   my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub)
+#
+# After the cmake_parse_arguments() call the macro will have set the following
+# variables:
+#   MY_INSTALL_OPTIONAL = TRUE
+#   MY_INSTALL_FAST = FALSE (this option was not used when calling my_install()
+#   MY_INSTALL_DESTINATION = "bin"
+#   MY_INSTALL_RENAME = "" (was not used)
+#   MY_INSTALL_TARGETS = "foo;bar"
+#   MY_INSTALL_CONFIGURATIONS = "" (was not used)
+#   MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL"
+#
+# You can the continue and process these variables.
+#
+# Keywords terminate lists of values, e.g. if directly after a one_value_keyword
+# another recognized keyword follows, this is interpreted as the beginning of
+# the new option.
+# E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in
+# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would
+# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor.
+
+#=============================================================================
+# Copyright 2010 Alexander Neundorf <neundorf@kde.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+
+if(__CMAKE_PARSE_ARGUMENTS_INCLUDED)
+  return()
+endif()
+set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE)
+
+
+function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
+  # first set all result variables to empty/FALSE
+  foreach(arg_name ${_singleArgNames} ${_multiArgNames})
+    set(${prefix}_${arg_name})
+  endforeach(arg_name)
+
+  foreach(option ${_optionNames})
+    set(${prefix}_${option} FALSE)
+  endforeach(option)
+
+  set(${prefix}_UNPARSED_ARGUMENTS)
+
+  set(insideValues FALSE)
+  set(currentArgName)
+
+  # now iterate over all arguments and fill the result variables
+  foreach(currentArg ${ARGN})
+    list(FIND _optionNames "${currentArg}" optionIndex)  # ... then this marks the end of the arguments belonging to this keyword
+    list(FIND _singleArgNames "${currentArg}" singleArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
+    list(FIND _multiArgNames "${currentArg}" multiArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
+
+    if(${optionIndex} EQUAL -1  AND  ${singleArgIndex} EQUAL -1  AND  ${multiArgIndex} EQUAL -1)
+      if(insideValues)
+        if("${insideValues}" STREQUAL "SINGLE")
+          set(${prefix}_${currentArgName} ${currentArg})
+          set(insideValues FALSE)
+        elseif("${insideValues}" STREQUAL "MULTI")
+          list(APPEND ${prefix}_${currentArgName} ${currentArg})
+        endif()
+      else(insideValues)
+        list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg})
+      endif(insideValues)
+    else()
+      if(NOT ${optionIndex} EQUAL -1)
+        set(${prefix}_${currentArg} TRUE)
+        set(insideValues FALSE)
+      elseif(NOT ${singleArgIndex} EQUAL -1)
+        set(currentArgName ${currentArg})
+        set(${prefix}_${currentArgName})
+        set(insideValues "SINGLE")
+      elseif(NOT ${multiArgIndex} EQUAL -1)
+        set(currentArgName ${currentArg})
+        set(${prefix}_${currentArgName})
+        set(insideValues "MULTI")
+      endif()
+    endif()
+
+  endforeach(currentArg)
+
+  # propagate the result variables to the caller:
+  foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames})
+    set(${prefix}_${arg_name}  ${${prefix}_${arg_name}} PARENT_SCOPE)
+  endforeach(arg_name)
+  set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE)
+
+endfunction(CMAKE_PARSE_ARGUMENTS _options _singleArgs _multiArgs)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -30,17 +30,22 @@ FIND_PROGRAM(
  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
 )

-IF(ASCIIDOC_EXECUTABLE)
+FIND_PROGRAM(
+  A2X_EXECUTABLE a2x
+  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
+)
+
+IF(ASCIIDOC_EXECUTABLE AND A2X_EXECUTABLE)
  EXECUTE_PROCESS(
    COMMAND ${ASCIIDOC_EXECUTABLE} --version
    OUTPUT_VARIABLE ASCIIDOC_VERSION
    )
-  
+
  IF(${ASCIIDOC_VERSION} MATCHES "asciidoc 8.*")
    SET(ASCIIDOC_FOUND TRUE)
  ENDIF(${ASCIIDOC_VERSION} MATCHES "asciidoc 8.*")
-  
+
  MARK_AS_ADVANCED(
    ASCIIDOC_EXECUTABLE
    )
-ENDIF(ASCIIDOC_EXECUTABLE)
+ENDIF(ASCIIDOC_EXECUTABLE AND A2X_EXECUTABLE)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -0,0 +1,44 @@
+# - Try to find the Enchant spell checker
+# Once done this will define
+#
+#  ENCHANT_FOUND - system has ENCHANT
+#  ENCHANT_INCLUDE_DIR - the ENCHANT include directory
+#  ENCHANT_LIBRARIES - Link these to use ENCHANT
+#  ENCHANT_DEFINITIONS - Compiler switches required for using ENCHANT
+
+# Copyright (c) 2006, Zack Rusin, <zack@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+
+  # in cache already
+  set(ENCHANT_FOUND TRUE)
+
+else (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+  if (NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PC_ENCHANT enchant)
+    set(ENCHANT_DEFINITIONS ${PC_ENCHANT_CFLAGS_OTHER})
+  endif (NOT WIN32)
+
+  find_path(ENCHANT_INCLUDE_DIR
+            NAMES enchant++.h
+            HINTS ${PC_ENCHANT_INCLUDEDIR}
+                  ${PC_ENCHANT_INCLUDE_DIRS}
+            PATH_SUFFIXES enchant )
+
+  find_library(ENCHANT_LIBRARIES NAMES enchant
+               HINTS ${PC_ENCHANT_LIBDIR}
+                      ${PC_ENCHANT_LIBRARY_DIRS} )
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(ENCHANT  DEFAULT_MSG  ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES )
+
+  mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)
+
+endif (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -36,15 +36,18 @@ IF(LIBGCRYPT_CONFIG_EXECUTABLE)

   EXEC_PROGRAM(${LIBGCRYPT_CONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS)
   EXEC_PROGRAM(${LIBGCRYPT_CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS)
-   
+
   IF(${GCRYPT_CFLAGS} MATCHES "\n")
      SET(GCRYPT_CFLAGS " ")
   ENDIF(${GCRYPT_CFLAGS} MATCHES "\n")
-   
-   IF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
-      SET(GCRYPT_FOUND TRUE)
-   ENDIF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)

 ENDIF(LIBGCRYPT_CONFIG_EXECUTABLE)

-MARK_AS_ADVANCED(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/FindPackageHandleStandardArgs.cmake)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GCRYPT REQUIRED_VARS GCRYPT_LDFLAGS GCRYPT_CFLAGS)
+
+IF(GCRYPT_FOUND)
+  MARK_AS_ADVANCED(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+ENDIF(GCRYPT_FOUND)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -63,7 +63,7 @@ IF(HAVE_LIBINTL_H)
      ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
      ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-      
+
      IF(LIBINTL_HAS_DGETTEXT)
        SET(GETTEXT_FOUND TRUE)
      ENDIF(LIBINTL_HAS_DGETTEXT)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2011-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -17,9 +17,21 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-ADD_LIBRARY(demo MODULE demo.c)
-SET_TARGET_PROPERTIES(demo PROPERTIES PREFIX "")
+# - Find Guile
+# This module finds if Guile is installed and determines where the include files
+# and libraries are. It also determines what the name of the library is. This
+# code sets the following variables:
+#
+# GUILE_FOUND        = Guile is installed
+# GUILE_INCLUDE_DIRS = Guile include directory
+# GUILE_LIBRARIES    = Link options to compile Guile

-TARGET_LINK_LIBRARIES(demo)
+IF(GUILE_FOUND)
+   # Already in cache, be silent
+   SET(GUILE_FIND_QUIETLY TRUE)
+ENDIF(GUILE_FOUND)

-INSTALL(TARGETS demo LIBRARY DESTINATION ${LIBDIR}/plugins)
+FIND_PACKAGE(PkgConfig)
+IF(PKG_CONFIG_FOUND)
+  pkg_search_module(GUILE guile-2.0)
+ENDIF(PKG_CONFIG_FOUND)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -49,10 +49,11 @@ FIND_LIBRARY(ICONV_LIBRARY
 IF(ICONV_INCLUDE_PATH)
  IF(ICONV_LIBRARY)
    STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
-    CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
-    IF(NOT ICONV_FOUND)
-      CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
-    ENDIF(NOT ICONV_FOUND)
+    CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
+    CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
+    IF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
+       SET(ICONV_FOUND TRUE)
+    ENDIF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
  ELSE(ICONV_LIBRARY)
    CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND)
  ENDIF(ICONV_LIBRARY)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -24,7 +24,7 @@ ENDIF(NCURSES_FOUND)
 FIND_PATH(NCURSES_INCLUDE_PATH
  NAMES ncurses.h curses.h
  PATHS /usr/include/ncursesw /usr/include/ncurses /usr/include
-  /usr/local/include/ncursesw /usr/local/include/ncuses /usr/local/include
+  /usr/local/include/ncursesw /usr/local/include/ncurses /usr/local/include
  /usr/pkg/include/ncursesw /usr/pkg/include/ncurses /usr/pkg/include
 )

@@ -0,0 +1,260 @@
+# FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> ... )
+#
+# This function is intended to be used in FindXXX.cmake modules files.
+# It handles the REQUIRED, QUIET and version-related arguments to FIND_PACKAGE().
+# It also sets the <UPPERCASED_NAME>_FOUND variable.
+# The package is considered found if all variables <var1>... listed contain
+# valid results, e.g. valid filepaths.
+#
+# There are two modes of this function. The first argument in both modes is
+# the name of the Find-module where it is called (in original casing).
+#
+# The first simple mode looks like this:
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> (DEFAULT_MSG|"Custom failure message") <var1>...<varN> )
+# If the variables <var1> to <varN> are all valid, then <UPPERCASED_NAME>_FOUND
+# will be set to TRUE.
+# If DEFAULT_MSG is given as second argument, then the function will generate
+# itself useful success and error messages. You can also supply a custom error message
+# for the failure case. This is not recommended.
+#
+# The second mode is more powerful and also supports version checking:
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME [REQUIRED_VARS <var1>...<varN>]
+#                                           [VERSION_VAR   <versionvar>
+#                                           [CONFIG_MODE]
+#                                           [FAIL_MESSAGE "Custom failure message"] )
+#
+# As above, if <var1> through <varN> are all valid, <UPPERCASED_NAME>_FOUND
+# will be set to TRUE.
+# After REQUIRED_VARS the variables which are required for this package are listed.
+# Following VERSION_VAR the name of the variable can be specified which holds
+# the version of the package which has been found. If this is done, this version
+# will be checked against the (potentially) specified required version used
+# in the find_package() call. The EXACT keyword is also handled. The default
+# messages include information about the required version and the version
+# which has been actually found, both if the version is ok or not.
+# Use the option CONFIG_MODE if your FindXXX.cmake module is a wrapper for
+# a find_package(... NO_MODULE) call, in this case all the information
+# provided by the config-mode of find_package() will be evaluated
+# automatically.
+# Via FAIL_MESSAGE a custom failure message can be specified, if this is not
+# used, the default message will be displayed.
+#
+# Example for mode 1:
+#
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2  DEFAULT_MSG  LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR)
+#
+# LibXml2 is considered to be found, if both LIBXML2_LIBRARY and
+# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE.
+# If it is not found and REQUIRED was used, it fails with FATAL_ERROR,
+# independent whether QUIET was used or not.
+# If it is found, success will be reported, including the content of <var1>.
+# On repeated Cmake runs, the same message won't be printed again.
+#
+# Example for mode 2:
+#
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(BISON  REQUIRED_VARS BISON_EXECUTABLE
+#                                             VERSION_VAR BISON_VERSION)
+# In this case, BISON is considered to be found if the variable(s) listed
+# after REQUIRED_VAR are all valid, i.e. BISON_EXECUTABLE in this case.
+# Also the version of BISON will be checked by using the version contained
+# in BISON_VERSION.
+# Since no FAIL_MESSAGE is given, the default messages will be printed.
+#
+# Another example for mode 2:
+#
+#    FIND_PACKAGE(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4)
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(Automoc4  CONFIG_MODE)
+# In this case, FindAutmoc4.cmake wraps a call to FIND_PACKAGE(Automoc4 NO_MODULE)
+# and adds an additional search directory for automoc4.
+# The following FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper
+# success/error message.
+
+#=============================================================================
+# Copyright 2007-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+INCLUDE(FindPackageMessage)
+INCLUDE(CMakeParseArguments)
+
+# internal helper macro
+MACRO(_FPHSA_FAILURE_MESSAGE _msg)
+  IF (${_NAME}_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "${_msg}")
+  ELSE (${_NAME}_FIND_REQUIRED)
+    IF (NOT ${_NAME}_FIND_QUIETLY)
+      MESSAGE(STATUS "${_msg}")
+    ENDIF (NOT ${_NAME}_FIND_QUIETLY)
+  ENDIF (${_NAME}_FIND_REQUIRED)
+ENDMACRO(_FPHSA_FAILURE_MESSAGE _msg)
+
+
+# internal helper macro to generate the failure message when used in CONFIG_MODE:
+MACRO(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
+  # <name>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
+  IF(${_NAME}_CONFIG)
+    _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing: ${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
+  ELSE(${_NAME}_CONFIG)
+    # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
+    # List them all in the error message:
+    IF(${_NAME}_CONSIDERED_CONFIGS)
+      SET(configsText "")
+      LIST(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
+      MATH(EXPR configsCount "${configsCount} - 1")
+      FOREACH(currentConfigIndex RANGE ${configsCount})
+        LIST(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
+        LIST(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
+        SET(configsText "${configsText}    ${filename} (version ${version})\n")
+      ENDFOREACH(currentConfigIndex)
+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}")
+
+    ELSE(${_NAME}_CONSIDERED_CONFIGS)
+      # Simple case: No Config-file was found at all:
+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
+    ENDIF(${_NAME}_CONSIDERED_CONFIGS)
+  ENDIF(${_NAME}_CONFIG)
+ENDMACRO(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
+
+
+FUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
+
+# set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in
+# new extended or in the "old" mode:
+  SET(options CONFIG_MODE)
+  SET(oneValueArgs FAIL_MESSAGE VERSION_VAR)
+  SET(multiValueArgs REQUIRED_VARS)
+  SET(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} ${multiValueArgs} )
+  LIST(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
+
+  IF(${INDEX} EQUAL -1)
+    SET(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
+    SET(FPHSA_REQUIRED_VARS ${ARGN})
+    SET(FPHSA_VERSION_VAR)
+  ELSE(${INDEX} EQUAL -1)
+
+    CMAKE_PARSE_ARGUMENTS(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${_FIRST_ARG} ${ARGN})
+
+    IF(FPHSA_UNPARSED_ARGUMENTS)
+      MESSAGE(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
+    ENDIF(FPHSA_UNPARSED_ARGUMENTS)
+
+    IF(NOT FPHSA_FAIL_MESSAGE)
+      SET(FPHSA_FAIL_MESSAGE  "DEFAULT_MSG")
+    ENDIF(NOT FPHSA_FAIL_MESSAGE)
+  ENDIF(${INDEX} EQUAL -1)
+
+# now that we collected all arguments, process them
+
+  IF("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG")
+    SET(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
+  ENDIF("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG")
+
+  # In config-mode, we rely on the variable <package>_CONFIG, which is set by find_package()
+  # when it successfully found the config-file, including version checking:
+  IF(FPHSA_CONFIG_MODE)
+    LIST(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
+    LIST(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
+    SET(FPHSA_VERSION_VAR ${_NAME}_VERSION)
+  ENDIF(FPHSA_CONFIG_MODE)
+
+  IF(NOT FPHSA_REQUIRED_VARS)
+    MESSAGE(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
+  ENDIF(NOT FPHSA_REQUIRED_VARS)
+
+  LIST(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
+
+  STRING(TOUPPER ${_NAME} _NAME_UPPER)
+  STRING(TOLOWER ${_NAME} _NAME_LOWER)
+
+  # collect all variables which were not found, so they can be printed, so the
+  # user knows better what went wrong (#6375)
+  SET(MISSING_VARS "")
+  SET(DETAILS "")
+  SET(${_NAME_UPPER}_FOUND TRUE)
+  # check if all passed variables are valid
+  FOREACH(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
+    IF(NOT ${_CURRENT_VAR})
+      SET(${_NAME_UPPER}_FOUND FALSE)
+      SET(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
+    ELSE(NOT ${_CURRENT_VAR})
+      SET(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
+    ENDIF(NOT ${_CURRENT_VAR})
+  ENDFOREACH(_CURRENT_VAR)
+
+
+  # version handling:
+  SET(VERSION_MSG "")
+  SET(VERSION_OK TRUE)
+  SET(VERSION ${${FPHSA_VERSION_VAR}} )
+  IF (${_NAME}_FIND_VERSION)
+
+    IF(VERSION)
+
+      IF(${_NAME}_FIND_VERSION_EXACT)       # exact version required
+        IF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
+          SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
+          SET(VERSION_OK FALSE)
+        ELSE (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
+          SET(VERSION_MSG "(found suitable exact version \"${VERSION}\")")
+        ENDIF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
+
+      ELSE(${_NAME}_FIND_VERSION_EXACT)     # minimum version specified:
+        IF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
+          SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
+          SET(VERSION_OK FALSE)
+        ELSE ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
+          SET(VERSION_MSG "(found suitable version \"${VERSION}\", required is \"${${_NAME}_FIND_VERSION}\")")
+        ENDIF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
+      ENDIF(${_NAME}_FIND_VERSION_EXACT)
+
+    ELSE(VERSION)
+
+      # if the package was not found, but a version was given, add that to the output:
+      IF(${_NAME}_FIND_VERSION_EXACT)
+         SET(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
+      ELSE(${_NAME}_FIND_VERSION_EXACT)
+         SET(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
+      ENDIF(${_NAME}_FIND_VERSION_EXACT)
+
+    ENDIF(VERSION)
+  ELSE (${_NAME}_FIND_VERSION)
+    IF(VERSION)
+      SET(VERSION_MSG "(found version \"${VERSION}\")")
+    ENDIF(VERSION)
+  ENDIF (${_NAME}_FIND_VERSION)
+
+  IF(VERSION_OK)
+    SET(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]")
+  ELSE(VERSION_OK)
+    SET(${_NAME_UPPER}_FOUND FALSE)
+  ENDIF(VERSION_OK)
+
+
+  # print the result:
+  IF (${_NAME_UPPER}_FOUND)
+    FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG}" "${DETAILS}")
+  ELSE (${_NAME_UPPER}_FOUND)
+
+    IF(FPHSA_CONFIG_MODE)
+      _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
+    ELSE(FPHSA_CONFIG_MODE)
+      IF(NOT VERSION_OK)
+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
+      ELSE(NOT VERSION_OK)
+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing: ${MISSING_VARS}) ${VERSION_MSG}")
+      ENDIF(NOT VERSION_OK)
+    ENDIF(FPHSA_CONFIG_MODE)
+
+  ENDIF (${_NAME_UPPER}_FOUND)
+
+  SET(${_NAME_UPPER}_FOUND ${${_NAME_UPPER}_FOUND} PARENT_SCOPE)
+
+ENDFUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _FIRST_ARG)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -54,12 +54,12 @@ IF(PERL_EXECUTABLE)
    COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ldopts
    OUTPUT_VARIABLE PERL_LFLAGS
    )
-  
+
  # remove the new lines from the output by replacing them with empty strings
  STRING(REPLACE "\n" "" PERL_INTERNAL_DIR "${PERL_INTERNAL_DIR}")
  STRING(REPLACE "\n" "" PERL_CFLAGS "${PERL_CFLAGS}")
  STRING(REPLACE "\n" "" PERL_LFLAGS "${PERL_LFLAGS}")
-  
+
  FIND_PATH(PERL_INCLUDE_PATH
    NAMES perl.h
    PATHS ${PERL_INTERNAL_DIR}
@@ -69,11 +69,11 @@ IF(PERL_EXECUTABLE)
    NAMES perl
    PATHS /usr/lib /usr/local/lib /usr/pkg/lib ${PERL_INTERNAL_DIR}
    )
-  
+
  IF(PERL_LIBRARY AND PERL_INCLUDE_PATH)
    SET(PERL_FOUND TRUE)
  ENDIF(PERL_LIBRARY AND PERL_INCLUDE_PATH)
-  
+
  MARK_AS_ADVANCED(
    PERL_EXECUTABLE
    PERL_INCLUDE_PATH
@@ -151,7 +151,7 @@ endmacro(_pkgconfig_invoke_dyn)
 # Splits given arguments into options and a package list
 macro(_pkgconfig_parse_options _result _is_req)
  set(${_is_req} 0)
-  
+
  foreach(_pkg ${ARGN})
    if (_pkg STREQUAL "REQUIRED")
      set(${_is_req} 1)
@@ -198,7 +198,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
        message(STATUS "checking for modules '${_pkg_check_modules_list}'")
      endif(_pkg_check_modules_cnt EQUAL 1)
    endif(NOT ${_is_silent})
-    
+
    set(_pkg_check_modules_packages)
    set(_pkg_check_modules_failed)

@@ -225,7 +225,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
      if (_pkg_check_modules_pkg_op STREQUAL "=")
        list(APPEND _pkg_check_modules_exist_query --exact-version)
      endif(_pkg_check_modules_pkg_op STREQUAL "=")
-      
+
      if (_pkg_check_modules_pkg_op STREQUAL "<=")
        list(APPEND _pkg_check_modules_exist_query --max-version)
      endif(_pkg_check_modules_pkg_op STREQUAL "<=")
@@ -272,7 +272,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
    else(_pkg_check_modules_failed)
      # when we are here, we checked whether requested modules
      # exist. Now, go through them and set variables
-      
+
      _pkgconfig_set(${_prefix}_FOUND 1)
      list(LENGTH _pkg_check_modules_packages pkg_count)

@@ -284,7 +284,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
        else(pkg_count EQUAL 1)
          set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}")
        endif(pkg_count EQUAL 1)
-        
+
        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION    ""   --modversion )
        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX     ""   --variable=prefix )
        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR ""   --variable=includedir )
@@ -350,7 +350,7 @@ macro(pkg_search_module _prefix _module0)
        message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found")
      endif(${_pkg_is_required})
    endif(NOT ${_prefix}_FOUND)
-    
+
    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
 endmacro(pkg_search_module)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -33,51 +33,71 @@ IF(PYTHON_FOUND)
   SET(PYTHON_FIND_QUIETLY TRUE)
 ENDIF(PYTHON_FOUND)

-FIND_PROGRAM(PYTHON_EXECUTABLE
-  NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
-  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-  )
+IF(ENABLE_PYTHON3)
+  FIND_PROGRAM(PYTHON_EXECUTABLE
+    NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+    )
+ELSE(ENABLE_PYTHON3)
+  FIND_PROGRAM(PYTHON_EXECUTABLE
+    NAMES python2.7 python2.6 python2.5 python
+    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+    )
+ENDIF(ENABLE_PYTHON3)

 IF(PYTHON_EXECUTABLE)
  EXECUTE_PROCESS(
-    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_config_var('CONFINCLUDEPY')"
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('INCLUDEPY'))"
    OUTPUT_VARIABLE PYTHON_INC_DIR
    )
-  
+
  EXECUTE_PROCESS(
-    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_config_var('LIBPL')"
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBPL'))"
    OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH
    )
-  
+
  EXECUTE_PROCESS(
-    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_config_var('LINKFORSHARED')"
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LINKFORSHARED'))"
    OUTPUT_VARIABLE PYTHON_LFLAGS
    )
-  
-  # remove the new lines from the output by replacing them with empty strings
-  STRING(REPLACE "\n" "" PYTHON_INC_DIR "${PYTHON_INC_DIR}")
-  STRING(REPLACE "\n" "" PYTHON_POSSIBLE_LIB_PATH "${PYTHON_POSSIBLE_LIB_PATH}")
-  STRING(REPLACE "\n" "" PYTHON_LFLAGS "${PYTHON_LFLAGS}")
-  
+
  FIND_PATH(PYTHON_INCLUDE_PATH
    NAMES Python.h
    PATHS ${PYTHON_INC_DIR}
    )
-  
-  FIND_LIBRARY(PYTHON_LIBRARY
-    NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
-    PATHS ${PYTHON_POSSIBLE_LIB_PATH}
-    )
+  IF(ENABLE_PYTHON3)
+    FIND_LIBRARY(PYTHON_LIBRARY
+      NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+      PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+      )
+  ELSE(ENABLE_PYTHON3)
+    FIND_LIBRARY(PYTHON_LIBRARY
+      NAMES python2.7 python2.6 python2.5 python
+      PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+      )
+  ENDIF(ENABLE_PYTHON3)

  IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
-    SET(PYTHON_FOUND TRUE)
+    EXECUTE_PROCESS(
+      COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])"
+      OUTPUT_VARIABLE PYTHON_VERSION
+      )
+    EXECUTE_PROCESS(
+      COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))"
+      OUTPUT_VARIABLE PYTHON_OLD_VERSION
+      )
+    IF(${PYTHON_OLD_VERSION} STREQUAL "True")
+      MESSAGE("Python >= 2.5 is needed to build python plugin, version found: ${PYTHON_VERSION}")
+    ELSE()
+      SET(PYTHON_FOUND TRUE)
+    ENDIF(${PYTHON_OLD_VERSION} STREQUAL "True")
  ENDIF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
-  
+
  MARK_AS_ADVANCED(
    PYTHON_EXECUTABLE
    PYTHON_INCLUDE_PATH
    PYTHON_LIBRARY
    PYTHON_LFLAGS
    )
-  
+
 ENDIF(PYTHON_EXECUTABLE)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -32,43 +32,36 @@ IF(RUBY_FOUND)
 ENDIF(RUBY_FOUND)

 FIND_PROGRAM(RUBY_EXECUTABLE
-  NAMES ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
+  NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
  )

 IF(RUBY_EXECUTABLE)
  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir']"
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
    OUTPUT_VARIABLE RUBY_ARCH_DIR
    )

  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['arch']"
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']"
    OUTPUT_VARIABLE RUBY_ARCH
    )

  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['libdir']"
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
    OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
    )
-  
+
  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubylibdir']"
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
    OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
    )

  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['ruby_version']"
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['ruby_version']"
    OUTPUT_VARIABLE RUBY_VERSION
    )
-  
-  # remove the new lines from the output by replacing them with empty strings
-  STRING(REPLACE "\n" "" RUBY_ARCH_DIR "${RUBY_ARCH_DIR}")
-  STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}")
-  STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}")
-  STRING(REPLACE "\n" "" RUBY_ARCH "${RUBY_ARCH}")
-  STRING(REPLACE "\n" "" RUBY_VERSION "${RUBY_VERSION}")
-  
+
  FIND_PATH(RUBY_INCLUDE_PATH
    NAMES ruby.h
    PATHS ${RUBY_ARCH_DIR}
@@ -78,18 +71,18 @@ IF(RUBY_EXECUTABLE)
    "${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")

  FIND_LIBRARY(RUBY_LIBRARY
-    NAMES ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
+    NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
    PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
    )

  IF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
    SET(RUBY_FOUND TRUE)
  ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
-  
+
  IF(${RUBY_VERSION} STREQUAL "1.9.0")
    SET(RUBY_FOUND FALSE)
  ENDIF(${RUBY_VERSION} STREQUAL "1.9.0")
-  
+
  MARK_AS_ADVANCED(
    RUBY_EXECUTABLE
    RUBY_LIBRARY
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2008 Julien Louis <ptitlouis@sysif.net>
-# Copyright (C) 2008-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2008-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -0,0 +1,78 @@
+# - Find zlib
+# Find the native ZLIB includes and library.
+# Once done this will define
+#
+#  ZLIB_INCLUDE_DIRS   - where to find zlib.h, etc.
+#  ZLIB_LIBRARIES      - List of libraries when using zlib.
+#  ZLIB_FOUND          - True if zlib found.
+#
+#  ZLIB_VERSION_STRING - The version of zlib found (x.y.z)
+#  ZLIB_VERSION_MAJOR  - The major version of zlib
+#  ZLIB_VERSION_MINOR  - The minor version of zlib
+#  ZLIB_VERSION_PATCH  - The patch version of zlib
+#  ZLIB_VERSION_TWEAK  - The tweak version of zlib
+#
+# The following variable are provided for backward compatibility
+#
+#  ZLIB_MAJOR_VERSION  - The major version of zlib
+#  ZLIB_MINOR_VERSION  - The minor version of zlib
+#  ZLIB_PATCH_VERSION  - The patch version of zlib
+
+#=============================================================================
+# Copyright 2001-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/include"
+)
+
+SET(ZLIB_NAMES z zlib zdll zlib1 zlibd zlibd1)
+FIND_LIBRARY(ZLIB_LIBRARY
+    NAMES
+        ${ZLIB_NAMES}
+    PATHS
+        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/lib"
+)
+MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+
+IF(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
+    FILE(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
+
+    STRING(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
+    STRING(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR  "${ZLIB_H}")
+    STRING(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
+    SET(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
+
+    # only append a TWEAK version if it exists:
+    SET(ZLIB_VERSION_TWEAK "")
+    IF( "${ZLIB_H}" MATCHES "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+).*$")
+        SET(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}")
+        SET(ZLIB_VERSION_STRING "${ZLIB_VERSION_STRING}.${ZLIB_VERSION_TWEAK}")
+    ENDIF( "${ZLIB_H}" MATCHES "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+).*$")
+
+    SET(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
+    SET(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
+    SET(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
+ENDIF()
+
+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
+# all listed variables are TRUE
+#INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/FindPackageHandleStandardArgs.cmake)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
+                                       VERSION_VAR ZLIB_VERSION_STRING)
+
+IF(ZLIB_FOUND)
+    SET(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
+    SET(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
+ENDIF()
+
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -23,18 +23,17 @@ ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")

 FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
 STRING(REGEX REPLACE "\n" ";" files "${files}")
+LIST(REVERSE files)
 FOREACH(file ${files})
-  MESSAGE(STATUS "Uninstalling \"${file}\"")
-  IF(NOT EXISTS "${file}")
-    MESSAGE(FATAL_ERROR "File \"${file}\" does not exists.")
-  ENDIF(NOT EXISTS "${file}")
-  EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
-    OUTPUT_VARIABLE rm_out
-    RETURN_VARIABLE rm_retval)
-  IF("${rm_retval}" GREATER 0)
-    MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
-  ENDIF("${rm_retval}" GREATER 0)
+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+  IF(EXISTS "$ENV{DESTDIR}${file}")
+    EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VARIABLE rm_retval)
+    IF("${rm_retval}" GREATER 0)
+      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+    ENDIF("${rm_retval}" GREATER 0)
+  ELSE(EXISTS "$ENV{DESTDIR}${file}")
+    MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+  ENDIF(EXISTS "$ENV{DESTDIR}${file}")
 ENDFOREACH(file)
-
-
-
@@ -1,52 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
-#
-# This file is part of WeeChat, the extensible chat client.
-#
-# WeeChat is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# WeeChat is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-VERSION=@VERSION@
-SRCROOT=@CMAKE_SOURCE_DIR@
-BUILDDIR=@CMAKE_BINARY_DIR@
-PROJECT=@PROJECT_NAME@
-TAG=release-$(echo $VERSION | sed -e 's/\./-/g')
-
-EXCLUDE="@DIST_EXCLUDE@"
-EXPORT_DIR="${PROJECT}-${VERSION}"
-
-if [ -z  $CVSROOT ]; then
-    echo "The CVSROOT variable must be set"
-    exit 1
-fi
-
-echo "Exporting source tree"
-if [ $(echo $VERSION | grep cvs) ]; then
-    cvs export -r HEAD -d $PROJECT-$VERSION $PROJECT
-else
-    cvs export -r $TAG -d $PROJECT-$VERSION $PROJECT
-fi
-
-echo "Removing not needed stuff"
-for i in $EXCLUDE ; do
-    echo "  $i"
-    rm -rf $EXPORT_DIR/$i
-done
-
-echo "Generating archive"
-tar cjf ${BUILDDIR}/${PROJECT}-${VERSION}.tar.bz2 ${EXPORT_DIR}
-
-echo "Cleaning up"
-rm -rf ${EXPORT_DIR}
@@ -1,26 +1,9 @@
-#cmakedefine HAVE_ARPA_INET_H
 #cmakedefine HAVE_LIBINTL_H
-#cmakedefine HAVE_LIMITS_H
-#cmakedefine HAVE_LOCALE_H
-#cmakedefine HAVE_NETDB_H
-#cmakedefine HAVE_NETINET_IN_H
-#cmakedefine HAVE_STDLIB_H
-#cmakedefine HAVE_STRING_H
-#cmakedefine HAVE_SYS_SOCKET_H
-#cmakedefine HAVE_SYS_TIME_H
-#cmakedefine HAVE_SYS_TYPES_H
-#cmakedefine HAVE_UNISTD_H
-#cmakedefine HAVE_PWD_H
-#cmakedefine HAVE_ERRNO_H
-#cmakedefine HAVE_REGEX_H
-#cmakedefine HAVE_WCHAR_H
-#cmakedefine HAVE_SYS_FILE_H
+#cmakedefine HAVE_SYS_RESOURCE_H
 #cmakedefine HAVE_FLOCK
 #cmakedefine HAVE_LANGINFO_CODESET
-#cmakedefine HAVE_STRNDUP
 #cmakedefine HAVE_BACKTRACE
 #cmakedefine ICONV_2ARG_IS_CONST 1
-#cmakedefine HAVE_TCL_CREATE_NS
 #cmakedefine HAVE_MALLINFO
 #cmakedefine HAVE_EAT_NEWLINE_GLITCH
 #define PACKAGE_VERSION "@VERSION@"
@@ -30,4 +13,6 @@
 #define WEECHAT_LIBDIR "@LIBDIR@"
 #define WEECHAT_SHAREDIR "@SHAREDIR@"
 #define LOCALEDIR "@LOCALEDIR@"
+#define WEECHAT_HOME "@WEECHAT_HOME@"
+#define CA_FILE "@CA_FILE@"
 #define _GNU_SOURCE 1
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Benoit Papillault <benoit.papillault@free.fr>
 # Copyright (C) 2005-2006 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2009 Emmanuel Bouthenot <kolter@openics.org>
@@ -24,16 +24,17 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.3.6-rc3, flashcode@flashtux.org)
-AC_CONFIG_SRCDIR([src/core/weechat.c])
+AC_INIT(WeeChat, 0.4.2-rc2, flashcode@flashtux.org)
+AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.3.6-rc3])
+AM_INIT_AUTOMAKE
 LICENSE="GPL3"

 # Checks for programs
 AC_PROG_CC
 AC_PROG_MAKE_SET
 AC_GNU_SOURCE
+AC_PROG_LN_S
 AM_PROG_LIBTOOL

 # Files to generate
@@ -58,9 +59,9 @@ cygwin*)
 esac

 # Gettext
-ALL_LINGUAS="fr es cs hu de ru pl it pt_BR"
+ALL_LINGUAS="fr es cs hu de ru pl it ja pt_BR tr"
 AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.15])
+AM_GNU_GETTEXT_VERSION([0.18])

 # Checks for libraries
 AC_CHECK_LIB(ncurses, initscr, LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
@@ -68,12 +69,7 @@ AC_CHECK_LIB(ncursesw, initscr, LIBNCURSESW_FOUND=1, LIBNCURSESW_FOUND=0)

 # Checks for header files
 AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h libintl.h limits.h locale.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/types.h unistd.h pwd.h errno.h regex.h wchar.h sys/file.h])
-
-if echo "$host_os" | grep "^openbsd" 1>/dev/null 2>&1 ; then
-   AC_CHECK_HEADER(utf8/wchar.h, LDFLAGS="$LDFLAGS -lutf8", [AC_MSG_ERROR([
-*** on OpenBSD systems, package libutf8 must be installed to compile WeeChat])])
-fi
+AC_CHECK_HEADERS([libintl.h sys/resource.h])

 # Checks for typedefs, structures, and compiler characteristics
 AC_HEADER_TIME
@@ -96,66 +92,82 @@ AC_MSG_RESULT($ac_cv_type_socklen_t)
 # Checks for library functions.
 AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([gethostbyname gethostname getsockname gettimeofday inet_ntoa memset mkdir select setlocale socket strcasecmp strchr strdup strndup strncasecmp strpbrk strrchr strstr regexec mallinfo])
+AC_CHECK_FUNCS([mallinfo])

 # Variables in config.h

 AH_VERBATIM([PREFIX],                  [#undef PREFIX])
 AH_VERBATIM([WEECHAT_LIBDIR],          [#undef WEECHAT_LIBDIR])
 AH_VERBATIM([WEECHAT_SHAREDIR],        [#undef WEECHAT_SHAREDIR])
-AH_VERBATIM([HAVE_GCRYPT],             [#undef HAVE_GCRYPT])
 AH_VERBATIM([HAVE_GNUTLS],             [#undef HAVE_GNUTLS])
 AH_VERBATIM([HAVE_FLOCK],              [#undef HAVE_FLOCK])
 AH_VERBATIM([HAVE_EAT_NEWLINE_GLITCH], [#undef HAVE_EAT_NEWLINE_GLITCH])
 AH_VERBATIM([PLUGIN_ALIAS],            [#undef PLUGIN_ALIAS])
 AH_VERBATIM([PLUGIN_ASPELL],           [#undef PLUGIN_ASPELL])
 AH_VERBATIM([PLUGIN_CHARSET],          [#undef PLUGIN_CHARSET])
-AH_VERBATIM([PLUGIN_DEMO],             [#undef PLUGIN_DEMO])
 AH_VERBATIM([PLUGIN_FIFO],             [#undef PLUGIN_FIFO])
 AH_VERBATIM([PLUGIN_IRC],              [#undef PLUGIN_IRC])
 AH_VERBATIM([PLUGIN_LOGGER],           [#undef PLUGIN_LOGGER])
 AH_VERBATIM([PLUGIN_RELAY],            [#undef PLUGIN_RELAY])
 AH_VERBATIM([PLUGIN_RMODIFIER],        [#undef PLUGIN_RMODIFIER])
+AH_VERBATIM([PLUGIN_SCRIPT],           [#undef PLUGIN_SCRIPT])
 AH_VERBATIM([PLUGIN_PERL],             [#undef PLUGIN_PERL])
 AH_VERBATIM([PLUGIN_PYTHON],           [#undef PLUGIN_PYTHON])
 AH_VERBATIM([PLUGIN_RUBY],             [#undef PLUGIN_RUBY])
 AH_VERBATIM([PLUGIN_LUA],              [#undef PLUGIN_LUA])
 AH_VERBATIM([PLUGIN_TCL],              [#undef PLUGIN_TCL])
+AH_VERBATIM([PLUGIN_GUILE],            [#undef PLUGIN_GUILE])
 AH_VERBATIM([PLUGIN_XFER],             [#undef PLUGIN_XFER])
+AH_VERBATIM([MAN],                     [#undef MAN])
 AH_VERBATIM([DOC],                     [#undef DOC])
+AH_VERBATIM([WEECHAT_HOME],            [#define WEECHAT_HOME "~/.weechat"])
+AH_VERBATIM([CA_FILE],                 [#define CA_FILE "/etc/ssl/certs/ca-certificates.crt"])

 # Arguments for ./configure

 AC_ARG_ENABLE(ncurses,      [  --disable-ncurses       turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes)
-AC_ARG_ENABLE(wxwidgets,    [  --enable-wxwidgets      turn on WxWidgets interface (default=off)],enable_wxwidgets=$enableval,enable_wxwidgets=no)
-AC_ARG_ENABLE(gtk,          [  --enable-gtk            turn on Gtk interface (default=off)],enable_gtk=$enableval,enable_gtk=no)
-AC_ARG_ENABLE(qt,           [  --enable-qt             turn on Qt interface (default=off)],enable_qt=$enableval,enable_qt=no)
-AC_ARG_ENABLE(gcrypt,       [  --disable-gcrypt        turn off gcrypt support (default=compiled if found)],enable_gcrypt=$enableval,enable_gcrypt=yes)
 AC_ARG_ENABLE(gnutls,       [  --disable-gnutls        turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes)
 AC_ARG_ENABLE(largefile,    [  --disable-largefile     turn off Large File Support (default=on)],enable_largefile=$enableval,enable_largefile=yes)
 AC_ARG_ENABLE(alias,        [  --disable-alias         turn off Alias plugin (default=compiled)],enable_alias=$enableval,enable_alias=yes)
 AC_ARG_ENABLE(aspell,       [  --disable-aspell        turn off Aspell plugin (default=compiled)],enable_aspell=$enableval,enable_aspell=yes)
+AC_ARG_ENABLE(enchant,      [  --enable-enchant        turn on Enchant lib for Aspell plugin (default=off)],enable_enchant=$enableval,enable_enchant=no)
 AC_ARG_ENABLE(charset,      [  --disable-charset       turn off Charset plugin (default=compiled if found)],enable_charset=$enableval,enable_charset=yes)
-AC_ARG_ENABLE(demo,         [  --enable-demo           turn on Demo plugin (default=off)],enable_demo=$enableval,enable_demo=no)
 AC_ARG_ENABLE(fifo,         [  --disable-fifo          turn off Fifo plugin (default=compiled)],enable_fifo=$enableval,enable_fifo=yes)
 AC_ARG_ENABLE(irc,          [  --disable-irc           turn off IRC plugin (default=compiled)],enable_irc=$enableval,enable_irc=yes)
 AC_ARG_ENABLE(logger,       [  --disable-logger        turn off Logger plugin (default=compiled)],enable_logger=$enableval,enable_logger=yes)
 AC_ARG_ENABLE(relay,        [  --disable-relay         turn off Relay plugin (default=compiled)],enable_relay=$enableval,enable_relay=yes)
 AC_ARG_ENABLE(rmodifier,    [  --disable-rmodifier     turn off Rmodifier plugin (default=compiled)],enable_rmodifier=$enableval,enable_rmodifier=yes)
-AC_ARG_ENABLE(scripts,      [  --disable-scripts       turn off script plugins (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes)
+AC_ARG_ENABLE(script,       [  --disable-script        turn off Script plugin (default=compiled)],enable_script=$enableval,enable_script=yes)
+AC_ARG_ENABLE(scripts,      [  --disable-scripts       turn off script plugins (perl, python, ...) (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes)
 AC_ARG_ENABLE(perl,         [  --disable-perl          turn off Perl script plugin (default=compiled if found)],enable_perl=$enableval,enable_perl=yes)
 AC_ARG_ENABLE(python,       [  --disable-python        turn off Python script plugin (default=compiled if found)],enable_python=$enableval,enable_python=yes)
+AC_ARG_ENABLE(python3,      [  --enable-python3        use Python 3.x if found (NOT recommended) (default=off)],enable_python3=$enableval,enable_python3=no)
 AC_ARG_ENABLE(ruby,         [  --disable-ruby          turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes)
 AC_ARG_ENABLE(lua,          [  --disable-lua           turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes)
 AC_ARG_ENABLE(tcl,          [  --disable-tcl           turn off Tcl script plugin (default=compiled if found)],enable_tcl=$enableval,enable_tcl=yes)
+AC_ARG_ENABLE(guile,        [  --disable-guile         turn off Guile (scheme) script plugin (default=compiled if found)],enable_guile=$enableval,enable_guile=yes)
 AC_ARG_ENABLE(xfer,         [  --disable-xfer          turn off Xfer (file transfer) plugin (default=compiled if found)],enable_xfer=$enableval,enable_xfer=yes)
 AC_ARG_WITH(lua-inc,        [  --with-lua-inc=DIR,     lua include files are in DIR (default=autodetect)],lua_inc=$withval,lua_inc='')
 AC_ARG_WITH(lua-lib,        [  --with-lua-lib=DIR,     lua library files are in DIR (default=autodetect)],lua_lib=$withval,lua_lib='')
 AC_ARG_WITH(lua-suffix,     [  --with-lua-suffix=ARG   lua is suffixed with ARG (default=autodetect)],lua_suffix=$withval,lua_suffix='')
 AC_ARG_WITH(tclconfig,      [  --with-tclconfig=DIR    directory containing tcl configuration (tclConfig.sh)],tclconfig=$withval,tclconfig='')
-AC_ARG_ENABLE(doc,          [  --disable-doc           turn off documentation (default=built)],enable_doc=$enableval,enable_doc=yes)
+AC_ARG_ENABLE(man,          [  --enable-man            turn on build of man page (default=not built)],enable_man=$enableval,enable_man=no)
+AC_ARG_ENABLE(doc,          [  --enable-doc            turn on build of documentation (default=not built)],enable_doc=$enableval,enable_doc=no)
 AC_ARG_WITH(debug,          [  --with-debug            debugging: 0=no debug, 1=debug compilation (default=1)],debug=$withval,debug=1)

+AC_ARG_VAR(WEECHAT_HOME, [WeeChat home directory for config, logs, scripts.. (default is "~/.weechat")])
+AC_ARG_VAR(CA_FILE, [File containing the certificate authorities (default is "/etc/ssl/certs/ca-certificates.crt"). This is the default value of option "weechat.network.gnutls_ca_file".])
+
+if test "x$WEECHAT_HOME" = "x" ; then
+    WEECHAT_HOME="~/.weechat"
+fi
+AC_DEFINE_UNQUOTED(WEECHAT_HOME, "$WEECHAT_HOME")
+
+if test "x$CA_FILE" = "x" ; then
+    CA_FILE="/etc/ssl/certs/ca-certificates.crt"
+fi
+AC_DEFINE_UNQUOTED(CA_FILE, "$CA_FILE")
+
 not_asked=""
 not_found=""

@@ -203,49 +215,6 @@ else
    not_asked="$not_asked ncurses"
 fi

-#if test "x$enable_wxwidgets" = "xyes" ; then
-#    AM_OPTIONS_WXCONFIG
-#    AM_PATH_WXCONFIG(2.3.4, wxWin=1)
-#
-#    if test "$wxWin" != 1; then
-#        AC_MSG_ERROR([
-#*** wxWindows must be installed on your system
-#*** but wx-config script couldn't be found.
-#
-#*** Please check that wx-config is in path, the directory
-#*** where wxWindows libraries are installed (returned by
-#*** 'wx-config --libs' command) is in LD_LIBRARY_PATH or
-#*** equivalent variable and wxWindows version is 2.3.4 or above.
-#        ])
-#    fi
-#
-#    CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-#    CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-#    CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
-#    LDFLAGS="$LDFLAGS $WX_LIBS"
-#
-#    WXWIDGETS_CFLAGS=""
-#    WXWIDGETS_LIBS=""
-#fi
-
-if test "x$enable_gtk" = "xyes" ; then
-    AM_PATH_GTK_2_0(2.4.0, LIBGTK_FOUND=1, LIBGTK_FOUND=0)
-    if test "$LIBGTK_FOUND" = "0" ; then
-        AC_MSG_WARN([
-*** Gtk library not found!
-*** WeeChat will be built without Gtk support.])
-        enable_gtk="no"
-        not_found="$not_found gtk"
-    else
-        GTK_CFLAGS=`pkg-config --cflags gtk+-2.0`
-        GTK_LFLAGS=`pkg-config --libs gtk+-2.0`
-        AC_SUBST(GTK_CFLAGS)
-        AC_SUBST(GTK_LFLAGS)
-    fi
-else
-    not_asked="$not_asked gtk"
-fi
-
 # ------------------------------------------------------------------------------
 #                                    iconv
 # ------------------------------------------------------------------------------
@@ -297,6 +266,7 @@ if test "x$enable_scripts" = "xno" ; then
    enable_ruby="no"
    enable_lua="no"
    enable_tcl="no"
+    enable_guile="no"
 fi

 # ---------------------------------- alias -------------------------------------
@@ -314,24 +284,35 @@ fi
 # ---------------------------------- aspell ------------------------------------

 if test "x$enable_aspell" = "xyes" ; then
-    ASPELL_CFLAGS=""
-    ASPELL_LFLAGS=""
+    ac_found_enchant_lib="no"
+    if test "x$enable_enchant" = "xyes" ; then
+        #PKG_CHECK_MODULES(ENCHANT, [enchant], [CFLAGS="$CFLAGS -DUSE_ENCHANT"],
+        PKG_CHECK_MODULES(ENCHANT, [enchant], ac_found_enchant_lib="yes", ac_found_enchant_lib="no")
+    fi
+    if test "x$ac_found_enchant_lib" = "xyes" ; then
+        CFLAGS="$CFLAGS -DUSE_ENCHANT"
+        ASPELL_LIB_USED="enchant"
+    else
+        ASPELL_CFLAGS=""
+        ASPELL_LFLAGS=""

-    AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
-    AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
+        AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
+        AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")

-    AC_MSG_CHECKING(for aspell headers and librairies)
-    if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
-       AC_MSG_RESULT(no)
-       AC_MSG_WARN([
+        AC_MSG_CHECKING(for aspell headers and librairies)
+        if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
+            AC_MSG_RESULT(no)
+            AC_MSG_WARN([
 *** Aspell headers and/or libraries couldn't be found on your system.
 *** Try to install them with your software package manager.
 *** WeeChat will be built without Aspell support.])
-       enable_aspell="no"
-       not_found="$not_found aspell"
-    else
-        AC_MSG_RESULT(yes)
-        ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
+            enable_aspell="no"
+            not_found="$not_found aspell"
+        else
+            AC_MSG_RESULT(yes)
+            ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
+            ASPELL_LIB_USED="aspell"
+        fi
    fi
 else
    not_asked="$not_asked aspell"
@@ -355,18 +336,6 @@ else
    not_asked="$not_asked charset"
 fi

-# ---------------------------------- demo --------------------------------------
-
-if test "x$enable_demo" = "xyes" ; then
-    DEMO_CFLAGS=""
-    DEMO_LFLAGS=""
-    AC_SUBST(DEMO_CFLAGS)
-    AC_SUBST(DEMO_LFLAGS)
-    AC_DEFINE(PLUGIN_DEMO)
-else
-    not_asked="$not_asked demo"
-fi
-
 # ---------------------------------- fifo --------------------------------------

 if test "x$enable_fifo" = "xyes" ; then
@@ -419,6 +388,14 @@ else
    not_asked="$not_asked rmodifier"
 fi

+# --------------------------------- script -------------------------------------
+
+if test "x$enable_script" = "xyes" ; then
+    AC_DEFINE(PLUGIN_SCRIPT)
+else
+    not_asked="$not_asked script"
+fi
+
 # ---------------------------------- perl --------------------------------------

 PERL_VERSION=
@@ -435,9 +412,9 @@ if test "x$enable_perl" = "xyes" ; then
    else
        PERL_VERSION=`perl -V:version | sed "s/version='\(.*\)';/\1/"`
        AC_MSG_CHECKING(for Perl headers files)
-        
+
        PERL_HEADER_TEST=`PT=perltest.c ; echo "#include <EXTERN.h>" > $PT;  echo "#include <perl.h>" >> $PT;  echo "#include <XSUB.h>" >> $PT ;  echo "int main() { return 0; }" >> $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ccopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1`
-        
+
        if test "x$PERL_HEADER_TEST" = "x0" ; then
            PERL_CFLAGS=`$PERL -MExtUtils::Embed -e ccopts`
            AC_MSG_RESULT(found)
@@ -478,7 +455,11 @@ fi
 PYTHON_VERSION=

 if test "x$enable_python" = "xyes" ; then
-    AC_PATH_PROGS(PYTHON, python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2)
+    if test "x$enable_python3" = "xyes" ; then
+        AC_PATH_PROGS(PYTHON, python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
+    else
+        AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python)
+    fi
    if test -z $PYTHON ; then
        AC_MSG_WARN([
 *** Python must be installed on your system but python interpreter couldn't be found in path.
@@ -487,41 +468,49 @@ if test "x$enable_python" = "xyes" ; then
        enable_python="no"
        not_found="$not_found python"
    else
-        PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; print "%s" % sys.prefix'`
-        PYTHON_VERSION=`$PYTHON -c 'import sys ; print sys.version[[:3]]'`
-        PYTHON_INCLUDE=`$PYTHON -c "import distutils.sysconfig,string; print distutils.sysconfig.get_config_var('CONFINCLUDEPY')"`
-        
-        AC_MSG_CHECKING(for Python header files)
-        if test -r "$PYTHON_INCLUDE/Python.h"; then
-            PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
-            AC_MSG_RESULT(found)
-            PYTHON_LIB=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
-            PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED')"`
-            AC_MSG_CHECKING(for Python library)
-            if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then
-               PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
-               AC_MSG_RESULT(found)
-            elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
-               PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
-               AC_MSG_RESULT(found)
-            elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
-               PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS"
-               AC_MSG_RESULT(found)
-            else
-                AC_MSG_WARN([
+        PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; sys.stdout.write("%s" % sys.prefix)'`
+        PYTHON_VERSION=`$PYTHON -c 'import sys; sys.stdout.write(sys.version[[:3]])'`
+        PYTHON_INCLUDE=`$PYTHON -c "import sys, distutils.sysconfig, string; sys.stdout.write(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
+        PYTHON_OLD_VERSION=`$PYTHON -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))"`
+        if test "x$PYTHON_OLD_VERSION" = "xTrue" ; then
+            AC_MSG_WARN([
+*** Python >= 2.5 is needed to build Python plugin, version found: $PYTHON_VERSION.
+*** WeeChat will be built without Python support.])
+            enable_python="no"
+            not_found="$not_found python"
+        else
+            AC_MSG_CHECKING(for Python header files)
+            if test -r "$PYTHON_INCLUDE/Python.h"; then
+                PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
+                AC_MSG_RESULT(found)
+                PYTHON_LIB=`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBPL'))"`
+                PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED'))"`
+                AC_MSG_CHECKING(for Python library)
+                if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then
+                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
+                   AC_MSG_RESULT(found)
+                elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
+                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
+                   AC_MSG_RESULT(found)
+                elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
+                   PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS"
+                   AC_MSG_RESULT(found)
+                else
+                    AC_MSG_WARN([
 *** Python library couldn't be found on your system.
 *** Try to install it with your software package manager.
+*** WeeChat will be built without Python support.])
+                    enable_python="no"
+                    not_found="$not_found python"
+                fi
+            else
+                AC_MSG_WARN([
+*** Python header files couldn't be found on your system.
+*** Try to install them with your software package manager.
 *** WeeChat will be built without Python support.])
                enable_python="no"
                not_found="$not_found python"
            fi
-        else
-            AC_MSG_WARN([
-*** Python header files couldn't be found on your system.
-*** Try to install them with your software package manager.
-*** WeeChat will be built without Python support.])
-            enable_python="no"
-            not_found="$not_found python"
        fi
    fi
 else
@@ -539,7 +528,7 @@ fi
 RUBY_VERSION=

 if test "x$enable_ruby" = "xyes" ; then
-    AC_PATH_PROGS(RUBY, ruby1.9.2 ruby1.9.1 ruby1.9 ruby1.8 ruby)
+    AC_PATH_PROGS(RUBY, ruby1.9.3 ruby1.9.2 ruby1.9.1 ruby1.9 ruby1.8 ruby)
    if test -z $RUBY ; then
        AC_MSG_WARN([
 *** Ruby must be installed on your system but ruby interpreter couldn't be found in path.
@@ -548,7 +537,7 @@ if test "x$enable_ruby" = "xyes" ; then
        enable_ruby="no"
        not_found="$not_found ruby"
    else
-        RUBY_VERSION=`$RUBY -rrbconfig -e "puts Config::CONFIG[['ruby_version']]"`
+        RUBY_VERSION=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG[['ruby_version']]"`
        if test "$RUBY_VERSION" = "1.9.0"; then
            AC_MSG_WARN([
 *** Ruby header files have been found, but they're of the version 1.9.0.
@@ -558,11 +547,11 @@ if test "x$enable_ruby" = "xyes" ; then
            enable_ruby="no"
            not_found="$not_found ruby"
        else
-            RUBY_INCLUDE=`$RUBY -rrbconfig -e "puts Config::CONFIG[['rubyhdrdir']] || Config::CONFIG[['archdir']]"`
-            RUBY_ARCH=`$RUBY -rrbconfig -e 'print Config::CONFIG[["arch"]]'`
+            RUBY_INCLUDE=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG[['rubyhdrdir']] || RbConfig::CONFIG[['archdir']]"`
+            RUBY_ARCH=`$RUBY -rrbconfig -e 'print RbConfig::CONFIG[["arch"]]'`
            AC_MSG_CHECKING(for Ruby header files)
            if test -d "$RUBY_INCLUDE/"; then
-                M_RUBY_VERSION=`$RUBY -rrbconfig -e "puts Config::CONFIG[['ruby_version']].gsub(/\./, '')[[0,3]]"`
+                M_RUBY_VERSION=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,3]]"`
                RUBY_CFLAGS="-I$RUBY_INCLUDE/ -I$RUBY_INCLUDE/$RUBY_ARCH -DRUBY_VERSION=$M_RUBY_VERSION"
            else
                AC_MSG_WARN([
@@ -573,7 +562,7 @@ if test "x$enable_ruby" = "xyes" ; then
                not_found="$not_found ruby"
            fi
            AC_MSG_RESULT(found)
-            RUBY_LFLAGS=`$RUBY -rrbconfig -e "puts Config::CONFIG[['LIBRUBYARG_SHARED']]"`
+            RUBY_LFLAGS=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG[['LIBRUBYARG_SHARED']]"`
        fi
    fi
 else
@@ -605,7 +594,7 @@ if test "x$enable_lua" = "xyes" ; then
    if test -n "$lua_lib"; then
       LDFLAGS="$LDFLAGS -L$lua_lib"
    fi
-    
+
    if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
        PKGCONFIG=""
        AC_CHECK_PROGS(PKGCONFIG, pkg-config)
@@ -654,9 +643,9 @@ if test "x$enable_lua" = "xyes" ; then
            AC_CHECK_LIB(lua$l,lua_call,ac_found_lua_lib="yes",ac_found_lua_lib="no")
            if test "x$ac_found_lua_lib" = "xyes" ; then
                LUA_VERSION=">=5.1.0"
-                
+
                LUA_LFLAGS="$LDFLAGS -llua$l -lm"
-                
+
                ac2_save_LDFLAGS="$LDFLAGS"
                LDFLAGS="$LDFLAGS -llua$l -lm"

@@ -667,9 +656,9 @@ if test "x$enable_lua" = "xyes" ; then
                AC_CHECK_LIB(lualib$l,luaL_openlib,ac_found_liblua_lib="yes",ac_found_liblua_lib="no")
                if test "x$ac_found_liblua_lib" = "xyes" ; then
                    LUA_VERSION="5.0.x"
-                    
+
                    LUA_LFLAGS="$LUA_LFLAGS -llualib$l"
-                    
+
                    if echo "$host_os" | grep "^linux" 1>/dev/null 2>&1 ; then
                        LUA_LFLAGS="$LUA_LFLAGS -ldl"
                    fi
@@ -714,7 +703,7 @@ TCL_VERSION=

 if test "x$enable_tcl" = "xyes" ; then
    enable_plugins="yes"
-    
+
    AC_MSG_CHECKING(for tclConfig.sh)
    tcl_found="no"
    tcl_dirs="/usr/lib/tcl8.5 /usr/lib64/tcl8.5 /lib /lib64 /usr/lib /usr/lib64 /usr/tcl/lib /usr/tcl/lib64 /usr/local/tcl-8.5/lib /usr/local/tcl-8.5/lib64 /usr/local/lib /usr/local/lib64 /usr/local/tcl/lib /usr/local/tcl/lib64 /opt/lib /opt/lib64"
@@ -746,6 +735,46 @@ if test "x$enable_tcl" = "xyes" ; then
    AC_DEFINE(PLUGIN_TCL)
 fi

+# --------------------------------- guile -------------------------------------
+
+GUILE_VERSION=
+
+if test "x$enable_guile" = "xyes" ; then
+    enable_plugins="yes"
+
+    guile_found="no"
+    PKGCONFIG=""
+    AC_CHECK_PROGS(PKGCONFIG, pkg-config)
+    if test "x$PKGCONFIG" != "x"; then
+        AC_MSG_CHECKING(for Guile headers and librairies)
+        echo
+        for v in "2.0" ; do
+            pkgconfig_guile_found=`$PKGCONFIG --exists guile-$v 2>/dev/null`
+            if test "x$?" = "x0" ; then
+                GUILE_VERSION=`$PKGCONFIG --modversion guile-$v`
+                GUILE_CFLAGS=`$PKGCONFIG --cflags guile-$v`
+                GUILE_LFLAGS=`$PKGCONFIG --libs guile-$v`
+                guile_found="yes"
+                break
+            fi
+        done
+    fi
+
+    if test "x$guile_found" = "xno" ; then
+        AC_MSG_WARN([
+*** Guile >= 2.0 couldn't be found on your system.
+*** WeeChat will be built without Guile (scheme) support.])
+        enable_guile="no"
+        not_found="$not_found guile"
+    fi
+fi
+
+if test "x$enable_guile" = "xyes" ; then
+    AC_SUBST(GUILE_CFLAGS)
+    AC_SUBST(GUILE_LFLAGS)
+    AC_DEFINE(PLUGIN_GUILE)
+fi
+
 # ---------------------------------- xfer --------------------------------------

 if test "x$enable_xfer" = "xyes" ; then
@@ -762,30 +791,21 @@ fi
 #                                   gcrypt
 # ------------------------------------------------------------------------------

-if test "x$enable_gcrypt" = "xyes" ; then
-    AC_CHECK_HEADER(gcrypt.h,ac_found_gcrypt_header="yes",ac_found_gcrypt_header="no")
-    AC_CHECK_LIB(gcrypt,gcry_check_version,ac_found_gcrypt_lib="yes",ac_found_gcrypt_lib="no")
-    
-    AC_MSG_CHECKING(for gcrypt headers and librairies)
-    if test "x$ac_found_gcrypt_header" = "xno" -o "x$ac_found_gcrypt_lib" = "xno" ; then
-        AC_MSG_RESULT(no)
-        AC_MSG_WARN([
+AC_CHECK_HEADER(gcrypt.h,ac_found_gcrypt_header="yes",ac_found_gcrypt_header="no")
+AC_CHECK_LIB(gcrypt,gcry_check_version,ac_found_gcrypt_lib="yes",ac_found_gcrypt_lib="no")
+
+AC_MSG_CHECKING(for gcrypt headers and librairies)
+if test "x$ac_found_gcrypt_header" = "xno" -o "x$ac_found_gcrypt_lib" = "xno" ; then
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR([
 *** libgcrypt was not found. You may want to get it from ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-*** WeeChat will be built without gcrypt support.
-*** Some features like SASL authentication with IRC server using mechanism DH-BLOWFISH will be disabled.])
-        enable_gcrypt="no"
-        not_found="$not_found gcrypt"
-    else
-        AC_MSG_RESULT(yes)
-        GCRYPT_CFLAGS=`libgcrypt-config --cflags`
-        GCRYPT_LFLAGS=`libgcrypt-config --libs`
-        AC_SUBST(GCRYPT_CFLAGS)
-        AC_SUBST(GCRYPT_LFLAGS)
-        AC_DEFINE(HAVE_GCRYPT)
-        CFLAGS="$CFLAGS -DHAVE_GCRYPT"
-    fi
+*** or try to install libgcrypt-dev with your software package manager.])
 else
-    not_asked="$not_asked gcrypt"
+    AC_MSG_RESULT(yes)
+    GCRYPT_CFLAGS=`libgcrypt-config --cflags`
+    GCRYPT_LFLAGS=`libgcrypt-config --libs`
+    AC_SUBST(GCRYPT_CFLAGS)
+    AC_SUBST(GCRYPT_LFLAGS)
 fi

 # ------------------------------------------------------------------------------
@@ -795,7 +815,7 @@ fi
 if test "x$enable_gnutls" = "xyes" ; then
    AC_CHECK_HEADER(gnutls/gnutls.h,ac_found_gnutls_header="yes",ac_found_gnutls_header="no")
    AC_CHECK_LIB(gnutls,gnutls_global_init,ac_found_gnutls_lib="yes",ac_found_gnutls_lib="no")
-    
+
    AC_MSG_CHECKING(for gnutls headers and librairies)
    if test "x$ac_found_gnutls_header" = "xno" -o "x$ac_found_gnutls_lib" = "xno" ; then
        AC_MSG_RESULT(no)
@@ -822,7 +842,7 @@ fi
 # ------------------------------------------------------------------------------

 enable_flock="no"
-AC_CACHE_CHECK([for flock() support], ac_have_flock, [
+AC_CACHE_CHECK([for flock() support], ac_cv_have_flock, [
 AC_LINK_IFELSE([AC_LANG_PROGRAM(
 [[ #include <sys/file.h>]],
 [[ flock(0, LOCK_SH); ]])],
@@ -840,7 +860,7 @@ fi
 #                               large file support
 # ------------------------------------------------------------------------------
 if test "x$enable_largefile" = "xyes" ; then
-   CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
+   CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_LARGE_FILES"
 else
   not_asked="$not_asked largefile"
 fi
@@ -851,7 +871,7 @@ fi

 enable_backtrace="no"
 if test "x$debug" != "x0" ; then
-    AC_CACHE_CHECK([for execinfo.h and backtrace], ac_have_backtrace, [
+    AC_CACHE_CHECK([for execinfo.h and backtrace], ac_cv_have_backtrace, [
        AC_LINK_IFELSE([AC_LANG_PROGRAM(
            [[ #include <execinfo.h> ]],
            [[ void *trace[128]; int n = backtrace(trace, 128); ]])],
@@ -870,7 +890,7 @@ fi
 # ------------------------------------------------------------------------------

 enable_eatnewlineglitch="no"
-AC_CACHE_CHECK([for eat_newline_glitch support], ac_have_eatnewlineglitch, [
+AC_CACHE_CHECK([for eat_newline_glitch support], ac_cv_have_eatnewlineglitch, [
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 [[ #include <term.h> ]],
 [[ eat_newline_glitch = 0; ]])],
@@ -885,44 +905,104 @@ else
 fi

 # ------------------------------------------------------------------------------
-#                               documentation
+#                                     zlib
 # ------------------------------------------------------------------------------

+AC_CHECK_HEADER(zlib.h,ac_found_zlib_header="yes",ac_found_zlib_header="no")
+AC_CHECK_LIB(z,compress2,ac_found_zlib_lib="yes",ac_found_zlib_lib="no")
+
+AC_MSG_CHECKING(for zlib headers and librairies)
+if test "x$ac_found_zlib_header" = "xno" -o "x$ac_found_zlib_lib" = "xno" ; then
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR([
+*** zlib was not found. You may want to get it from http://zlib.net/
+*** or try to install libcurl-dev with your software package manager.])
+else
+    AC_MSG_RESULT(yes)
+    ZLIB_CFLAGS=`pkg-config zlib --cflags`
+    ZLIB_LFLAGS=`pkg-config zlib --libs`
+    AC_SUBST(ZLIB_CFLAGS)
+    AC_SUBST(ZLIB_LFLAGS)
+fi
+
+# ------------------------------------------------------------------------------
+#                                     curl
+# ------------------------------------------------------------------------------
+
+AC_PATH_PROG(CURL_CONFIG, curl-config)
+if test "x$CURL_CONFIG" = "x" ; then
+    AC_MSG_ERROR([
+*** "curl-config" couldn't be found on your system.
+*** Try to install libcurl-dev with your software package manager.])
+fi
+CURL_CFLAGS=`$CURL_CONFIG --cflags`
+CURL_LFLAGS=`$CURL_CONFIG --libs`
+AC_SUBST(CURL_CFLAGS)
+AC_SUBST(CURL_LFLAGS)
+
+# ------------------------------------------------------------------------------
+#                           man page / documentation
+# ------------------------------------------------------------------------------
+
+msg_man=""
 msg_doc=""

-if test "x$enable_doc" = "xyes" ; then
+if test "x$enable_man" = "xno"; then
+    not_asked="$not_asked man"
+fi
+if test "x$enable_doc" = "xno"; then
+    not_asked="$not_asked doc"
+fi
+
+if test "x$enable_man" = "xyes" -o "x$enable_doc" = "xyes"; then
    DOC_ASCIIDOC8=""
    AC_CHECK_PROGS(ASCIIDOC, [asciidoc])
+    AC_CHECK_PROGS(A2X, [a2x])
    AC_CHECK_PROGS(SOURCEHIGHLIGHT, [source-highlight])
-    if test -n "$SOURCEHIGHLIGHT" -a -n "$ASCIIDOC"; then
+    if test -z "$A2X"; then
+        not_found="$not_found a2x(from asciidoc)"
+    fi
+    if test -z "$SOURCEHIGHLIGHT"; then
+        not_found="$not_found source-highlight(needed by asciidoc)"
+    fi
+    if test -n "$ASCIIDOC"; then
        AC_MSG_CHECKING([for asciidoc version])
        asciidoc_version=`$ASCIIDOC --version 2>/dev/null`
        case "${asciidoc_version}" in
        asciidoc' '8*)
                DOC_ASCIIDOC8="yes"
                AC_MSG_RESULT([${asciidoc_version}])
-                msg_doc="asciidoc(with source-highlight) $msg_doc"
-                AC_DEFINE(DOC)
+                if test "x$enable_man" = "xyes"; then
+                    if test -n "$A2X"; then
+                        msg_man="asciidoc(with a2x) $msg_man"
+                        AC_DEFINE(MAN)
+                    else
+                        enable_man="no"
+                    fi
+                fi
+                if test "x$enable_doc" = "xyes"; then
+                    if test -n "$SOURCEHIGHLIGHT"; then
+                        msg_doc="asciidoc(with source-highlight) $msg_doc"
+                        AC_DEFINE(DOC)
+                    else
+                        enable_doc="no"
+                    fi
+                fi
                ;;
        *)
                AC_MSG_RESULT([${asciidoc_version} (too old)])
                not_found="$not_found asciidoc"
+                enable_man="no"
+                enable_doc="no"
                ;;
        esac
    else
+        not_found="$not_found asciidoc"
+        enable_man="no"
        enable_doc="no"
    fi
-    if test -z "$ASCIIDOC"; then
-        not_found="$not_found asciidoc"
-    fi
-    if test -z "$SOURCEHIGHLIGHT"; then
-        not_found="$not_found source-highlight(needed by asciidoc)"
-    fi
-    AC_SUBST(DOC_ASCIIDOC8)
    AC_SUBST(ASCIIDOC)
-else
-    not_asked="$not_asked doc"
-    msg_doc=""
+    AC_SUBST(A2X)
 fi

 # ------------------------------------------------------------------------------
@@ -1001,64 +1081,60 @@ CFLAGS="$CFLAGS -DWEECHAT_VERSION=\\\"$VERSION\\\" -DWEECHAT_LICENSE=\\\"$LICENS
 #                                output Makefiles
 # ------------------------------------------------------------------------------

-AM_CONDITIONAL(HAVE_GCRYPT,             test "$enable_gcrypt" = "yes")
 AM_CONDITIONAL(HAVE_GNUTLS,             test "$enable_gnutls" = "yes")
 AM_CONDITIONAL(HAVE_FLOCK,              test "$enable_flock" = "yes")
 AM_CONDITIONAL(HAVE_EAT_NEWLINE_GLITCH, test "$enable_eatnewlineglitch" = "yes")
 AM_CONDITIONAL(GUI_NCURSES,             test "$enable_ncurses" = "yes")
-AM_CONDITIONAL(GUI_WXWIDGETS,           test "$enable_wxwidgets" = "yes")
-AM_CONDITIONAL(GUI_GTK,                 test "$enable_gtk" = "yes")
-AM_CONDITIONAL(GUI_QT,                  test "$enable_qt" = "yes")
 AM_CONDITIONAL(PLUGIN_ALIAS,            test "$enable_alias" = "yes")
 AM_CONDITIONAL(PLUGIN_ASPELL,           test "$enable_aspell" = "yes")
 AM_CONDITIONAL(PLUGIN_CHARSET,          test "$enable_charset" = "yes")
-AM_CONDITIONAL(PLUGIN_DEMO,             test "$enable_demo" = "yes")
 AM_CONDITIONAL(PLUGIN_FIFO,             test "$enable_fifo" = "yes")
 AM_CONDITIONAL(PLUGIN_IRC,              test "$enable_irc" = "yes")
 AM_CONDITIONAL(PLUGIN_LOGGER,           test "$enable_logger" = "yes")
 AM_CONDITIONAL(PLUGIN_RELAY,            test "$enable_relay" = "yes")
 AM_CONDITIONAL(PLUGIN_RMODIFIER,        test "$enable_rmodifier" = "yes")
+AM_CONDITIONAL(PLUGIN_SCRIPT,           test "$enable_script" = "yes")
 AM_CONDITIONAL(PLUGIN_PERL,             test "$enable_perl" = "yes")
 AM_CONDITIONAL(PLUGIN_PYTHON,           test "$enable_python" = "yes")
 AM_CONDITIONAL(PLUGIN_RUBY,             test "$enable_ruby" = "yes")
 AM_CONDITIONAL(PLUGIN_LUA,              test "$enable_lua" = "yes")
 AM_CONDITIONAL(PLUGIN_TCL,              test "$enable_tcl" = "yes")
+AM_CONDITIONAL(PLUGIN_GUILE,            test "$enable_guile" = "yes")
 AM_CONDITIONAL(PLUGIN_XFER,             test "$enable_xfer" = "yes")
+AM_CONDITIONAL(MAN,                     test "$enable_man" = "yes")
 AM_CONDITIONAL(DOC,                     test "$enable_doc" = "yes")

 AC_OUTPUT([Makefile
           doc/Makefile
           doc/en/Makefile
           doc/fr/Makefile
-           doc/pl/Makefile
+           doc/it/Makefile
           doc/de/Makefile
+           doc/pl/Makefile
+           doc/es/Makefile
           doc/ru/Makefile
           doc/ja/Makefile
-           doc/it/Makefile
           src/Makefile
           src/core/Makefile
           src/plugins/Makefile
           src/plugins/alias/Makefile
           src/plugins/aspell/Makefile
           src/plugins/charset/Makefile
-           src/plugins/demo/Makefile
           src/plugins/fifo/Makefile
           src/plugins/irc/Makefile
           src/plugins/logger/Makefile
           src/plugins/relay/Makefile
           src/plugins/rmodifier/Makefile
-           src/plugins/scripts/Makefile
-           src/plugins/scripts/perl/Makefile
-           src/plugins/scripts/python/Makefile
-           src/plugins/scripts/ruby/Makefile
-           src/plugins/scripts/lua/Makefile
-           src/plugins/scripts/tcl/Makefile
+           src/plugins/script/Makefile
+           src/plugins/perl/Makefile
+           src/plugins/python/Makefile
+           src/plugins/ruby/Makefile
+           src/plugins/lua/Makefile
+           src/plugins/tcl/Makefile
+           src/plugins/guile/Makefile
           src/plugins/xfer/Makefile
           src/gui/Makefile
           src/gui/curses/Makefile
-           src/gui/wxwidgets/Makefile
-           src/gui/gtk/Makefile
-           src/gui/qt/Makefile
           intl/Makefile
           po/Makefile.in])

@@ -1070,20 +1146,11 @@ listgui=""
 if test "x$enable_ncurses" = "xyes" ; then
    listgui="$listgui ncurses"
 fi
-if test "x$enable_wxwidgets" = "xyes"; then
-   listgui="$listgui wxwidgets"
-fi
-if test "x$enable_gtk" = "xyes" ; then
-    listgui="$listgui gtk"
-fi
-if test "x$enable_qt" = "xyes" ; then
-    listgui="$listgui qt"
-fi

 if test "x$listgui" = "x" ; then
    AC_MSG_ERROR([
 *** No interface specified...
-*** Please enable at least ncurses, WxWidgets, Gtk or Qt.])
+*** Please enable at least ncurses.])
 fi

 listplugins=""
@@ -1091,14 +1158,11 @@ if test "x$enable_alias" = "xyes"; then
    listplugins="$listplugins alias"
 fi
 if test "x$enable_aspell" = "xyes"; then
-    listplugins="$listplugins aspell"
+    listplugins="$listplugins aspell($ASPELL_LIB_USED)"
 fi
 if test "x$enable_charset" = "xyes"; then
    listplugins="$listplugins charset"
 fi
-if test "x$enable_demo" = "xyes"; then
-    listplugins="$listplugins demo"
-fi
 if test "x$enable_fifo" = "xyes"; then
    listplugins="$listplugins fifo"
 fi
@@ -1114,6 +1178,9 @@ fi
 if test "x$enable_rmodifier" = "xyes"; then
    listplugins="$listplugins rmodifier"
 fi
+if test "x$enable_script" = "xyes"; then
+    listplugins="$listplugins script"
+fi
 if test "x$enable_perl" = "xyes"; then
    listplugins="$listplugins perl($PERL_VERSION)"
 fi
@@ -1129,14 +1196,14 @@ fi
 if test "x$enable_tcl" = "xyes"; then
    listplugins="$listplugins tcl($TCL_VERSION)"
 fi
+if test "x$enable_guile" = "xyes"; then
+    listplugins="$listplugins guile($GUILE_VERSION)"
+fi
 if test "x$enable_xfer" = "xyes"; then
    listplugins="$listplugins xfer"
 fi

 listoptional=""
-if test "x$enable_gcrypt" = "xyes"; then
-    listoptional="$listoptional gcrypt"
-fi
 if test "x$enable_gnutls" = "xyes"; then
    listoptional="$listoptional gnutls"
 fi
@@ -1155,6 +1222,11 @@ if test "x$debug" != "x0"; then
    msg_debug="yes"
 fi

+if test "x$msg_man" = "x"; then
+    msg_man="no"
+else
+    msg_man="yes: $msg_man"
+fi
 if test "x$msg_doc" = "x"; then
    msg_doc="no"
 else
@@ -1163,11 +1235,13 @@ fi

 echo ""
 echo "Enabled features:"
-echo "   Interfaces........... :$listgui"
-echo "   Plugins.............. :$listplugins"
-echo "   Optional features.... :$listoptional"
-echo "   Compile with debug... : $msg_debug"
-echo "   Documentation........ : $msg_doc"
+echo "   Interfaces............. :$listgui"
+echo "   Plugins................ :$listplugins"
+echo "   Optional features...... :$listoptional"
+echo "   Compile with debug..... : $msg_debug"
+echo "   Man page............... : $msg_man"
+echo "   Documentation.......... : $msg_doc"
+echo "   Certificate authorities : ${CA_FILE}"

 if test "x$not_asked" != "x" || test "x$not_found" != "x"; then
    echo ""
@@ -1181,7 +1255,9 @@ if test "x$not_asked" != "x" || test "x$not_found" != "x"; then
 fi

 echo ""
-eval echo "WeeChat will be installed in $bindir."
+echo "WeeChat home directory is ${WEECHAT_HOME}"
+echo ""
+eval echo "WeeChat will be installed in $bindir"
 echo ""
 echo "configure complete, now type 'make' to build WeeChat $VERSION"
 echo ""
@@ -1,3 +1,92 @@
+weechat (0.4.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Move guile build dependency to guile-2.0-dev (previous versions are
+    no longer supported).
+  * Add supported protocols in long description. Thanks to Jonas Smedegaard
+    for the suggestion (Closes: #705216)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 21 May 2013 19:44:31 +0000
+
+weechat (0.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.4
+  * Remove UPGRADE_0.3 from doc (no more included in upstream sources).
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 23 Jan 2013 18:44:36 +0000
+
+weechat (0.3.9.2-1) unstable; urgency=low
+
+  * New upstream release
+    - do not call shell to execute command in hook_process (fix security
+    problem when a plugin/script gives untrusted command)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 18 Nov 2012 13:35:21 +0000
+
+weechat (0.3.9.1-1) unstable; urgency=low
+
+  * New upstream release
+    - fix crash when decoding IRC colors in strings
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 09 Nov 2012 23:11:09 +0000
+
+weechat (0.3.9-1) unstable; urgency=low
+
+  * New upstream release
+  * Add the new 'script' plugin and update the long descriptions accordingly
+  * Add new doc-base files:
+    - Testers guide in Japanese
+    - Users guide in Japanese
+    - Scripting guide in Japanese
+  * Fix wrong Vcs-Browser URL (Closes: #689203)
+  * Update lintian override on weechat-curses
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 30 Sep 2012 21:14:22 +0000
+
+weechat (0.3.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 03 Jun 2012 07:54:52 +0000
+
+weechat (0.3.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Bump Standards-Version to 3.9.3
+  * Update debian/copyright: new year
+  * Add new doc-base files:
+    - Developer's Guide in English
+    - Relay Protocol in English
+    - Quickstart in Spanish
+  * Update Vcs-Git and Vcs-Browser fields
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 26 Feb 2012 10:32:35 +0000
+
+weechat (0.3.6-2) unstable; urgency=low
+
+  * Update debian/rules to use build flags from dpkg-buildflags when it's
+  possible (ie: with dpkg >= 1.16.1).
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 29 Oct 2011 07:31:14 +0000
+
+weechat (0.3.6-1) unstable; urgency=low
+
+  * New upstream release
+    - Fix a FTBFS due to wrong detection of ncursesw headers
+      (Closes: #646299)
+  * Add new doc-base files (Polish translations).
+  * Install html documentation in /usr/share/doc/weechat/html instead
+    of /usr/share/doc/weechat
+  * Add a symlink from /usr/share/doc/weechat/html to
+  /usr/share/doc/weechat-doc/html so that it will be easier to find
+  documentation when weechat-doc is installed (Closes: #632621)
+  * Add a Suggest on weechat-doc for weechat and weechat-curses. Thanks to
+  Jonathan Nieder for the proposal.
+  * Fix the cmake invokation from debian/rules (cflags and ldflags)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 26 Oct 2011 20:10:09 +0000
+
 weechat (0.3.5-1) unstable; urgency=low

  * New upstream release
@@ -142,7 +231,7 @@ weechat (0.2.6.2-1) unstable; urgency=low
  * New upstream release
  * Add a patch which fix typos in aspell plugin.
  * Refresh patch multiple_ip_servers according to the new upstream release.
-  
+
 -- Emmanuel Bouthenot <kolter@openics.org>  Sun, 19 Apr 2009 10:23:26 +0000

 weechat (0.2.6.1-1) unstable; urgency=low
@@ -152,9 +241,9 @@ weechat (0.2.6.1-1) unstable; urgency=low
    (Closes: #519940).
  * Refresh patch multiple_ip_servers according to the new upstream release.
  * Update Standards-Version to 3.8.1.
-  
+
 -- Emmanuel Bouthenot <kolter@openics.org>  Mon, 16 Mar 2009 13:18:29 +0000
- 
+
 weechat (0.2.6-3) unstable; urgency=low

  * Add a patch to make weechat try to connect other server IPs
@@ -189,7 +278,7 @@ weechat (0.2.6-1) unstable; urgency=low
  * New Upstream Version
  * Switch to GPLv3 (update copyright)
  * Update menu entry
-  
+
 -- Emmanuel Bouthenot <kolter@openics.org>  Thu, 06 Sep 2007 20:10:26 +0200

 weechat (0.2.5-1) unstable; urgency=low
@@ -286,11 +375,11 @@ weechat (0.1.8-1) unstable; urgency=low
 -- Julien Louis <ptitlouis@sysif.net>  Sat, 18 Mar 2006 11:32:52 +0100

 weechat (0.1.7-2) unstable; urgency=low
- 
+
   * force linking against libpthread on GNU/Hurd (Closes: #350487)
- 
+
 -- Julien Louis <ptitlouis@sysif.net>  Sun,  5 Feb 2006 18:23:24 +0100
-  
+
 weechat (0.1.7-1) unstable; urgency=low

  * New upstream release
@@ -362,7 +451,7 @@ weechat (0.1.2-2) unstable; urgency=low
 weechat (0.1.2-1) unstable; urgency=low

  * WeeChat version 0.1.2, see ChangeLog for detail.
-  
+
 -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 21 May 2005 08:00:00 +0200

 weechat (0.1.1-2) unstable; urgency=low
@@ -376,65 +465,65 @@ weechat (0.1.1-2) unstable; urgency=low
 weechat (0.1.1-1) unstable; urgency=low

  * WeeChat version 0.1.1, see ChangeLog for detail (closes: #306492)
-  
+
 -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 20 Mar 2005 08:00:00 +0200

 weechat (0.1.0-1) unstable; urgency=low

  * WeeChat version 0.1.0, see ChangeLog for detail.
-  
+
 -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 12 Feb 2005 12:00:00 +0200

 weechat (0.0.9-1) unstable; urgency=low

  * WeeChat version 0.0.9, see ChangeLog for detail.
-  
+
 -- FlashCode <flashcode@flashtux.org>  Sat, 01 Jan 2005 13:00:00 +0200

 weechat (0.0.8-1) unstable; urgency=low

  * WeeChat version 0.0.8, see ChangeLog for detail.
-  
+
 -- FlashCode <flashcode@flashtux.org>  Sat, 30 Oct 2004 11:40:00 +0200

 weechat (0.0.7-1) unstable; urgency=low

  * WeeChat version 0.0.7, see ChangeLog for detail.
-  
+
 -- FlashCode <flashcode@flashtux.org>  Sat, 08 Aug 2004 21:00:00 +0200

 weechat (0.0.6-1) unstable; urgency=low

  * WeeChat version 0.0.6, see ChangeLog for detail.
-  
+
 -- FlashCode <flashcode@flashtux.org>  Sat, 05 Jun 2004 11:30:00 +0200

 weechat (0.0.5-1) unstable; urgency=low

  * WeeChat version 0.0.5, see ChangeLog for detail.
-  
+
 -- FlashCode <flashcode@flashtux.org>  Sat, 07 Feb 2004 20:30:00 +0200

 weechat (0.0.4-1) unstable; urgency=low

  * WeeChat version 0.0.4, see ChangeLog for detail.
-  
+
 -- FlashCode <flashcode@flashtux.org>  Thu, 01 Jan 2004 13:00:00 +0200

 weechat (0.0.3-1) unstable; urgency=low

  * WeeChat version 0.0.3, see ChangeLog for detail.
-  
+
 -- FlashCode <flashcode@flashtux.org>  Mon, 03 Nov 2003 23:15:00 +0200

 weechat (0.0.2-1) unstable; urgency=low

  * WeeChat version 0.0.2, see ChangeLog for detail.
-  
+
 -- FlashCode <flashcode@flashtux.org>  Sun, 05 Oct 2003 12:00:00 +0200

 weechat (0.0.1-1) unstable; urgency=low

  * First version.
-  
+
 -- FlashCode <flashcode@flashtux.org>  Sat, 27 Sep 2003 12:00:00 +0200
@@ -2,22 +2,26 @@ Source: weechat
 Section: net
 Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@debian.org>
-Build-Depends-Indep: asciidoc (>= 8.5), source-highlight
 Build-Depends: debhelper (>= 7.0.50), cmake, libncursesw5-dev,
 ruby1.9.1, ruby1.9.1-dev, libperl-dev, python-dev, libaspell-dev, liblua5.1-0-dev,
- tcl8.5-dev, libgcrypt11-dev, libgnutls-dev, dpkg-dev (>= 1.13.19), pkg-config
-Standards-Version: 3.9.2
+ tcl8.5-dev, guile-2.0-dev, libcurl4-gnutls-dev, libgcrypt11-dev, libgnutls-dev,
+ zlib1g-dev, dpkg-dev (>= 1.13.19), pkg-config, asciidoc (>= 8.5), source-highlight,
+ xsltproc, docbook-xml, docbook-xsl
+Standards-Version: 3.9.4
 Homepage: http://weechat.org/
-Vcs-Git: git://git.debian.org/users/kolter/weechat.git
-Vcs-Browser: http://git.debian.org/?p=users/kolter/weechat.git
+Vcs-Git: git://anonscm.debian.org/users/kolter/weechat.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/kolter/weechat.git

 Package: weechat
 Architecture: all
 Depends: ${misc:Depends}, weechat-curses (>= ${source:Version})
+Suggests: weechat-doc (= ${source:Version})
 Description: Fast, light and extensible chat client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
  - nicklist
  - smart hotlist
  - horizontal and vertical split
@@ -26,7 +30,8 @@ Description: Fast, light and extensible chat client
  - 256 colors support
  - incremental text search
  - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, and Tcl scripting
+  - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
+  - scripts manager
  - spell checking
  - highly customizable and extensible
  - and much more!
@@ -37,10 +42,13 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version})
 Conflicts: weechat-common
 Breaks: weechat-scripts (<= 20090221-1)
 Recommends: weechat-plugins (= ${binary:Version})
+Suggests: weechat-doc (= ${source:Version})
 Description: Fast, light and extensible chat client - console client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
  - nicklist
  - smart hotlist
  - horizontal and vertical split
@@ -49,7 +57,8 @@ Description: Fast, light and extensible chat client - console client
  - 256 colors support
  - incremental text search
  - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, and Tcl scripting
+  - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
+  - scripts manager
  - spell checking
  - highly customizable and extensible
  - and much more!
@@ -79,7 +88,8 @@ Description: Fast, light and extensible chat client - plugins
 .
 This package provides some plugins to enhance WeeChat. It currently
 ships the following plugins:
-  - Perl, Python, Ruby, Lua, and Tcl scripting
+  - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
+  - scripts manager
  - Spell checking (thanks to aspell)
  - FIFO pipe for remote control
  - IRC proxy
@@ -4,14 +4,14 @@ Upstream-Contact: Sebastien Helleu <flashcode@flashtux.org>
 Source: http://weechat.org/

 Files: *
-Copyright: 2003-2011, Sebastien Helleu <flashcode@flashtux.org>
+Copyright: 2003-2013, Sebastien Helleu <flashcode@flashtux.org>
           2005-2009, Emmanuel Bouthenot <kolter@openics.org>
           2008-2009, Dmitry Kobylin <fnfal@academ.tsc.ru>
 License: GPL-3+

 Files: debian/*
 Copyright: 2005-2008, Julien Louis <ptitlouis@sysif.net>
-           2008-2011, Emmanuel Bouthenot <kolter@openics.org>
+           2008-2012, Emmanuel Bouthenot <kolter@openics.org>
 License: GPL-3+

 License: GPL-3+
@@ -1,37 +1,45 @@
 #!/usr/bin/make -f

-builddir/Makefile:
-	mkdir -p builddir
-	cd builddir && \
+# Default build flags
+CFLAGS = -g -O2
+LDFLAGS = -Wl,-Bsymbolic-functions
+
+# dpkg >= 1.16.1 provides enhanced build flags (hardening features, etc.)
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+
+BUILDDIR = builddir
+
+$(BUILDDIR)/Makefile:
+	mkdir -p $(BUILDDIR)
+	cd $(BUILDDIR) && \
 	cmake .. \
+		-DENABLE_MAN:BOOL=ON \
+		-DENABLE_DOC:BOOL=ON \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-		-DCMAKE_C_FLAGS:STRING="$(CFLAGS)" \
-		-DCMAKE_LD_FLAGS:STRING="-Wl,-z,defs" \
-		-DCMAKE_CXX_FLAGS:STRING="$(CXXFLAGS)" \
+		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
+		-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON

-build: build-stamp
-build-stamp: builddir/Makefile
-	dh_testdir
-	$(MAKE) -C builddir
-	touch $@
+override_dh_auto_build: $(BUILDDIR)/Makefile
+	dh_auto_build
+
+# Create a symbolic link weechat-curses -> weechat
+# This link is created for compatibility with old versions on /upgrade.
+# It may be removed in future.
+override_dh_auto_install:
+	dh_auto_install
+	ln -s weechat $(CURDIR)/debian/weechat-curses/usr/bin/weechat-curses

 override_dh_auto_configure:
 	# the package also has autotools buildsys and
 	# debhelper try to use it but that's not needed
 	echo

-override_dh_install:
-	$(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/tmp install
-	dh_install
-
 override_dh_strip:
 	dh_strip --dbg-package=weechat-dbg

-clean:
-	rm -rf builddir
-	dh $@
-
 %:
-	dh $@
+	dh $@ --parallel --builddirectory=$(BUILDDIR)
@@ -1,4 +1,3 @@
 AUTHORS
 NEWS
 README
-UPGRADE_0.3
@@ -1,2 +1,4 @@
-usr/bin/weechat-curses
+usr/bin/weechat
 debian/weechat.xpm usr/share/pixmaps
+usr/share/man/man1/weechat.1
+usr/share/man/*/man1/weechat.1
@@ -1 +0,0 @@
-weechat-curses: manpage-has-errors-from-man usr/share/man/man1/weechat-curses.1.gz 61: warning [p 1, 9.0i]: cannot adjust line
@@ -1 +0,0 @@
-doc/weechat-curses.1
@@ -1,4 +1,4 @@
 ?package(weechat-curses):needs="text" section="Applications/Network/Communication" \
-		title="weechat-curses" \
+		title="weechat" \
 		icon="/usr/share/pixmaps/weechat.xpm" \
-		command="/usr/bin/weechat-curses"
+		command="/usr/bin/weechat"
@@ -0,0 +1,10 @@
+Document: weechat-dev-en
+Title: WeeChat Developer's Guide (English)
+Author: Sebastien Helleu
+Abstract: This manual describes WeeChat internals and
+ how to contribute to WeeChat (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_dev.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_dev.en.html
@@ -6,5 +6,5 @@ Abstract: This document answers frequently asked questions
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_faq.de.html
-Files: /usr/share/doc/weechat-doc/weechat_faq.de.html
+Index: /usr/share/doc/weechat-doc/html/weechat_faq.de.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.de.html
@@ -6,5 +6,5 @@ Abstract: This document answers frequently asked questions
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_faq.en.html
-Files: /usr/share/doc/weechat-doc/weechat_faq.en.html
+Index: /usr/share/doc/weechat-doc/html/weechat_faq.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.en.html
@@ -6,5 +6,5 @@ Abstract: This document answers frequently asked questions
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_faq.fr.html
-Files: /usr/share/doc/weechat-doc/weechat_faq.fr.html
+Index: /usr/share/doc/weechat-doc/html/weechat_faq.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.fr.html
@@ -6,5 +6,5 @@ Abstract: This document answers frequently asked questions
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_faq.it.html
-Files: /usr/share/doc/weechat-doc/weechat_faq.it.html
+Index: /usr/share/doc/weechat-doc/html/weechat_faq.it.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.it.html
@@ -0,0 +1,10 @@
+Document: weechat-faq-ja
+Title: WeeChat FAQ (Japanese)
+Author: Sebastien Helleu
+Abstract: This document answers frequently asked questions
+ about the WeeChat IRC client (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_faq.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.ja.html
@@ -6,5 +6,5 @@ Abstract: This document answers frequently asked questions
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_faq.pl.html
-Files: /usr/share/doc/weechat-doc/weechat_faq.pl.html
+Index: /usr/share/doc/weechat-doc/html/weechat_faq.pl.html
+Files: /usr/share/doc/weechat-doc/html/weechat_faq.pl.html
@@ -6,5 +6,5 @@ Abstract: This document describes the API to create plugins
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_plugin_api.en.html
-Files: /usr/share/doc/weechat-doc/weechat_plugin_api.en.html
+Index: /usr/share/doc/weechat-doc/html/weechat_plugin_api.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_plugin_api.en.html
@@ -6,5 +6,5 @@ Abstract: This document describes the API to create plugins
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_plugin_api.fr.html
-Files: /usr/share/doc/weechat-doc/weechat_plugin_api.fr.html
+Index: /usr/share/doc/weechat-doc/html/weechat_plugin_api.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_plugin_api.fr.html
@@ -6,5 +6,5 @@ Abstract: This document describes the API to create plugins
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_plugin_api.it.html
-Files: /usr/share/doc/weechat-doc/weechat_plugin_api.it.html
+Index: /usr/share/doc/weechat-doc/html/weechat_plugin_api.it.html
+Files: /usr/share/doc/weechat-doc/html/weechat_plugin_api.it.html
@@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (German version).
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_quickstart.de.html
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.de.html
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.de.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.de.html
@@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (English version).
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_quickstart.en.html
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.en.html
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.en.html
@@ -0,0 +1,9 @@
+Document: weechat-quickstart-es
+Title: WeeChat Quickstart (Spanish)
+Author: Sebastien Helleu
+Abstract: A short HowTo for new WeeChat users (Spanish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.es.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.es.html
@@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (French version).
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_quickstart.fr.html
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.fr.html
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.fr.html
@@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (Italian version).
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_quickstart.it.html
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.it.html
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.it.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.it.html
@@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (Japanese version).
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_quickstart.ja.html
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.ja.html
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.ja.html
@@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (Polish version).
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_quickstart.pl.html
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.pl.html
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.pl.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.pl.html
@@ -5,5 +5,5 @@ Abstract: A short HowTo for new WeeChat users (Russian version).
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_quickstart.ru.html
-Files: /usr/share/doc/weechat-doc/weechat_quickstart.ru.html
+Index: /usr/share/doc/weechat-doc/html/weechat_quickstart.ru.html
+Files: /usr/share/doc/weechat-doc/html/weechat_quickstart.ru.html
@@ -0,0 +1,10 @@
+Document: weechat-relay-protocol-en
+Title: WeeChat Relay Protocol (English)
+Author: Sebastien Helleu
+Abstract: This manual describes WeeChat Relay Protocol, used by
+ remote GUI to communicate with Relay plugin (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.en.html
@@ -6,5 +6,5 @@ Abstract: This document describes the API to create scripts
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_scripting.de.html
-Files: /usr/share/doc/weechat-doc/weechat_scripting.de.html
+Index: /usr/share/doc/weechat-doc/html/weechat_scripting.de.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.de.html
@@ -6,5 +6,5 @@ Abstract: This document describes the API to create scripts
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_scripting.en.html
-Files: /usr/share/doc/weechat-doc/weechat_scripting.en.html
+Index: /usr/share/doc/weechat-doc/html/weechat_scripting.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.en.html
@@ -6,5 +6,5 @@ Abstract: This document describes the API to create scripts
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_scripting.fr.html
-Files: /usr/share/doc/weechat-doc/weechat_scripting.fr.html
+Index: /usr/share/doc/weechat-doc/html/weechat_scripting.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.fr.html
@@ -6,5 +6,5 @@ Abstract: This document describes the API to create scripts
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_scripting.it.html
-Files: /usr/share/doc/weechat-doc/weechat_scripting.it.html
+Index: /usr/share/doc/weechat-doc/html/weechat_scripting.it.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.it.html
@@ -0,0 +1,10 @@
+Document: weechat-scripting-ja
+Title: WeeChat Scripting Guide (Japanese)
+Author: Sebastien Helleu
+Abstract: This document describes the API to create scripts
+ for WeeChat (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_scripting.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.ja.html
@@ -0,0 +1,10 @@
+Document: weechat-scripting-pl
+Title: WeeChat Scripting Guide (Polish)
+Author: Sebastien Helleu
+Abstract: This document describes the API to create scripts
+ for WeeChat (Polish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_scripting.pl.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.pl.html
@@ -6,5 +6,5 @@ Abstract: This document describes how to test and report
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_tester.de.html
-Files: /usr/share/doc/weechat-doc/weechat_tester.de.html
+Index: /usr/share/doc/weechat-doc/html/weechat_tester.de.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.de.html
@@ -6,5 +6,5 @@ Abstract: This document describes how to test and report
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_tester.en.html
-Files: /usr/share/doc/weechat-doc/weechat_tester.en.html
+Index: /usr/share/doc/weechat-doc/html/weechat_tester.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.en.html
@@ -6,5 +6,5 @@ Abstract: This document describes how to test and report
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_tester.fr.html
-Files: /usr/share/doc/weechat-doc/weechat_tester.fr.html
+Index: /usr/share/doc/weechat-doc/html/weechat_tester.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.fr.html
@@ -6,5 +6,5 @@ Abstract: This document describes how to test and report
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_tester.it.html
-Files: /usr/share/doc/weechat-doc/weechat_tester.it.html
+Index: /usr/share/doc/weechat-doc/html/weechat_tester.it.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.it.html
@@ -0,0 +1,10 @@
+Document: weechat-tester-ja
+Title: WeeChat Tester's Guide (Japanese)
+Author: Sebastien Helleu
+Abstract: This document describes how to test and report
+ bugs against the WeeChat IRC Client (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_tester.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.ja.html
@@ -6,5 +6,5 @@ Abstract: This document describes how to test and report
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_tester.pl.html
-Files: /usr/share/doc/weechat-doc/weechat_tester.pl.html
+Index: /usr/share/doc/weechat-doc/html/weechat_tester.pl.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.pl.html
@@ -6,5 +6,5 @@ Abstract: This manual describes how to use the WeeChat
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_user.de.html
-Files: /usr/share/doc/weechat-doc/weechat_user.de.html
+Index: /usr/share/doc/weechat-doc/html/weechat_user.de.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.de.html
@@ -6,5 +6,5 @@ Abstract: This manual describes how to use the WeeChat
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_user.en.html
-Files: /usr/share/doc/weechat-doc/weechat_user.en.html
+Index: /usr/share/doc/weechat-doc/html/weechat_user.en.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.en.html
@@ -6,5 +6,5 @@ Abstract: This manual describes how to use the WeeChat
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_user.fr.html
-Files: /usr/share/doc/weechat-doc/weechat_user.fr.html
+Index: /usr/share/doc/weechat-doc/html/weechat_user.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.fr.html
@@ -6,5 +6,5 @@ Abstract: This manual describes how to use the WeeChat
 Section: Network/Communication

 Format: HTML
-Index: /usr/share/doc/weechat-doc/weechat_user.it.html
-Files: /usr/share/doc/weechat-doc/weechat_user.it.html
+Index: /usr/share/doc/weechat-doc/html/weechat_user.it.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.it.html
@@ -0,0 +1,10 @@
+Document: weechat-user-ja
+Title: WeeChat User's Guide (Japanese)
+Author: Sebastien Helleu
+Abstract: This manual describes how to use the WeeChat
+ IRC client (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_user.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.ja.html
@@ -1 +1 @@
-usr/share/doc/weechat/* usr/share/doc/weechat-doc
+usr/share/doc/weechat/*.html usr/share/doc/weechat-doc/html
@@ -0,0 +1 @@
+usr/share/doc/weechat-doc/html usr/share/doc/weechat/html
@@ -1,9 +1,11 @@
 usr/lib/weechat/plugins/aspell.so
 usr/lib/weechat/plugins/fifo.so
+usr/lib/weechat/plugins/guile.so
 usr/lib/weechat/plugins/perl.so
 usr/lib/weechat/plugins/python.so
 usr/lib/weechat/plugins/ruby.so
 usr/lib/weechat/plugins/lua.so
 usr/lib/weechat/plugins/tcl.so
+usr/lib/weechat/plugins/script.so
 usr/lib/weechat/plugins/relay.so
 usr/lib/weechat/plugins/rmodifier.so
@@ -1,295 +1,397 @@
-/* XPM */
-static char *weechat[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 257 2",
-"   c #000000",
-".  c #0A0904",
-"X  c #080813",
-"o  c #080716",
-"O  c #110D08",
-"+  c #150A15",
-"@  c #1A0D1A",
-"#  c #19150C",
-"$  c #151517",
-"%  c #1F1F32",
-"&  c #13132C",
-"*  c #260A26",
-"=  c #351935",
-"-  c #271927",
-";  c #262608",
-":  c #322C0C",
-">  c #36380B",
-",  c #353316",
-"<  c #232516",
-"1  c #242224",
-"2  c #292935",
-"3  c #2D302D",
-"4  c #2D3330",
-"5  c #3B333B",
-"6  c #1D1C4A",
-"7  c #110F7B",
-"8  c #0E0D65",
-"9  c #221F60",
-"0  c #282948",
-"q  c #292855",
-"w  c #333447",
-"e  c #383855",
-"r  c #2A2978",
-"t  c #302F70",
-"y  c #353465",
-"u  c #363574",
-"i  c #2A286E",
-"p  c #2E4110",
-"a  c #39410C",
-"s  c #3E4C11",
-"d  c #3F5220",
-"f  c #394041",
-"g  c #3E4753",
-"h  c #493F11",
-"j  c #4F1050",
-"k  c #4A0F4B",
-"l  c #572657",
-"z  c #4D374D",
-"x  c #403F6F",
-"c  c #640964",
-"v  c #641E64",
-"b  c #701770",
-"n  c #790A79",
-"m  c #683C68",
-"M  c #623662",
-"N  c #6B2B6B",
-"B  c #454A08",
-"V  c #484C15",
-"C  c #554B16",
-"Z  c #58560A",
-"A  c #595B0B",
-"S  c #545715",
-"D  c #4C5712",
-"F  c #4D5034",
-"G  c #504F24",
-"H  c #4E710E",
-"J  c #4D7C1C",
-"K  c #5B6713",
-"L  c #506B11",
-"P  c #546927",
-"I  c #506D2E",
-"U  c #665B14",
-"Y  c #696C0C",
-"T  c #68730D",
-"R  c #6F7010",
-"E  c #707128",
-"W  c #4D504D",
-"Q  c #46456A",
-"!  c #4C4C7B",
-"~  c #434577",
-"^  c #554C69",
-"/  c #5B5A7D",
-"(  c #54547A",
-")  c #535964",
-"_  c #567745",
-"`  c #4D6B57",
-"'  c #5D6C78",
-"]  c #587069",
-"[  c #6A487C",
-"{  c #6D576D",
-"}  c #645475",
-"|  c #76557A",
-" . c #786678",
-".. c #70707D",
-"X. c #676768",
-"o. c #3F3E82",
-"O. c #2D2BAA",
-"+. c #3D3BA4",
-"@. c #3B39B9",
-"#. c #484888",
-"$. c #4A4C96",
-"%. c #585885",
-"&. c #595890",
-"*. c #555494",
-"=. c #4745A6",
-"-. c #4947B5",
-";. c #514FBB",
-":. c #5A58BB",
-">. c #5C5BAF",
-",. c #755581",
-"<. c #605FB6",
-"1. c #6B6883",
-"2. c #68679B",
-"3. c #7A7497",
-"4. c #76698F",
-"5. c #6968A6",
-"6. c #706FB5",
-"7. c #7675BB",
-"8. c #6E6DB6",
-"9. c #4947C3",
-"0. c #5351C2",
-"q. c #5D5BC0",
-"w. c #6B6ACC",
-"e. c #6361C7",
-"r. c #7170C6",
-"t. c #7877D2",
-"y. c #56840C",
-"u. c #6A8814",
-"i. c #63980B",
-"p. c #748614",
-"a. c #7F9C0D",
-"s. c #749218",
-"d. c #698F13",
-"f. c #6C852A",
-"g. c #798C35",
-"h. c #76912B",
-"j. c #76B505",
-"k. c #70A50F",
-"l. c #7EA525",
-"z. c #678946",
-"x. c #A57A5A",
-"c. c #9A1E9A",
-"v. c #861B86",
-"b. c #912B92",
-"n. c #8A298A",
-"m. c #A030A0",
-"M. c #864886",
-"N. c #8F469E",
-"B. c #975897",
-"V. c #8A788A",
-"C. c #936A93",
-"Z. c #987599",
-"A. c #866892",
-"S. c #9470AB",
-"D. c #A25FA2",
-"F. c #B16FB1",
-"G. c #B07FB1",
-"H. c #B776B7",
-"J. c #807FD0",
-"K. c #A37AC2",
-"L. c #87880B",
-"P. c #888513",
-"I. c #869A0A",
-"U. c #8B9B14",
-"Y. c #94970D",
-"T. c #9B9C13",
-"R. c #98961A",
-"E. c #968D16",
-"W. c #929D2F",
-"Q. c #82A90B",
-"!. c #8CAA06",
-"~. c #82B30A",
-"^. c #84B706",
-"/. c #97A913",
-"(. c #96B90A",
-"). c #99B914",
-"_. c #91AB10",
-"`. c #A39A1C",
-"'. c #A09A3D",
-"]. c #A9AE05",
-"[. c #A7AA16",
-"{. c #A7B90B",
-"}. c #ACB712",
-"|. c #BDBA18",
-" X c #B7B711",
-".X c #B0B726",
-"XX c #9A8B4B",
-"oX c #9EC008",
-"OX c #BCC40D",
-"+X c #BCC90E",
-"@X c #B1C707",
-"#X c #AEC90C",
-"$X c #C4AE2A",
-"%X c #C4CB11",
-"&X c #C8D809",
-"*X c #CBD011",
-"=X c #D1CF1A",
-"-X c #D1D50E",
-";X c #D7E803",
-":X c #918197",
-">X c #858494",
-",X c #8987BA",
-"<X c #928BBB",
-"1X c #9B9BA8",
-"2X c #9B98B8",
-"3X c #8784A3",
-"4X c #A787A8",
-"5X c #AE9CAE",
-"6X c #AC99B1",
-"7X c #B988B9",
-"8X c #BB92BC",
-"9X c #B598B8",
-"0X c #A0A0A7",
-"qX c #A6A6B7",
-"wX c #8382C6",
-"eX c #8382D4",
-"rX c #8D8CD4",
-"tX c #9C8CC7",
-"yX c #908FD9",
-"uX c #9493C6",
-"iX c #9A99DB",
-"pX c #9493D3",
-"aX c #A693C8",
-"sX c #A09AD5",
-"dX c #A8A5C9",
-"fX c #A9A6D6",
-"gX c #B7A8C7",
-"hX c #B7B6DA",
-"jX c #B5B1CE",
-"kX c #B7B4E2",
-"lX c #A9A8E2",
-"zX c #C88EC8",
-"xX c #C38BC3",
-"cX c #C695C6",
-"vX c #C2ADC2",
-"bX c #C7A6C7",
-"nX c #C4B5C4",
-"mX c #C6B9D3",
-"MX c #DDB9DD",
-"NX c #D9B4D9",
-"BX c #D3A4D4",
-"VX c #C9C5CA",
-"CX c #CAC9D7",
-"ZX c #D4CBD4",
-"AX c #D9C1D9",
-"SX c #DACEDA",
-"DX c #C4C3E4",
-"FX c #CBC9E6",
-"GX c #D8D7E6",
-"HX c #E7CCE7",
-"JX c #E9CFE9",
-"KX c #EADBEA",
-"LX c #E4DAE4",
-"PX c #EDE2ED",
-"IX c #EAEAF4",
-"UX c #F0E1F0",
-"YX c None",
-/* pixels */
-"YXYXYXYXYXYXYXYXYXSXLXIXUXCX    YXYXYXYXVXLXPXPXZX.   YXYXYXYXYX",
-"YXYXYXYXYXYXYXnXKXUXUXKXJXSXnX    YXnXKXPXPXPXKXSXnX    YXYXYXYX",
-"YXYXYXYXYXYX9XHXJXMX0XvX:X9XSX     .HXJXAX5XvX>XvXAX.   YXYXYXYX",
-"YXYXYXYXYXYXMXMXkXx.. | 4XNXvX    NXMXMXV.  { 4XNXbX      YXYXYX",
-"YXYXYXYXYXBXBX8XZ.    4X8X8XZ.  { BX8X4X    G.7XcXZ.      YXYXYX",
-"YXYXYXYXLXcXcXC.z     zXxX7X) X.G.G.C.z     zXcX7X5 5 VX    YXYX",
-"YXYX1XIXGXBXCXC.+   H.H.F.6XIXIX8X| B.-   F.H.8X5X0XCXCX      YX",
-"YXYX3 GXmX8XmXZ.M M.D.m | VXCXGX4X| B.M.B.D.m gXqX1XCXW       YX",
-"YXYX  CXgXS.jXA.= + =   2XFXqXFXZ.| n.l @ =   jX>X..GX$       YX",
-"YXYX  hXaXA.jX,.= +     kXFXDXFX3.{ m l *   w hXV.2XdX        YX",
-"YXYX  hXdX,.fX[ v n.j b.kX2XDXhX1.4.v b.m.j S.tX3XkX1.        YX",
-"YXYX  fXdX4.aX^ j v.c.N.fX) kXuX} <X= b c.c.G.tX1.kX%       YXYX",
-"YXYX  <XfXuX<X[ k c c S.uX( fX,X' iXk c n b tX/ 3.uX        YXYX",
-"YXYX  2.iXrX2./ $     pX2.6.rX,XQ iX2     2 iXQ pX/         YXYX",
-"YXYX  e rXrX( %.e   ( rX( 5.7.wXQ J.y     5.yX( yX&       YXYXYX",
-"YXYXYX  t.eXQ 5.~   7.7.2.% 2.eX&.2.&.    J.6.8.5.        YXYXYX",
-"YXYXYX  r.t.y 8.#.o 8.~ *.  x t.r.~ 8.  0 t.! r.0   o $ F YXYXYX",
-"YXYXYX  <.w.~ >.#.d ] #.0   q w.w.y w.o #.e.$.<..   d I I     YX",
-"YXYXYX  =.e.=.#.g z.I t X   q ;.e.u :.y :.o.q.u   < J y.d     YX",
-"YXYXYX  y 0.0.r ] _ I 6     o -.0.-.=.0.;.t 0.o   , I y.p     YX",
-"YXYXYXYX  9.9.i ' _ g X     + +.9.9.@.;.i +.r     y.k.i.y.H     ",
-"YXYXXXW.Q.] =.@.z.J 4 . V s.E o.@.@.-.' d.z.L ; s j.j.j.i.D     ",
-"YXXXW.Q.Q.f.) O.l.f.# D Q.u.u.o O.$.g.g.h.^.^.> s.oX~.~.u.s     ",
-"YX}.oXD a P w 9 ~.f.S T p.p.K   ~ ).g q g j.(.. # k.a.K         ",
-".X#X{.  . ; 7 0 _.!.V O I.U.C . oXg.6 8 4 Y.(.  a /.).T         ",
-"+X#X(.      1 # T.{.,   #X{.C B +XI.    I./.{.  T #XoXA       YX",
-"&X+X}.Y P.%X[.P.+X@X.   &X@XY Z ;X/.A T.OX}.+X; Y.}.[.B     YXYX",
-".X*XOX;X;X XZ T.*XL.    =X%XP.; ;X%X*XT.> `.|., ].`. X:     YXYX",
-". Y.].T.A .   C C ;     $X-Xh   P.].R O   R :    XE.P.O     YXYX",
-"                        E U                     C .         YXYX",
-"YX                    YX. #                               YXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYX      YXYXYXYXYXYXYXYXYX    YXYXYXYXYX"
-};
+/* XPM */
+static char * C:\temp\weechat_xpm[] = {
+"32 32 362 2",
+"  	c None",
+". 	c #117529",
+"+ 	c #0E7527",
+"@ 	c #0A7424",
+"# 	c #057323",
+"$ 	c #016F20",
+"% 	c #5DAA58",
+"& 	c #5DB059",
+"* 	c #5AB158",
+"= 	c #57B157",
+"- 	c #54AF55",
+"; 	c #4FAE53",
+"> 	c #4BAE52",
+", 	c #48AD50",
+"' 	c #44AC4E",
+") 	c #3FAB4C",
+"! 	c #3BA849",
+"~ 	c #36A646",
+"{ 	c #30A343",
+"] 	c #2CA040",
+"^ 	c #279D3D",
+"/ 	c #229A3A",
+"( 	c #1D9837",
+"_ 	c #189534",
+": 	c #129232",
+"< 	c #0D8F2E",
+"[ 	c #088D2C",
+"} 	c #03691F",
+"| 	c #64AB5B",
+"1 	c #6FC468",
+"2 	c #6AC265",
+"3 	c #66BF62",
+"4 	c #62BC5F",
+"5 	c #5DBA5D",
+"6 	c #58B85A",
+"7 	c #54B557",
+"8 	c #4FB254",
+"9 	c #4AB052",
+"0 	c #45AD4F",
+"a 	c #40AB4C",
+"b 	c #3CA849",
+"c 	c #37A647",
+"d 	c #32A344",
+"e 	c #2DA041",
+"f 	c #289D3D",
+"g 	c #239A3B",
+"h 	c #1E9838",
+"i 	c #199535",
+"j 	c #139232",
+"k 	c #0F8F2F",
+"l 	c #098B2B",
+"m 	c #035018",
+"n 	c #68AE5E",
+"o 	c #76C96B",
+"p 	c #70C568",
+"q 	c #6CC365",
+"r 	c #67C062",
+"s 	c #62BD60",
+"t 	c #5FBC5E",
+"u 	c #5ABA5B",
+"v 	c #55B859",
+"w 	c #51B656",
+"x 	c #4CB354",
+"y 	c #47B051",
+"z 	c #42AD4E",
+"A 	c #3EAA4B",
+"B 	c #38A647",
+"C 	c #32A243",
+"D 	c #2E9D40",
+"E 	c #28993C",
+"F 	c #239439",
+"G 	c #1E9036",
+"H 	c #188C32",
+"I 	c #13882F",
+"J 	c #0F842C",
+"K 	c #0A7C27",
+"L 	c #629F57",
+"M 	c #7BCC6F",
+"N 	c #76C86B",
+"O 	c #71C569",
+"P 	c #6DC366",
+"Q 	c #69C163",
+"R 	c #65C162",
+"S 	c #57AC56",
+"T 	c #3E803F",
+"U 	c #377539",
+"V 	c #316E34",
+"W 	c #2C6830",
+"X 	c #28602C",
+"Y 	c #225928",
+"Z 	c #1D5124",
+"` 	c #1A4E22",
+" .	c #184C20",
+"..	c #81CF72",
+"+.	c #7CCB6E",
+"@.	c #77C86C",
+"#.	c #72C76A",
+"$.	c #6EC467",
+"%.	c #69C164",
+"&.	c #549F51",
+"*.	c #71B062",
+"=.	c #84D274",
+"-.	c #7FCF71",
+";.	c #7ACD6F",
+">.	c #76CB6C",
+",.	c #72C869",
+"'.	c #6CC465",
+").	c #1F391D",
+"!.	c #558DC1",
+"~.	c #568EC3",
+"{.	c #568FC5",
+"].	c #5790C7",
+"^.	c #5892C8",
+"/.	c #538ABE",
+"(.	c #5B98D0",
+"_.	c #5C99D2",
+":.	c #5E9CD5",
+"<.	c #609FDB",
+"[.	c #61A1DC",
+"}.	c #497440",
+"|.	c #3F6638",
+"1.	c #355930",
+"2.	c #2C4A28",
+"3.	c #213B1F",
+"4.	c #609ED9",
+"5.	c #63A4E2",
+"6.	c #63A4E1",
+"7.	c #5B96CE",
+"8.	c #64A6E4",
+"9.	c #4878A4",
+"0.	c #426E96",
+"a.	c #4F83B3",
+"b.	c #4E82B2",
+"c.	c #62A3DF",
+"d.	c #64A6E3",
+"e.	c #274159",
+"f.	c #44729C",
+"g.	c #5B97CF",
+"h.	c #5B97D0",
+"i.	c #5C98D0",
+"j.	c #5C98D1",
+"k.	c #5B97CE",
+"l.	c #64A5E2",
+"m.	c #36597B",
+"n.	c #64A4E2",
+"o.	c #5A95CD",
+"p.	c #5993CB",
+"q.	c #64A5E3",
+"r.	c #45729C",
+"s.	c #63A4E3",
+"t.	c #62A2E1",
+"u.	c #62A1E1",
+"v.	c #61A1E1",
+"w.	c #609FE0",
+"x.	c #5993D4",
+"y.	c #5D9BDF",
+"z.	c #5D99DF",
+"A.	c #5C99DF",
+"B.	c #5B98DE",
+"C.	c #4878B1",
+"D.	c #63A3E5",
+"E.	c #609EE0",
+"F.	c #5F9DE0",
+"G.	c #5F9DDF",
+"H.	c #5E9BDF",
+"I.	c #5C99DC",
+"J.	c #2B4666",
+"K.	c #4D7FBD",
+"L.	c #5A96DF",
+"M.	c #5A94DE",
+"N.	c #5993DD",
+"O.	c #5992DD",
+"P.	c #5993E1",
+"Q.	c #4069A0",
+"R.	c #365A8E",
+"S.	c #568EDF",
+"T.	c #548ADB",
+"U.	c #5489DB",
+"V.	c #5389DB",
+"W.	c #5287DA",
+"X.	c #2E4D7C",
+"Y.	c #4C7DC1",
+"Z.	c #5891DE",
+"`.	c #568FDC",
+" +	c #568EDC",
+".+	c #568DDC",
+"++	c #558CDC",
+"@+	c #4F82CD",
+"#+	c #4D7ECD",
+"$+	c #5185DA",
+"%+	c #5085DA",
+"&+	c #5084DA",
+"*+	c #4F82D9",
+"=+	c #5185DF",
+"-+	c #121E31",
+";+	c #4370C2",
+">+	c #4C7CD9",
+",+	c #4A7BD7",
+"'+	c #4A7AD7",
+")+	c #4978D7",
+"!+	c #4877D6",
+"~+	c #4E82D9",
+"{+	c #4E81D9",
+"]+	c #4E80D9",
+"^+	c #4E7FD9",
+"/+	c #4D7ED8",
+"(+	c #4C7DDA",
+"_+	c #395FA4",
+":+	c #4775D2",
+"<+	c #4876D6",
+"[+	c #4775D6",
+"}+	c #4773D6",
+"|+	c #4674D7",
+"1+	c #3B62B7",
+"2+	c #436ED6",
+"3+	c #416CD4",
+"4+	c #416AD3",
+"5+	c #4069D3",
+"6+	c #406AD6",
+"7+	c #304FA2",
+"8+	c #375BA8",
+"9+	c #4673D5",
+"0+	c #4572D5",
+"a+	c #4571D5",
+"b+	c #4470D5",
+"c+	c #436FD4",
+"d+	c #4470D9",
+"e+	c #14213E",
+"f+	c #3150A3",
+"g+	c #4069D4",
+"h+	c #3E67D3",
+"i+	c #3E66D2",
+"j+	c #3D64D2",
+"k+	c #3D64D3",
+"l+	c #243C7F",
+"m+	c #2F4DAC",
+"n+	c #395ED1",
+"o+	c #385CD0",
+"p+	c #375AD0",
+"q+	c #365ACF",
+"r+	c #375AD5",
+"s+	c #111C41",
+"t+	c #3558B8",
+"u+	c #3C63D2",
+"v+	c #3C62D2",
+"w+	c #3B61D1",
+"x+	c #3A60D2",
+"y+	c #3658C2",
+"z+	c #3455C4",
+"A+	c #3659CF",
+"B+	c #3557CF",
+"C+	c #3556CF",
+"D+	c #3354CF",
+"E+	c #3151C5",
+"F+	c #101A3E",
+"G+	c #2C49C0",
+"H+	c #2F4DCC",
+"I+	c #2E4CCC",
+"J+	c #2D4ACB",
+"K+	c #2D49CB",
+"L+	c #2741B7",
+"M+	c #3353C6",
+"N+	c #3455CF",
+"O+	c #3454CE",
+"P+	c #3353CE",
+"Q+	c #3252CD",
+"R+	c #3151CE",
+"S+	c #304FCC",
+"T+	c #162467",
+"U+	c #1F318C",
+"V+	c #2E4BCF",
+"W+	c #2C47CB",
+"X+	c #2B47CA",
+"Y+	c #2A45CA",
+"Z+	c #2943C8",
+"`+	c #2841C5",
+" @	c #2942CB",
+".@	c #2841CB",
+"+@	c #273EC9",
+"@@	c #263DC9",
+"#@	c #253BC8",
+"$@	c #243AC7",
+"%@	c #2339C9",
+"&@	c #172583",
+"*@	c #1D2F86",
+"=@	c #2D49CE",
+"-@	c #2B46CB",
+";@	c #2B46CA",
+">@	c #2A44CA",
+",@	c #2943CA",
+"'@	c #2841C9",
+")@	c #2740C9",
+"!@	c #2840CC",
+"~@	c #273FCA",
+"{@	c #263DCA",
+"]@	c #243AC8",
+"^@	c #2339C7",
+"/@	c #2338C7",
+"(@	c #2237C7",
+"_@	c #2135C6",
+":@	c #2034C6",
+"<@	c #2033C6",
+"[@	c #1E31C5",
+"}@	c #1E30C5",
+"|@	c #1D2EC4",
+"1@	c #1C2DC4",
+"2@	c #1B2CC4",
+"3@	c #1A2AC3",
+"4@	c #1928C0",
+"5@	c #0C1258",
+"6@	c #1B2C97",
+"7@	c #233AC9",
+"8@	c #2238C7",
+"9@	c #2136C7",
+"0@	c #1F32C6",
+"a@	c #1D2FC5",
+"b@	c #1C2EC5",
+"c@	c #1B2BC4",
+"d@	c #1A2AC4",
+"e@	c #1929C3",
+"f@	c #1827C3",
+"g@	c #1826C3",
+"h@	c #1724C2",
+"i@	c #1623C2",
+"j@	c #1522C1",
+"k@	c #1420C2",
+"l@	c #141FC2",
+"m@	c #121EC1",
+"n@	c #111CC2",
+"o@	c #111AC1",
+"p@	c #0E17B2",
+"q@	c #1A2AC1",
+"r@	c #1929C4",
+"s@	c #1927C4",
+"t@	c #1724C3",
+"u@	c #1623C3",
+"v@	c #1522C4",
+"w@	c #1520C3",
+"x@	c #131FC3",
+"y@	c #131DC3",
+"z@	c #111CC0",
+"A@	c #111ABB",
+"B@	c #0F19B6",
+"C@	c #0F17B1",
+"D@	c #0D15AD",
+"E@	c #0D14A9",
+"F@	c #0C13A7",
+"G@	c #0B11A4",
+"H@	c #0A1099",
+"I@	c #080D8B",
+"J@	c #070B7A",
+"K@	c #060968",
+"L@	c #0F179E",
+"M@	c #0E16AA",
+"N@	c #0E15AF",
+"O@	c #0C13A9",
+"P@	c #0C129C",
+"Q@	c #0A108F",
+"R@	c #090E80",
+"S@	c #080C72",
+"T@	c #070B63",
+"U@	c #060957",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                    . + @ # $   ",
+"                  % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ }   ",
+"              | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m   ",
+"            n o p q r s t u v w x y z A B C D E F G H I J K     ",
+"          L M N O P Q R S T U V W X Y Z `  .                    ",
+"          ..+.@.#.$.%.&.                                        ",
+"        *.=.-.;.>.,.'.).      !.~.{.].^.      /.(._.:.<.[.      ",
+"          }.|.1.2.3.        4.5.6.6.6.7.      [.6.6.6.8.9.      ",
+"                          0.8.6.6.6.6.a.    b.c.6.6.6.d.e.      ",
+"      f.g.h.i.j._.{.      k.l.6.6.6.l.m.    !.n.6.6.6.o.        ",
+"      p.l.6.6.6.q.r.      s.t.t.u.v.w.      x.y.z.A.B.C.        ",
+"      D.E.F.G.H.I.J.    K.L.M.N.O.P.Q.    R.S.T.U.V.W.X.        ",
+"    Y.Z.`. +.+++@+      #+$+%+&+*+=+-+    ;+>+,+'+)+!+          ",
+"    ~+{+]+^+/+(+_+      :+<+[+}+|+1+      2+3+4+5+6+7+          ",
+"  8+9+0+a+b+c+d+e+    f+g+h+i+j+k+l+    m+n+o+p+q+r+s+          ",
+"  t+j+u+v+w+x+y+      z+A+B+C+D+E+F+    G+H+I+J+K+L+            ",
+"  M+N+O+P+Q+R+S+T+  U+V+K+W+X+Y+Z+`+ @.@+@@@#@$@%@&@            ",
+"*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@            ",
+"6@7@8@9@_@:@0@[@a@b@1@c@d@e@f@g@h@i@j@k@l@m@n@o@p@              ",
+"  q@r@s@g@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@                  ",
+"    L@M@N@O@P@Q@R@S@T@U@                                        ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                "};
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -18,20 +18,19 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-IF(ENABLE_DOC)
+IF(ENABLE_MAN OR ENABLE_DOC)

  FIND_PACKAGE(Sourcehighlight)
  FIND_PACKAGE(Asciidoc)
-  IF(ASCIIDOC_FOUND AND SOURCEHIGHLIGHT_FOUND)
+  IF(ASCIIDOC_FOUND)
    ADD_SUBDIRECTORY( en )
    ADD_SUBDIRECTORY( fr )
-    ADD_SUBDIRECTORY( pl )
+    ADD_SUBDIRECTORY( it )
    ADD_SUBDIRECTORY( de )
+    ADD_SUBDIRECTORY( pl )
+    ADD_SUBDIRECTORY( es )
    ADD_SUBDIRECTORY( ru )
    ADD_SUBDIRECTORY( ja )
-    ADD_SUBDIRECTORY( it )
-  ENDIF(ASCIIDOC_FOUND AND SOURCEHIGHLIGHT_FOUND)
+  ENDIF(ASCIIDOC_FOUND)

-ENDIF(ENABLE_DOC)
-
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION ${SHAREDIR}/man/man1)
+ENDIF(ENABLE_MAN OR ENABLE_DOC)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -18,11 +18,9 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-SUBDIRS = . en fr pl de ru ja it
+SUBDIRS = . en fr it de pl es ru ja

-man_MANS = weechat-curses.1
-
-EXTRA_DIST = $(man_MANS) docgen.py CMakeLists.txt asciidoc.conf asciidoc.css
+EXTRA_DIST = docgen.py CMakeLists.txt asciidoc.conf asciidoc.css

 uninstall-hook:
 	-rmdir $(DESTDIR)$(datadir)/doc/$(PACKAGE)
@@ -6,7 +6,7 @@
@k\(S-\)=<span class="key shift">Shift</span><span class="keyplus">+</span>
@k\(-S-\)=<span class="key shift">Shift</span>
@k\(l\)=<span class="key">l</span><span class="keyplus"> (L)</span>
-@k\(([A-Za-z0-9_&\=])\)=<span class="key">\1</span>
-@k\(([a-z0-9_&\=][^)]*)\)=<span class="key">\1</span>
+@k\(([A-Za-z0-9/_&\=])\)=<span class="key">\1</span>
+@k\(([a-z0-9/_&\=][^)]*)\)=<span class="key">\1</span>
@k\(([^)]+)\)=<span class="key other">\1</span>
-
+@h\(([A-Za-z0-9]+)\)=<span class="hexa">\1</span>
@@ -1,67 +1,175 @@
 body {
-    margin: 1em 2em 1em 2em;
+  margin: 1em 2em;
+  font-family: verdana, sans-serif;
+  font-size: 12px;
 }
-div.sectionbody {
-    font-family: serif,Helvetica,arial;
+div.sectionbody, #author, #revnumber, #revdate, #revremark, #toctitle, #footer {
+  font-family: verdana, sans-serif;
+}
+a, a:visited, a:hover, a:active {
+  color: #00c;
+  text-decoration: none;
+}
+em {
+  color: #252;
+}
+strong {
+  color: #000;
+}
+tt {
+  color: #366;
+}
+#author {
+  color: #555;
+}
+#toc {
+  line-height: 1.4em;
+}
+#toctitle {
+  margin-bottom: .6em;
+  color: #555;
+}
+div.toclevel0, div.toclevel1 {
+  font-size: 1.1em;
+}
+div.toclevel2, div.toclevel3, div.toclevel4 {
+  font-size: 1em;
+}
+h1, h2, h3, h4, h5, h6 {
+  margin: 1.2em 0;
+}
+h1 {
+  padding: 1.2em;
+  border: solid 1px #c0d0ff;
+  border-radius: 8px;
+  box-shadow: 1px 1px 3px #aac;
+  background: #ddeaee;
+  background: -moz-linear-gradient(#bbddff, #eefaff);
+  background: -webkit-linear-gradient(#bbddff, #eefaff);
+  background: linear-gradient(#bbddff, #eefaff);
+  color: #224b8d;
+  font-size: 2.2em;
+  text-align: center;
+}
+h2 {
+  padding: .5em;
+  border: solid 1px #d0d0d0;
+  border-radius: 6px;
+  box-shadow: 1px 1px 2px #bbb;
+  background: #f2f2f2;
+  background: -moz-linear-gradient(#e0e0e0, #f6f6f6);
+  background: -webkit-linear-gradient(#e0e0e0, #f6f6f6);
+  background: linear-gradient(#e0e0e0, #f6f6f6);
+  color: #444;
+  font-size: 1.7em;
+}
+h3 {
+  border: none;
+  margin: .7em 0 1em 0;
+  color: #555;
+  font-size: 1.5em;
+}
+h4 {
+  color: #555;
+  font-size: 1.3em;
 }
 h5 {
-    font-size: 0.95em;
+  color: #555;
+  font-size: 1.2em;
 }
 span.command {
-    background: #EEEEFF;
-    border: solid 1px #BBBBDD;
-    padding: 0 8px 0 8px;
-    margin-right: 12px;
+  padding: .2em .5em;
+  border: solid 1px #ccc;
+  margin-right: 12px;
+  background: #eee;
+  font-size: 1.1em;
 }
 p.table {
-    margin-top: 0;
-    margin-bottom: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+div.listingblock > div.content {
+  border: solid 1px #e2e2e2;
+  border-radius: 4px;
+  background: #fbfbfb;
+}
+div.tableblock > table {
+  border: 2px solid #888;
+}
+table th {
+  background: #fbfbfb;
+  color: #000;
+  font-size: 1.1em;
+}
+.tableblock table th, .tableblock table td {
+  border: solid 1px #bbb;
+}
+div.title {
+  color: #525252;
+}
+div.admonitionblock .icon {
+  text-decoration: none;
+}
+dt.hdlist1 {
+  margin-bottom: .5em;
+  color: #252;
 }
 .key {
-    border-top: solid 1px #D5D5E5;
-    border-left: solid 1px #D5D5E5;
-    border-bottom: solid 1px #A5A5B5;
-    border-right: solid 1px #A5A5B5;
-    background-color: #EEEEFF;
-    padding: 0 0.3em 0 0.3em;
-    margin: 0 2px 0 2px;
+  padding: 0 .3em;
+  border-top: solid 1px #d5d5e5;
+  border-left: solid 1px #d5d5e5;
+  border-bottom: solid 1px #a5a5b5;
+  border-right: solid 1px #a5a5b5;
+  margin: 0 2px;
+  background: #eef;
+  font-family: serif, Helvetica, arial;
+  font-size: 1.1em;
+  line-height: 1.5em;
 }
 .key.ctrl {
-    font-size: 0.75em;
-    font-variant: small-caps;
-    border-top: solid 1px #DFD0D0;
-    border-left: solid 1px #DFD0D0;
-    border-bottom: solid 1px #AFA0A0;
-    border-right: solid 1px #AFA0A0;
-    background-color: #FFF0F0;
+  border-top: solid 1px #dfd0d0;
+  border-left: solid 1px #dfd0d0;
+  border-bottom: solid 1px #afa0a0;
+  border-right: solid 1px #afa0a0;
+  background: #fff0f0;
+  font-variant: small-caps;
 }
 .key.alt {
-    font-size: 0.75em;
-    font-variant: small-caps;
-    border-top: solid 1px #DFBBAB;
-    border-left: solid 1px #DFBBAB;
-    border-bottom: solid 1px #AF8B7B;
-    border-right: solid 1px #AF8B7B;
-    background-color: #FFDBCB;
+  border-top: solid 1px #dfbbab;
+  border-left: solid 1px #dfbbab;
+  border-bottom: solid 1px #af8b7b;
+  border-right: solid 1px #af8b7b;
+  background: #ffdbcb;
+  font-variant: small-caps;
 }
 .key.shift {
-    font-size: 0.75em;
-    font-variant: small-caps;
-    border-top: solid 1px #D5D5D5;
-    border-left: solid 1px #D5D5D5;
-    border-bottom: solid 1px #A5A5A5;
-    border-right: solid 1px #A5A5A5;
-    background-color: #F5F5F5;
+  border-top: solid 1px #d5d5d5;
+  border-left: solid 1px #d5d5d5;
+  border-bottom: solid 1px #a5a5a5;
+  border-right: solid 1px #a5a5a5;
+  background: #f5f5f5;
+  font-variant: small-caps;
 }
 .key.other {
-    font-size: 0.75em;
-    font-variant: small-caps;
-    border-top: solid 1px #D0E0D0;
-    border-left: solid 1px #D0E0D0;
-    border-bottom: solid 1px #A0B0A0;
-    border-right: solid 1px #A0B0A0;
-    background-color: #EAFAEA;
+  border-top: solid 1px #d0e0d0;
+  border-left: solid 1px #d0e0d0;
+  border-bottom: solid 1px #a0b0a0;
+  border-right: solid 1px #a0b0a0;
+  background: #eafaea;
+  font-variant: small-caps;
 }
 .keyplus {
-    font-size: 0.8em;
+  font-size: .8em;
+}
+.hexa {
+  padding: 0 .2em;
+  border: solid 1px #88b;
+  margin: 0 .2em;
+  color: #007;
+  font-family: monospace;
+  font-size: .85em;
+  font-variant: small-caps;
+}
+#footer {
+  border-top: 1px solid silver;
 }
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -17,58 +17,77 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-# user's guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
-  COMMENT "Building weechat_user.de.html"
-)
-ADD_CUSTOM_TARGET(doc-user-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+IF (ENABLE_MAN)
+  # man page
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
+    COMMAND ${A2X_EXECUTABLE} ARGS -a lang=de -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.txt
+    COMMENT "Building weechat.1 (de)"
+  )
+  ADD_CUSTOM_TARGET(doc-man-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/de/man1)
+ENDIF (ENABLE_MAN)

-# scripting guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
-  COMMENT "Building weechat_scripting.de.html"
-)
-ADD_CUSTOM_TARGET(doc-scripting-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+IF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)

-# FAQ
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
-  COMMENT "Building weechat_faq.de.html"
-)
-ADD_CUSTOM_TARGET(doc-faq-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # user's guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
+    COMMENT "Building weechat_user.de.html"
+  )
+  ADD_CUSTOM_TARGET(doc-user-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})

-# quickstart
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
-  COMMENT "Building weechat_quickstart.de.html"
-)
-ADD_CUSTOM_TARGET(doc-quickstart-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # scripting guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
+    COMMENT "Building weechat_scripting.de.html"
+  )
+  ADD_CUSTOM_TARGET(doc-scripting-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})

-# tester's guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
-  COMMENT "Building weechat_tester.de.html"
-)
-ADD_CUSTOM_TARGET(doc-tester-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # FAQ
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
+    COMMENT "Building weechat_faq.de.html"
+  )
+  ADD_CUSTOM_TARGET(doc-faq-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+  # quickstart
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
+    COMMENT "Building weechat_quickstart.de.html"
+  )
+  ADD_CUSTOM_TARGET(doc-quickstart-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+  # tester's guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
+    COMMENT "Building weechat_tester.de.html"
+  )
+  ADD_CUSTOM_TARGET(doc-tester-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+ENDIF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -21,6 +21,8 @@
 docdir = $(datadir)/doc/$(PACKAGE)

 EXTRA_DIST = CMakeLists.txt \
+             weechat.1.de.txt \
+             cmdline_options.de.txt \
             weechat_user.de.txt \
             weechat_scripting.de.txt \
             weechat_faq.de.txt \
@@ -28,15 +30,29 @@ EXTRA_DIST = CMakeLists.txt \
             weechat_tester.de.txt \
             $(wildcard autogen/user/*.txt)

-all-local: weechat_user.de.html \
+if MAN
+  man_targets = weechat.1
+  man_install = install-man
+  man_uninstall = uninstall-man
+endif
+if DOC
+  doc_targets = weechat_user.de.html \
 		weechat_scripting.de.html \
 		weechat_faq.de.html \
 		weechat_quickstart.de.html \
 		weechat_tester.de.html
+  doc_install = install-doc
+  doc_uninstall = uninstall-doc
+endif
+all-local: $(man_targets) $(doc_targets)
+
+# man page
+weechat.1: weechat.1.de.txt cmdline_options.de.txt
+	$(A2X) -a lang=de -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/de/weechat.1.de.txt

 # user's guide
-weechat_user.de.html: weechat_user.de.txt $(wildcard autogen/user/*.txt)
-	$(ASCIIDOC) -a lang=de -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.txt
+weechat_user.de.html: weechat_user.de.txt cmdline_options.de.txt $(wildcard autogen/user/*.txt)
+	$(ASCIIDOC) -a lang=de -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.txt

 # scripting guide
 weechat_scripting.de.html: weechat_scripting.de.txt
@@ -54,19 +70,32 @@ weechat_quickstart.de.html: weechat_quickstart.de.txt
 weechat_tester.de.html: weechat_tester.de.txt
 	$(ASCIIDOC) -a lang=de -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.txt

-# install docs
+# install man/docs

-install-data-hook:
+install-data-hook: $(man_install) $(doc_install)
+
+install-man:
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/de/man1/
+	$(INSTALL_DATA) *.1 $(DESTDIR)$(mandir)/de/man1/
+
+install-doc:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/
 	$(INSTALL_DATA) *.html $(DESTDIR)$(docdir)/

-# uninstall docs
+# uninstall man/docs

-uninstall-hook:
+uninstall-hook: $(man_uninstall) $(doc_uninstall)
+
+uninstall-man:
+	$(RM) $(DESTDIR)$(mandir)/de/man1/weechat.1
+	-rmdir $(DESTDIR)$(mandir)/de/man1
+
+uninstall-doc:
 	$(RM) $(DESTDIR)$(docdir)/*.de.html
 	-rmdir $(DESTDIR)$(docdir)

 # clean

 clean-local:
+	-rm -f weechat.1
 	-rm -f *.html
@@ -6,7 +6,11 @@

 | alias | alias_value | Wert von Alias

-| aspell | aspell_langs | Liste der Unterstützten Übersetzungen (lang) für Aspell
+| aspell | aspell_dicts | Auflistung der installierten Wörterbücher
+
+| aspell | aspell_langs | Liste aller Sprachen die durch Aspell unterstützt werden
+
+| guile | guile_script | Liste der Skripten

 | irc | irc_channel | Aktueller IRC-Channel

@@ -16,7 +20,7 @@

 | irc | irc_channels | Channels auf allen IRC Servern

-| irc | irc_ignores_numbers | Anzahl für festgelegte /ignores
+| irc | irc_ignores_numbers | Anzahl für festgelegte Ignorierungen

 | irc | irc_msg_part | Standardnachricht beim Verlassen (/part) eines IRC-Channels

@@ -38,23 +42,31 @@

 | irc | nick | Liste der Nicks im aktuellen Channel

-| lua | lua_script | Liste der Skripten:
+| lua | lua_script | Liste der Skripten

-| perl | perl_script | Liste der Skripten:
+| perl | perl_script | Liste der Skripten

-| python | python_script | Liste der Skripten:
+| python | python_script | Liste der Skripten

-| relay | relay_free_port | Erster freier Port für Relay-Erweiterung
+| relay | relay_free_port | erster freier Port für Relay-Erweiterung

-| relay | relay_protocol_name | Alle möglichen Protokoll.Namen der Relay-Erweiterung
+| relay | relay_protocol_name | alle möglichen Protokoll.Name der Relay-Erweiterung

 | relay | relay_relays | Protokoll.Name des aktuellen Relays von der Relay-Erweiterung

 | rmodifier | rmodifier | Liste der rmodifier

-| ruby | ruby_script | Liste der Skripten:
+| ruby | ruby_script | Liste der Skripten

-| tcl | tcl_script | Liste der Skripten:
+| script | script_files | Dateien die sich in den Skript-Verzeichnissen befinden
+
+| script | script_scripts | Liste der Skripten im Repositorium
+
+| script | script_scripts_installed | Auflistung der installierten Skripten (vom Repositorium)
+
+| script | script_tags | Schlagwortliste für Skripten im Repositorium
+
+| tcl | tcl_script | Liste der Skripten

 | weechat | bars_names | Namen der Infobars

@@ -68,7 +80,7 @@

 | weechat | buffers_numbers | Anzahl der Buffer

-| weechat | buffers_plugins_names | Liste der Buffer (inkl. der Erweiterungen)
+| weechat | buffers_plugins_names | Liste der Buffer (inklusive der Erweiterungen)

 | weechat | commands | Befehle (WeeChat und Erweiterungen)

@@ -78,15 +90,15 @@

 | weechat | config_options | Konfigurationsoptionen

-| weechat | cursor_areas | Bereiche  ("chat" oder Name einer Bar) in denen der Cursor frei bewegt werden kann
+| weechat | cursor_areas | Bereiche in denen der Cursor frei bewegt werden kann ("chat" oder Name einer Bar)

 | weechat | filename | Dateinamen

 | weechat | filters_names | Liste der Filter

-| weechat | infolists | Namem der ge-hook-ten Infolisten
+| weechat | infolists | Namen der gehookten Infolisten

-| weechat | infos | Namen der ge-hook-ten Infos
+| weechat | infos | Namen der gehookten Infos

 | weechat | keys_codes | Tastaturcodes

@@ -94,7 +106,9 @@

 | weechat | keys_contexts | Tastaturkontext

-| weechat | nicks | Nicks in Nickliste des aktuellen Buffers
+| weechat | layouts_names | Namen der Layouts
+
+| weechat | nicks | Nicks in Nickliste für aktuellen Buffer

 | weechat | palette_colors | Farbpalette

@@ -102,9 +116,11 @@

 | weechat | plugins_names | Liste der Erweiterungen

-| weechat | proxies_names | Namen der Proxies
+| weechat | proxies_names | Namen aller Proxys

-| weechat | proxies_options | Optionen für Proxies
+| weechat | proxies_options | Optionen für Proxys
+
+| weechat | secured_data | Namen der geschützten Daten (Datei sec.conf, section data)

 | weechat | weechat_commands | WeeChat Befehle

@@ -1,6 +1,40 @@
-[width="100%",cols="^1,^2,5,5,5",options="header"]
+[width="100%",cols="^1,^2,4,8,4,4",options="header"]
 |========================================
-| Erweiterung | Name | Beschreibung | Variablen | Listen
+| Erweiterung | Name | Beschreibung | Variablen | Update erlaubt | Listen
+
+| guile | guile_callback | Callback eines Skripts |
+  'script' (pointer, hdata: "guile_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "guile_callback") +
+  'next_callback' (pointer, hdata: "guile_callback") |
+ |
+  -
+
+| guile | guile_script | Liste der Skripten |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer, hdata: "guile_callback") +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "guile_script") +
+  'next_script' (pointer, hdata: "guile_script") |
+ |
+  'last_script' +
+  'scripts'

 | irc | irc_channel | IRC-Channel |
  'type' (integer) +
@@ -9,32 +43,35 @@
  'modes' (string) +
  'limit' (integer) +
  'key' (string) +
+  'join_msg_received' (hashtable) +
  'checking_away' (integer) +
  'away_message' (string) +
  'has_quit_server' (integer) +
  'cycle' (integer) +
  'part' (integer) +
-  'display_creation_date' (integer) +
  'nick_completion_reset' (integer) +
  'pv_remote_nick_color' (string) +
  'hook_autorejoin' (pointer) +
  'nicks_count' (integer) +
-  'nicks' (pointer, hdata: 'irc_nick') +
-  'last_nick' (pointer, hdata: 'irc_nick') +
+  'nicks' (pointer, hdata: "irc_nick") +
+  'last_nick' (pointer, hdata: "irc_nick") +
  'nicks_speaking' (pointer) +
-  'nicks_speaking_time' (pointer, hdata: 'irc_channel_speaking') +
-  'last_nick_speaking_time' (pointer, hdata: 'irc_channel_speaking') +
-  'buffer' (pointer, hdata: 'buffer') +
+  'nicks_speaking_time' (pointer, hdata: "irc_channel_speaking") +
+  'last_nick_speaking_time' (pointer, hdata: "irc_channel_speaking") +
+  'join_smart_filtered' (hashtable) +
+  'buffer' (pointer, hdata: "buffer") +
  'buffer_as_string' (string) +
-  'prev_channel' (pointer, hdata: 'irc_channel') +
-  'next_channel' (pointer, hdata: 'irc_channel') |
+  'prev_channel' (pointer, hdata: "irc_channel") +
+  'next_channel' (pointer, hdata: "irc_channel") |
+ |
  -

 | irc | irc_channel_speaking | IRC channel_speaking |
  'nick' (string) +
  'time_last_message' (time) +
-  'prev_nick' (pointer, hdata: 'irc_channel_speaking') +
-  'next_nick' (pointer, hdata: 'irc_channel_speaking') |
+  'prev_nick' (pointer, hdata: "irc_channel_speaking") +
+  'next_nick' (pointer, hdata: "irc_channel_speaking") |
+ |
  -

 | irc | irc_ignore | IRC ignorieren |
@@ -43,8 +80,9 @@
  'regex_mask' (pointer) +
  'server' (string) +
  'channel' (string) +
-  'prev_ignore' (pointer, hdata: 'irc_ignore') +
-  'next_ignore' (pointer, hdata: 'irc_ignore') |
+  'prev_ignore' (pointer, hdata: "irc_ignore") +
+  'next_ignore' (pointer, hdata: "irc_ignore") |
+ |
  'irc_ignore_list' +
  'last_irc_ignore'

@@ -55,23 +93,25 @@
  'prefix' (string) +
  'away' (integer) +
  'color' (string) +
-  'prev_nick' (pointer, hdata: 'irc_nick') +
-  'next_nick' (pointer, hdata: 'irc_nick') |
+  'prev_nick' (pointer, hdata: "irc_nick") +
+  'next_nick' (pointer, hdata: "irc_nick") |
+ |
  -

 | irc | irc_notify | IRC-Benachrichtigungen |
-  'server' (pointer, hdata: 'irc_server') +
+  'server' (pointer, hdata: "irc_server") +
  'nick' (string) +
  'check_away' (integer) +
  'is_on_server' (integer) +
  'away_message' (string) +
  'ison_received' (integer) +
-  'prev_notify' (pointer, hdata: 'irc_notify') +
-  'next_notify' (pointer, hdata: 'irc_notify') |
+  'prev_notify' (pointer, hdata: "irc_notify") +
+  'next_notify' (pointer, hdata: "irc_notify") |
+ |
  -

-| irc | irc_redirect | IRC Umlenkung |
-  'server' (pointer, hdata: 'irc_server') +
+| irc | irc_redirect | IRC Weiterleitung |
+  'server' (pointer, hdata: "irc_server") +
  'pattern' (string) +
  'signal' (string) +
  'count' (integer) +
@@ -79,28 +119,31 @@
  'string' (string) +
  'timeout' (integer) +
  'command' (string) +
+  'assigned_to_command' (integer) +
  'start_time' (time) +
-  'cmd_start' (pointer) +
-  'cmd_stop' (pointer) +
-  'cmd_extra' (pointer) +
+  'cmd_start' (hashtable) +
+  'cmd_stop' (hashtable) +
+  'cmd_extra' (hashtable) +
  'cmd_start_received' (integer) +
  'cmd_stop_received' (integer) +
-  'cmd_filter' (pointer) +
+  'cmd_filter' (hashtable) +
  'output' (string) +
  'output_size' (integer) +
-  'prev_redirect' (pointer, hdata: 'irc_redirect') +
-  'next_redirect' (pointer, hdata: 'irc_redirect') |
+  'prev_redirect' (pointer, hdata: "irc_redirect") +
+  'next_redirect' (pointer, hdata: "irc_redirect") |
+ |
  -

-| irc | irc_redirect_pattern | Muster für IRC Umlenkung |
+| irc | irc_redirect_pattern | Muster für IRC Weiterleitung |
  'name' (string) +
  'temp_pattern' (integer) +
  'timeout' (integer) +
  'cmd_start' (string) +
  'cmd_stop' (string) +
  'cmd_extra' (string) +
-  'prev_redirect' (pointer, hdata: 'irc_redirect_pattern') +
-  'next_redirect' (pointer, hdata: 'irc_redirect_pattern') |
+  'prev_redirect' (pointer, hdata: "irc_redirect_pattern") +
+  'next_redirect' (pointer, hdata: "irc_redirect_pattern") |
+ |
  'irc_redirect_patterns' +
  'last_irc_redirect_pattern'

@@ -111,32 +154,39 @@
  'reloading_from_config' (integer) +
  'reloaded_from_config' (integer) +
  'addresses_count' (integer) +
-  'addresses_array' (pointer) +
-  'ports_array' (pointer) +
+  'addresses_array' (string, array_size: "addresses_count") +
+  'ports_array' (integer, array_size: "addresses_count") +
+  'retry_array' (integer, array_size: "addresses_count") +
  'index_current_address' (integer) +
  'current_address' (string) +
  'current_ip' (string) +
  'current_port' (integer) +
+  'current_retry' (integer) +
  'sock' (integer) +
-  'hook_connect' (pointer, hdata: 'hook') +
-  'hook_fd' (pointer, hdata: 'hook') +
-  'hook_timer_connection' (pointer, hdata: 'hook') +
-  'hook_timer_sasl' (pointer, hdata: 'hook') +
+  'hook_connect' (pointer, hdata: "hook") +
+  'hook_fd' (pointer, hdata: "hook") +
+  'hook_timer_connection' (pointer, hdata: "hook") +
+  'hook_timer_sasl' (pointer, hdata: "hook") +
  'is_connected' (integer) +
  'ssl_connected' (integer) +
+  'disconnected' (integer) +
  'gnutls_sess' (other) +
  'tls_cert' (other) +
  'tls_cert_key' (other) +
  'unterminated_message' (string) +
  'nicks_count' (integer) +
-  'nicks_array' (pointer) +
+  'nicks_array' (string, array_size: "nicks_count") +
  'nick_first_tried' (integer) +
+  'nick_alternate_number' (integer) +
  'nick' (string) +
  'nick_modes' (string) +
  'isupport' (string) +
  'prefix_modes' (string) +
  'prefix_chars' (string) +
  'nick_max_length' (integer) +
+  'casemapping' (integer) +
+  'chantypes' (string) +
+  'chanmodes' (string) +
  'reconnect_delay' (integer) +
  'reconnect_start' (time) +
  'command_time' (time) +
@@ -152,52 +202,255 @@
  'cmd_list_regexp' (pointer) +
  'last_user_message' (time) +
  'last_away_check' (time) +
+  'last_data_purge' (time) +
  'outqueue' (pointer) +
  'last_outqueue' (pointer) +
-  'redirects' (pointer, hdata: 'irc_redirect') +
-  'last_redirect' (pointer, hdata: 'irc_redirect') +
-  'notify_list' (pointer, hdata: 'irc_notify') +
-  'last_notify' (pointer, hdata: 'irc_notify') +
-  'manual_joins' (pointer) +
-  'buffer' (pointer, hdata: 'buffer') +
+  'redirects' (pointer, hdata: "irc_redirect") +
+  'last_redirect' (pointer, hdata: "irc_redirect") +
+  'notify_list' (pointer, hdata: "irc_notify") +
+  'last_notify' (pointer, hdata: "irc_notify") +
+  'join_manual' (hashtable) +
+  'join_channel_key' (hashtable) +
+  'join_noswitch' (hashtable) +
+  'buffer' (pointer, hdata: "buffer") +
  'buffer_as_string' (string) +
-  'channels' (pointer, hdata: 'irc_channel') +
-  'last_channel' (pointer, hdata: 'irc_channel') +
-  'prev_server' (pointer, hdata: 'irc_server') +
-  'next_server' (pointer, hdata: 'irc_server') |
+  'channels' (pointer, hdata: "irc_channel") +
+  'last_channel' (pointer, hdata: "irc_channel") +
+  'prev_server' (pointer, hdata: "irc_server") +
+  'next_server' (pointer, hdata: "irc_server") |
+ |
  'irc_servers' +
  'last_irc_server'

+| lua | lua_callback | Callback eines Skripts |
+  'script' (pointer, hdata: "lua_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "lua_callback") +
+  'next_callback' (pointer, hdata: "lua_callback") |
+ |
+  -
+
+| lua | lua_script | Liste der Skripten |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer, hdata: "lua_callback") +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "lua_script") +
+  'next_script' (pointer, hdata: "lua_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| perl | perl_callback | Callback eines Skripts |
+  'script' (pointer, hdata: "perl_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "perl_callback") +
+  'next_callback' (pointer, hdata: "perl_callback") |
+ |
+  -
+
+| perl | perl_script | Liste der Skripten |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer, hdata: "perl_callback") +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "perl_script") +
+  'next_script' (pointer, hdata: "perl_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| python | python_callback | Callback eines Skripts |
+  'script' (pointer, hdata: "python_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "python_callback") +
+  'next_callback' (pointer, hdata: "python_callback") |
+ |
+  -
+
+| python | python_script | Liste der Skripten |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer, hdata: "python_callback") +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "python_script") +
+  'next_script' (pointer, hdata: "python_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| ruby | ruby_callback | Callback eines Skripts |
+  'script' (pointer, hdata: "ruby_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "ruby_callback") +
+  'next_callback' (pointer, hdata: "ruby_callback") |
+ |
+  -
+
+| ruby | ruby_script | Liste der Skripten |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer, hdata: "ruby_callback") +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "ruby_script") +
+  'next_script' (pointer, hdata: "ruby_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| script | script_script | Skripten aus dem Repositorium |
+  'name' (string) +
+  'name_with_extension' (string) +
+  'language' (integer) +
+  'author' (string) +
+  'mail' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'tags' (string) +
+  'requirements' (string) +
+  'min_weechat' (string) +
+  'max_weechat' (string) +
+  'md5sum' (string) +
+  'url' (string) +
+  'popularity' (integer) +
+  'date_added' (time) +
+  'date_updated' (time) +
+  'status' (integer) +
+  'version_loaded' (string) +
+  'displayed' (integer) +
+  'install_order' (integer) +
+  'prev_script' (pointer, hdata: "script_script") +
+  'next_script' (pointer, hdata: "script_script") |
+ |
+  'last_script_repo' +
+  'scripts_repo'
+
+| tcl | tcl_callback | Callback eines Skripts |
+  'script' (pointer, hdata: "tcl_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "tcl_callback") +
+  'next_callback' (pointer, hdata: "tcl_callback") |
+ |
+  -
+
+| tcl | tcl_script | Liste der Skripten |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer, hdata: "tcl_callback") +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "tcl_script") +
+  'next_script' (pointer, hdata: "tcl_script") |
+ |
+  'last_script' +
+  'scripts'
+
 | weechat | bar | Bar |
  'name' (string) +
  'options' (pointer) +
-  'conditions_count' (integer) +
-  'conditions_array' (pointer) +
  'items_count' (integer) +
  'items_subcount' (pointer) +
  'items_array' (pointer) +
+  'items_buffer' (pointer) +
  'items_prefix' (pointer) +
  'items_name' (pointer) +
  'items_suffix' (pointer) +
-  'bar_window' (pointer, hdata: 'bar_window') +
+  'bar_window' (pointer, hdata: "bar_window") +
  'bar_refresh_needed' (integer) +
-  'prev_bar' (pointer, hdata: 'bar') +
-  'next_bar' (pointer, hdata: 'bar') |
+  'prev_bar' (pointer, hdata: "bar") +
+  'next_bar' (pointer, hdata: "bar") |
+ |
  'gui_bars' +
  'last_gui_bar'

 | weechat | bar_item | Bar-Item |
-  'plugin' (pointer, hdata: 'plugin') +
+  'plugin' (pointer, hdata: "plugin") +
  'name' (string) +
  'build_callback' (pointer) +
  'build_callback_data' (pointer) +
-  'prev_item' (pointer, hdata: 'bar_item') +
-  'next_item' (pointer, hdata: 'bar_item') |
+  'prev_item' (pointer, hdata: "bar_item") +
+  'next_item' (pointer, hdata: "bar_item") |
+ |
  'gui_bar_items' +
  'last_gui_bar_item'

 | weechat | bar_window | Bar-Fenster |
-  'bar' (pointer, hdata: 'bar') +
+  'bar' (pointer, hdata: "bar") +
  'x' (integer) +
  'y' (integer) +
  'width' (integer) +
@@ -213,20 +466,23 @@
  'items_num_lines' (pointer) +
  'items_refresh_needed' (pointer) +
  'screen_col_size' (integer) +
+  'screen_lines' (integer) +
  'coords_count' (integer) +
  'coords' (pointer) +
  'gui_objects' (pointer) +
-  'prev_bar_window' (pointer, hdata: 'bar_window') +
-  'next_bar_window' (pointer, hdata: 'bar_window') |
+  'prev_bar_window' (pointer, hdata: "bar_window") +
+  'next_bar_window' (pointer, hdata: "bar_window") |
+ |
  -

 | weechat | buffer | Buffer |
-  'plugin' (pointer, hdata: 'plugin') +
+  'plugin' (pointer, hdata: "plugin") +
  'plugin_name_for_upgrade' (string) +
  'number' (integer) +
  'layout_number' (integer) +
  'layout_number_merge_order' (integer) +
  'name' (string) +
+  'full_name' (string) +
  'short_name' (string) +
  'type' (integer) +
  'notify' (integer) +
@@ -236,17 +492,22 @@
  'close_callback' (pointer) +
  'close_callback_data' (pointer) +
  'title' (string) +
-  'own_lines' (pointer, hdata: 'lines') +
-  'mixed_lines' (pointer, hdata: 'lines') +
-  'lines' (pointer, hdata: 'lines') +
+  'own_lines' (pointer, hdata: "lines") +
+  'mixed_lines' (pointer, hdata: "lines") +
+  'lines' (pointer, hdata: "lines") +
  'time_for_each_line' (integer) +
  'chat_refresh_needed' (integer) +
  'nicklist' (integer) +
  'nicklist_case_sensitive' (integer) +
-  'nicklist_root' (pointer, hdata: 'nick_group') +
+  'nicklist_root' (pointer, hdata: "nick_group") +
  'nicklist_max_length' (integer) +
  'nicklist_display_groups' (integer) +
+  'nicklist_count' (integer) +
+  'nicklist_groups_count' (integer) +
+  'nicklist_nicks_count' (integer) +
  'nicklist_visible_count' (integer) +
+  'nickcmp_callback' (pointer) +
+  'nickcmp_callback_data' (pointer) +
  'input' (integer) +
  'input_callback' (pointer) +
  'input_callback_data' (pointer) +
@@ -257,18 +518,21 @@
  'input_buffer_length' (integer) +
  'input_buffer_pos' (integer) +
  'input_buffer_1st_display' (integer) +
-  'input_undo_snap' (pointer, hdata: 'input_undo') +
-  'input_undo' (pointer, hdata: 'input_undo') +
-  'last_input_undo' (pointer, hdata: 'input_undo') +
-  'ptr_input_undo' (pointer, hdata: 'input_undo') +
+  'input_undo_snap' (pointer, hdata: "input_undo") +
+  'input_undo' (pointer, hdata: "input_undo") +
+  'last_input_undo' (pointer, hdata: "input_undo") +
+  'ptr_input_undo' (pointer, hdata: "input_undo") +
  'input_undo_count' (integer) +
-  'completion' (pointer, hdata: 'completion') +
-  'history' (pointer, hdata: 'history') +
-  'last_history' (pointer, hdata: 'history') +
-  'ptr_history' (pointer, hdata: 'history') +
+  'completion' (pointer, hdata: "completion") +
+  'history' (pointer, hdata: "history") +
+  'last_history' (pointer, hdata: "history") +
+  'ptr_history' (pointer, hdata: "history") +
  'num_history' (integer) +
  'text_search' (integer) +
  'text_search_exact' (integer) +
+  'text_search_regex' (integer) +
+  'text_search_regex_compiled' (pointer) +
+  'text_search_where' (integer) +
  'text_search_found' (integer) +
  'text_search_input' (string) +
  'highlight_words' (string) +
@@ -276,19 +540,21 @@
  'highlight_regex_compiled' (pointer) +
  'highlight_tags' (string) +
  'highlight_tags_count' (integer) +
-  'highlight_tags_array' (pointer) +
-  'hotlist_max_level_nicks' (pointer) +
-  'keys' (pointer, hdata: 'key') +
-  'last_key' (pointer, hdata: 'key') +
+  'highlight_tags_array' (string, array_size: "highlight_tags_count") +
+  'hotlist_max_level_nicks' (hashtable) +
+  'keys' (pointer, hdata: "key") +
+  'last_key' (pointer, hdata: "key") +
  'keys_count' (integer) +
-  'local_variables' (pointer) +
-  'prev_buffer' (pointer, hdata: 'buffer') +
-  'next_buffer' (pointer, hdata: 'buffer') |
+  'local_variables' (hashtable) +
+  'prev_buffer' (pointer, hdata: "buffer") +
+  'next_buffer' (pointer, hdata: "buffer") |
+ |
+  'gui_buffer_last_displayed' +
  'gui_buffers' +
  'last_gui_buffer'

 | weechat | completion | Struktur mit Vervollständigung |
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'context' (integer) +
  'base_command' (string) +
  'base_command_arg_index' (integer) +
@@ -305,38 +571,41 @@
  'position_replace' (integer) +
  'diff_size' (integer) +
  'diff_length' (integer) +
-  'partial_completion_list' (pointer, hdata: 'completion_partial') +
-  'last_partial_completion' (pointer, hdata: 'completion_partial') |
+  'partial_completion_list' (pointer, hdata: "completion_partial") +
+  'last_partial_completion' (pointer, hdata: "completion_partial") |
+ |
  -

 | weechat | completion_partial | Struktur mit teilweise Vervollständigung |
  'word' (string) +
  'count' (integer) +
-  'prev_item' (pointer, hdata: 'completion_partial') +
-  'next_item' (pointer, hdata: 'completion_partial') |
+  'prev_item' (pointer, hdata: "completion_partial") +
+  'next_item' (pointer, hdata: "completion_partial") |
+ |
  -

 | weechat | config_file | Konfigurationsdatei |
-  'plugin' (pointer, hdata: 'plugin') +
+  'plugin' (pointer, hdata: "plugin") +
  'name' (string) +
  'filename' (string) +
  'file' (pointer) +
  'callback_reload' (pointer) +
  'callback_reload_data' (pointer) +
-  'sections' (pointer, hdata: 'config_section') +
-  'last_section' (pointer, hdata: 'config_section') +
-  'prev_config' (pointer, hdata: 'config_file') +
-  'next_config' (pointer, hdata: 'config_file') |
+  'sections' (pointer, hdata: "config_section") +
+  'last_section' (pointer, hdata: "config_section") +
+  'prev_config' (pointer, hdata: "config_file") +
+  'next_config' (pointer, hdata: "config_file") |
+ |
  'config_files' +
  'last_config_file'

 | weechat | config_option | Konfigurationsoptionen |
-  'config_file' (pointer, hdata: 'config_file') +
-  'section' (pointer, hdata: 'config_section') +
+  'config_file' (pointer, hdata: "config_file") +
+  'section' (pointer, hdata: "config_section") +
  'name' (string) +
  'type' (integer) +
  'description' (string) +
-  'string_values' (pointer) +
+  'string_values' (string, array_size: "*") +
  'min' (integer) +
  'max' (integer) +
  'default_value' (pointer) +
@@ -349,12 +618,13 @@
  'callback_delete' (pointer) +
  'callback_delete_data' (pointer) +
  'loaded' (integer) +
-  'prev_option' (pointer, hdata: 'config_option') +
-  'next_option' (pointer, hdata: 'config_option') |
+  'prev_option' (pointer, hdata: "config_option") +
+  'next_option' (pointer, hdata: "config_option") |
+ |
  -

 | weechat | config_section | Konfigurationssektion |
-  'config_file' (pointer, hdata: 'config_file') +
+  'config_file' (pointer, hdata: "config_file") +
  'name' (string) +
  'user_can_add_options' (integer) +
  'user_can_delete_options' (integer) +
@@ -368,10 +638,11 @@
  'callback_create_option_data' (pointer) +
  'callback_delete_option' (pointer) +
  'callback_delete_option_data' (pointer) +
-  'options' (pointer, hdata: 'config_option') +
-  'last_option' (pointer, hdata: 'config_option') +
-  'prev_section' (pointer, hdata: 'config_section') +
-  'next_section' (pointer, hdata: 'config_section') |
+  'options' (pointer, hdata: "config_option") +
+  'last_option' (pointer, hdata: "config_option") +
+  'prev_section' (pointer, hdata: "config_section") +
+  'next_section' (pointer, hdata: "config_section") |
+ |
  -

 | weechat | filter | Filter |
@@ -382,26 +653,43 @@
  'buffers' (pointer) +
  'tags' (string) +
  'tags_count' (integer) +
-  'tags_array' (pointer) +
+  'tags_array' (string, array_size: "tags_count") +
  'regex' (string) +
  'regex_prefix' (pointer) +
  'regex_message' (pointer) +
-  'prev_filter' (pointer, hdata: 'filter') +
-  'next_filter' (pointer, hdata: 'filter') |
+  'prev_filter' (pointer, hdata: "filter") +
+  'next_filter' (pointer, hdata: "filter") |
+ |
  'gui_filters' +
  'last_gui_filter'

 | weechat | history | Verlaufspeicher von Befehlen in einem Buffer |
  'text' (string) +
-  'next_history' (pointer, hdata: 'history') +
-  'prev_history' (pointer, hdata: 'history') |
-  -
+  'next_history' (pointer, hdata: "history") +
+  'prev_history' (pointer, hdata: "history") |
+  `__create` +
+  `__delete` |
+  'gui_history' +
+  'last_gui_history'
+
+| weechat | hotlist | Hotliste |
+  'priority' (integer) +
+  'creation_time.tv_sec' (time) +
+  'creation_time.tv_usec' (long) +
+  'buffer' (pointer) +
+  'count' (integer, array_size: "4") +
+  'prev_hotlist' (pointer, hdata: "hotlist") +
+  'next_hotlist' (pointer, hdata: "hotlist") |
+ |
+  'gui_hotlist' +
+  'last_gui_hotlist'

 | weechat | input_undo | Struktur der Rücknahmen für die Befehlszeile |
  'data' (string) +
  'pos' (integer) +
-  'prev_undo' (pointer, hdata: 'input_undo') +
-  'next_undo' (pointer, hdata: 'input_undo') |
+  'prev_undo' (pointer, hdata: "input_undo") +
+  'next_undo' (pointer, hdata: "input_undo") |
+ |
  -

 | weechat | key | Tastenbelegung (Tastaturkurzbefehl) |
@@ -410,8 +698,10 @@
  'area_name' (pointer) +
  'area_key' (string) +
  'command' (string) +
-  'prev_key' (pointer, hdata: 'key') +
-  'next_key' (pointer, hdata: 'key') |
+  'score' (integer) +
+  'prev_key' (pointer, hdata: "key") +
+  'next_key' (pointer, hdata: "key") |
+ |
  'gui_default_keys' +
  'gui_default_keys_cursor' +
  'gui_default_keys_mouse' +
@@ -429,48 +719,93 @@
  'last_gui_key_mouse' +
  'last_gui_key_search'

+| weechat | layout | Layout |
+  'name' (string) +
+  'layout_buffers' (pointer, hdata: "layout_buffer") +
+  'last_layout_buffer' (pointer, hdata: "layout_buffer") +
+  'layout_windows' (pointer, hdata: "layout_window") +
+  'internal_id' (integer) +
+  'internal_id_current_window' (integer) +
+  'prev_layout' (pointer, hdata: "layout") +
+  'next_layout' (pointer, hdata: "layout") |
+ |
+  'gui_layout_current' +
+  'gui_layouts' +
+  'last_gui_layout'
+
+| weechat | layout_buffer | Buffer-Layout |
+  'plugin_name' (string) +
+  'buffer_name' (string) +
+  'number' (integer) +
+  'prev_layout' (pointer, hdata: "layout_buffer") +
+  'next_layout' (pointer, hdata: "layout_buffer") |
+ |
+  -
+
+| weechat | layout_window | Fenster-Layout |
+  'internal_id' (integer) +
+  'parent_node' (pointer, hdata: "layout_window") +
+  'split_pct' (integer) +
+  'split_horiz' (integer) +
+  'child1' (pointer, hdata: "layout_window") +
+  'child2' (pointer, hdata: "layout_window") +
+  'plugin_name' (string) +
+  'buffer_name' (string) |
+ |
+  -
+
 | weechat | line | Struktur mit einer Zeile |
-  'data' (pointer, hdata: 'line_data') +
-  'prev_line' (pointer, hdata: 'line') +
-  'next_line' (pointer, hdata: 'line') |
+  'data' (pointer, hdata: "line_data") +
+  'prev_line' (pointer, hdata: "line") +
+  'next_line' (pointer, hdata: "line") |
+ |
  -

 | weechat | line_data | Struktur mit einzeiligen Daten |
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'y' (integer) +
  'date' (time) +
  'date_printed' (time) +
  'str_time' (string) +
  'tags_count' (integer) +
-  'tags_array' (pointer) +
-  'displayed' (integer) +
-  'highlight' (integer) +
-  'refresh_needed' (integer) +
+  'tags_array' (string, array_size: "tags_count") +
+  'displayed' (char) +
+  'highlight' (char) +
+  'refresh_needed' (char) +
  'prefix' (string) +
  'prefix_length' (integer) +
  'message' (string) |
+  'date' (time) +
+  'date_printed' (time) +
+  'tags_array' (string) +
+  'prefix' (string) +
+  'message' (string) |
  -

 | weechat | lines | Struktur mit Zeilen |
-  'first_line' (pointer, hdata: 'line') +
-  'last_line' (pointer, hdata: 'line') +
-  'last_read_line' (pointer, hdata: 'line') +
+  'first_line' (pointer, hdata: "line") +
+  'last_line' (pointer, hdata: "line") +
+  'last_read_line' (pointer, hdata: "line") +
  'lines_count' (integer) +
  'first_line_not_read' (integer) +
  'lines_hidden' (integer) +
  'buffer_max_length' (integer) +
-  'prefix_max_length' (integer) |
+  'buffer_max_length_refresh' (integer) +
+  'prefix_max_length' (integer) +
+  'prefix_max_length_refresh' (integer) |
+ |
  -

 | weechat | nick | Nick in Nickliste |
-  'group' (pointer, hdata: 'nick_group') +
+  'group' (pointer, hdata: "nick_group") +
  'name' (string) +
  'color' (string) +
  'prefix' (string) +
  'prefix_color' (string) +
  'visible' (integer) +
-  'prev_nick' (pointer, hdata: 'nick') +
-  'next_nick' (pointer, hdata: 'nick') |
+  'prev_nick' (pointer, hdata: "nick") +
+  'next_nick' (pointer, hdata: "nick") |
+ |
  -

 | weechat | nick_group | Gruppen in Nickliste |
@@ -478,13 +813,14 @@
  'color' (string) +
  'visible' (integer) +
  'level' (integer) +
-  'parent' (pointer, hdata: 'nick_group') +
-  'childs' (pointer, hdata: 'nick_group') +
-  'last_child' (pointer, hdata: 'nick_group') +
-  'nicks' (pointer, hdata: 'nick') +
-  'last_nick' (pointer, hdata: 'nick') +
-  'prev_group' (pointer, hdata: 'nick_group') +
-  'next_group' (pointer, hdata: 'nick_group') |
+  'parent' (pointer, hdata: "nick_group") +
+  'children' (pointer, hdata: "nick_group") +
+  'last_child' (pointer, hdata: "nick_group") +
+  'nicks' (pointer, hdata: "nick") +
+  'last_nick' (pointer, hdata: "nick") +
+  'prev_group' (pointer, hdata: "nick_group") +
+  'next_group' (pointer, hdata: "nick_group") |
+ |
  -

 | weechat | plugin | Erweiterung |
@@ -497,11 +833,21 @@
  'license' (string) +
  'charset' (string) +
  'debug' (integer) +
-  'prev_plugin' (pointer, hdata: 'plugin') +
-  'next_plugin' (pointer, hdata: 'plugin') |
+  'prev_plugin' (pointer, hdata: "plugin") +
+  'next_plugin' (pointer, hdata: "plugin") |
+ |
  'last_weechat_plugin' +
  'weechat_plugins'

+| weechat | proxy | Proxy |
+  'name' (string) +
+  'options' (pointer) +
+  'prev_proxy' (pointer, hdata: "proxy") +
+  'next_proxy' (pointer, hdata: "proxy") |
+ |
+  'last_weechat_proxy' +
+  'weechat_proxies'
+
 | weechat | window | Fenster |
  'number' (integer) +
  'win_x' (integer) +
@@ -516,41 +862,43 @@
  'win_chat_height' (integer) +
  'win_chat_cursor_x' (integer) +
  'win_chat_cursor_y' (integer) +
-  'bar_windows' (pointer, hdata: 'bar_window') +
-  'last_bar_window' (pointer, hdata: 'bar_window') +
+  'bar_windows' (pointer, hdata: "bar_window") +
+  'last_bar_window' (pointer, hdata: "bar_window") +
  'refresh_needed' (integer) +
  'gui_objects' (pointer) +
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'layout_plugin_name' (string) +
  'layout_buffer_name' (string) +
-  'scroll' (pointer, hdata: 'window_scroll') +
-  'ptr_tree' (pointer, hdata: 'window_tree') +
-  'prev_window' (pointer, hdata: 'window') +
-  'next_window' (pointer, hdata: 'window') |
+  'scroll' (pointer, hdata: "window_scroll") +
+  'ptr_tree' (pointer, hdata: "window_tree") +
+  'prev_window' (pointer, hdata: "window") +
+  'next_window' (pointer, hdata: "window") |
+ |
  'gui_current_window' +
  'gui_windows' +
  'last_gui_window'

 | weechat | window_scroll | Scroll-Info in Fenstern |
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'first_line_displayed' (integer) +
-  'start_line' (pointer, hdata: 'line') +
+  'start_line' (pointer, hdata: "line") +
  'start_line_pos' (integer) +
  'scrolling' (integer) +
  'start_col' (integer) +
  'lines_after' (integer) +
-  'reset_allowed' (integer) +
-  'prev_scroll' (pointer, hdata: 'window_scroll') +
-  'next_scroll' (pointer, hdata: 'window_scroll') |
+  'prev_scroll' (pointer, hdata: "window_scroll") +
+  'next_scroll' (pointer, hdata: "window_scroll") |
+ |
  -

 | weechat | window_tree | Baumstruktur der Fenster |
-  'parent_node' (pointer, hdata: 'window_tree') +
+  'parent_node' (pointer, hdata: "window_tree") +
  'split_pct' (integer) +
  'split_horizontal' (integer) +
-  'child1' (pointer, hdata: 'window_tree') +
-  'child2' (pointer, hdata: 'window_tree') +
-  'window' (pointer, hdata: 'window') |
+  'child1' (pointer, hdata: "window_tree") +
+  'child2' (pointer, hdata: "window_tree") +
+  'window' (pointer, hdata: "window") |
+ |
  'gui_windows_tree'

 |========================================
@@ -4,6 +4,8 @@

 | alias | alias | Liste der Alias | Alias Pointer (optional) | Alias Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

+| guile | guile_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+
 | irc | irc_channel | Liste der Channels eines IRC-Servers | Channel Pointer (optional) | Server,Channel (Channel ist optional)

 | irc | irc_ignore | Liste von ignorierten IRCs | Ignore Pointer (optional) | -
@@ -14,50 +16,58 @@

 | irc | irc_server | Liste der IRC-Server | Server Pointer (optional) | Servername (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

-| logger | logger_buffer | Liste der protokollierten Buffer | Logger Pointer (optional) | -
+| logger | logger_buffer | Auflistung der protokollierten Buffer | Logger Pointer (optional) | -

-| lua | lua_script | Liste der Skripten: | Skript Pointer (optional) | Name des Skripts (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| lua | lua_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

-| perl | perl_script | Liste der Skripten: | Skript Pointer (optional) | Name des Skripts (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| perl | perl_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

-| python | python_script | Liste der Skripten: | Skript Pointer (optional) | Name des Skripts (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| python | python_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

 | relay | relay | Liste der Relay-Clients | Relay Pointer (optional) | -

 | rmodifier | rmodifier | Liste der rmodifier | rmodifier Pointer (optional) | rmodifier Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

-| ruby | ruby_script | Liste der Skripten: | Skript Pointer (optional) | Name des Skripts (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| ruby | ruby_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

-| tcl | tcl_script | Liste der Skripten: | Skript Pointer (optional) | Name des Skripts (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| script | script_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes, mit Dateierweiterung (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+
+| tcl | tcl_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

 | weechat | bar | Auflistung der Bars | Bar Pointer (optional) | Bar Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

-| weechat | bar_item | Liste der Bar-Items | Bar Item Pointer (optional) | Bar-Item Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | bar_item | Auflistung der Bar-Items | Bar Item Pointer (optional) | Bar-Item Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

-| weechat | bar_window | Liste der Bar-Fenster | Bar-Fenster Pointer (optional) | -
+| weechat | bar_window | Auflistung der Bar-Fenster | Bar-Fenster Pointer (optional) | -

-| weechat | buffer | Liste der Buffer | Buffer Pointer (optional) | Name des Buffers (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | buffer | Auflistung der Buffer | Buffer Pointer (optional) | Name des Buffers (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

 | weechat | buffer_lines | Zeilen des Buffers | Buffer Pointer | -

-| weechat | filter | Liste der Filter | - | Name des Filters (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | filter | Auflistung der Filter | - | Name des Filters (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

 | weechat | history | Verlaufspeicher der Befehle | Buffer Pointer (falls nicht gesetzt, wird der globale Verlauf zurückgegeben) (optional) | -

-| weechat | hook | Auflistung der Hooks | - | type,arguments (type ist ein command/timer/.., arguments dient dazu nur einige hooks abzufragen (darf mit einem "*" als Platzhalter beginnen oder enden), beide Optionen sind optional)
+| weechat | hook | Auflistung der Hooks | Hook-Pointer (optional) | type,arguments (type ist ein command/timer/.., arguments dient dazu nur einige hooks abzufragen (darf mit einem "*" als Platzhalter beginnen oder enden), beide Optionen sind optional)

 | weechat | hotlist | Liste der Buffer in Hotlist | - | -

 | weechat | key | Auflistung der Tastenzuweisungen | - | Kontext ("default", "search", "cursor" oder "mouse") (optional)

+| weechat | layout | Auflistung der Layouts | - | -
+
 | weechat | nicklist | Nicks in Nickliste für einen Buffer | Buffer Pointer | nick_xxx oder group_xxx um nur den Nick/Group xxx abzufragen (optional)

-| weechat | option | Liste der Optionen | - | Name einer Option (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | option | Auflistung der Optionen | - | Name einer Option (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

 | weechat | plugin | Auflistung der Erweiterungen | Pointer der Erweiterung (optional) | Name einer Erweiterung (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

-| weechat | window | Auflistung der Windows | Fenster Pointer (optional) | "current" für aktuelles Fenster oder die Nummer eines Fensters (optional)
+| weechat | proxy | Liste der Proxys | Proxy Pointer (optional) | Name des Proxy (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

-| xfer | xfer | Transfer-Liste | Transfer-Pointer (optional) | -
+| weechat | url_options | Optionen für URL | - | -
+
+| weechat | window | Auflistung der Fenster | Fenster Pointer (optional) | "current" für aktuelles Fenster oder die Nummer eines Fensters (optional)
+
+| xfer | xfer | Transferliste | Transferpointer (optional) | -

 |========================================
@@ -2,19 +2,21 @@
 |========================================
 | Erweiterung | Name | Beschreibung | Argumente

+| aspell | aspell_dict | durch Kommata getrennte Liste von Wörterbüchern, die in diesem Buffer genutzt werden sollen | Buffer-Pointer ("0x12345678") oder der vollständige Buffername ("irc.freenode.#weechat")
+
 | fifo | fifo_filename | Name der FIFO-Pipe | -

-| irc | irc_buffer | hole Buffer Pointer für einen IRC Server/Channel/Nick | server,channel,nick (Channel und Nicks sind optional)
+| irc | irc_buffer | holt Buffer Pointer für einen IRC Server/Channel/Nick | server,channel,nick (Channel und Nicks sind optional)

-| irc | irc_is_channel | 1, falls die Zeichenkette ein gültiger IRC-Channel ist | Channelname
+| irc | irc_is_channel | 1, falls die Zeichenkette ein gültiger IRC-Channelname für den Server ist | Server,Channel (Server ist optional)

 | irc | irc_is_nick | 1, falls die Zeichenkette ein gültiger IRC Nickname ist | Nickname

-| irc | irc_nick | Aktuellen Nicknamen für den Server erhalten | Servername
+| irc | irc_nick | aktuellen Nicknamen für den Server erhalten | Servername

-| irc | irc_nick_color | Hole Farbe-Code des Nick | Nickname
+| irc | irc_nick_color | holt Farbe-Code des Nick | Nickname

-| irc | irc_nick_color_name | Hole Namen der Farbe des Nick | Nickname
+| irc | irc_nick_color_name | holt Namen der Farbe des Nick | Nickname

 | irc | irc_nick_from_host | Nicknamen des IRC-Hosts erhalten | IRC host (in der Form `:nick!name@server.com`)

@@ -22,7 +24,7 @@

 | irc | irc_server_isupport_value | Wert der Funktion, sofern es vom Server unterstützt wird (durch IRC Message 005) | Server,Funktion

-| python | python2_bin | Pfad zum Python 2.x Interpreter | -
+| python | python2_bin | Pfad für Python 2.x Interpreter | -

 | weechat | charset_internal | Interner WeeChat Zeichensatz | -

@@ -32,14 +34,18 @@

 | weechat | date | Datum der WeeChat Kompilierung | -

-| weechat | dir_separator | Verzeichnis-Trennzeichen | -
+| weechat | dir_separator | Trennzeichen für Verzeichnis | -

 | weechat | filters_enabled | 1, falls Filter aktiviert sind | -

 | weechat | inactivity | Inaktivität der Tastatur (Sekunden) | -

+| weechat | locale | Lokalisation welche für die übersetzten Nachrichten verwendet werden soll | -
+
 | weechat | version | WeeChat Version | -

+| weechat | version_git | WeeChat Git Version (Ausgabe des Befehls "git describe", ausschließlich für eine Entwicklerversion. Eine stabile Version gibt keine Information zurück) | -
+
 | weechat | version_number | WeeChat Version (als Nummer) | -

 | weechat | weechat_dir | WeeChat Verzeichnis | -
@@ -54,6 +60,6 @@

 | weechat | weechat_site_download | Download-Seite von WeeChat | -

-| weechat | weechat_upgrading | 1 falls WeeChat ein Upgrade durchführt (Befehl  `/upgrade`) | -
+| weechat | weechat_upgrading | 1 falls WeeChat ein Upgrade durchführt (Befehl `/upgrade`) | -

 |========================================
@@ -2,7 +2,7 @@
 |========================================
 | Erweiterung | Name | Beschreibung | Hashtable (Eingabe) | Hashtable (Ausgabe)

-| irc | irc_message_parse | Parse eine IRC Nachricht | "message": IRC Nachricht | "nick": nick, "host": host, "command": command, "channel": channel, "arguments": arguments (beinhaltet Channel)
+| irc | irc_message_parse | Parse eine IRC Nachricht | "message": IRC Nachricht, "server": Servername (optional) | "tags": Tags, "message_without_tags": Nachrichten ohne Tags, "nick": Nick, "host": Host, "command": Befehl, "channel": Channel, "arguments": Argumente (schließt Channel ein)

 | irc | irc_message_split | dient zum Aufteilen einer überlangen IRC Nachricht (in maximal 512 Bytes große Nachrichten) | "message": IRC Nachricht, "server": Servername (optional) | "msg1" ... "msgN": Nachrichten die versendet werden sollen (ohne abschließendes "\r\n"), "args1" ... "argsN": Argumente für Nachrichten, "count": Anzahl der Nachrichten

@@ -0,0 +1,301 @@
+[width="100%",cols="2,^1,7",options="header"]
+|========================================
+| Option | Type | Konstanten ^(1)^
+
+| verbose | long |
+
+| header | long |
+
+| noprogress | long |
+
+| nosignal | long |
+
+| wildcardmatch | long |
+
+| failonerror | long |
+
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
+
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, all
+
+| proxy | string |
+
+| proxyport | long |
+
+| proxytype | long | http, http_1_0, socks4, socks5, socks4a, socks5_hostname
+
+| noproxy | string |
+
+| httpproxytunnel | long |
+
+| socks5_gssapi_service | string |
+
+| socks5_gssapi_nec | long |
+
+| interface | string |
+
+| localport | long |
+
+| localportrange | long |
+
+| dns_cache_timeout | long |
+
+| buffersize | long |
+
+| port | long |
+
+| tcp_nodelay | long |
+
+| address_scope | long |
+
+| tcp_keepalive | long |
+
+| tcp_keepidle | long |
+
+| tcp_keepintvl | long |
+
+| netrc | long | ignored, optional, required
+
+| netrc_file | string |
+
+| userpwd | string |
+
+| proxyuserpwd | string |
+
+| username | string |
+
+| password | string |
+
+| proxyusername | string |
+
+| proxypassword | string |
+
+| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
+
+| tlsauth_type | mask | none, srp
+
+| tlsauth_username | string |
+
+| tlsauth_password | string |
+
+| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, digest_ie, ntlm_wb, only, any, anysafe
+
+| autoreferer | long |
+
+| accept_encoding | string |
+
+| transfer_encoding | long |
+
+| followlocation | long |
+
+| unrestricted_auth | long |
+
+| maxredirs | long |
+
+| postredir | mask | post_301, post_302
+
+| put | long |
+
+| post | long |
+
+| postfields | string |
+
+| postfieldsize | long |
+
+| postfieldsize_large | long long |
+
+| copypostfields | string |
+
+| referer | string |
+
+| useragent | string |
+
+| cookie | string |
+
+| cookiefile | string |
+
+| cookiejar | string |
+
+| cookiesession | long |
+
+| cookielist | string |
+
+| httpget | long |
+
+| http_version | long | none, 1_0, 1_1
+
+| ignore_content_length | long |
+
+| http_content_decoding | long |
+
+| http_transfer_decoding | long |
+
+| mail_from | string |
+
+| mail_auth | string |
+
+| tftp_blksize | long |
+
+| ftpport | string |
+
+| dirlistonly | long |
+
+| append | long |
+
+| ftp_use_eprt | long |
+
+| ftp_use_epsv | long |
+
+| ftp_use_pret | long |
+
+| ftp_create_missing_dirs | long |
+
+| ftp_response_timeout | long |
+
+| ftp_alternative_to_user | string |
+
+| ftp_skip_pasv_ip | long |
+
+| ftpsslauth | long | default, ssl, tls
+
+| ftp_ssl_ccc | long | ccc_none, ccc_passive, ccc_active
+
+| ftp_account | string |
+
+| ftp_filemethod | long | multicwd, nocwd, singlecwd
+
+| rtsp_request | long | options, describe, announce, setup, play, pause, teardown, get_parameter, set_parameter, record, receive
+
+| rtsp_session_id | string |
+
+| rtsp_stream_uri | string |
+
+| rtsp_transport | string |
+
+| rtsp_client_cseq | long |
+
+| rtsp_server_cseq | long |
+
+| transfertext | long |
+
+| proxy_transfer_mode | long |
+
+| crlf | long |
+
+| range | string |
+
+| resume_from | long |
+
+| resume_from_large | long long |
+
+| customrequest | string |
+
+| filetime | long |
+
+| nobody | long |
+
+| infilesize | long |
+
+| infilesize_large | long long |
+
+| upload | long |
+
+| maxfilesize | long |
+
+| maxfilesize_large | long long |
+
+| timecondition | long | none, ifmodsince, ifunmodsince, lastmod
+
+| timevalue | long |
+
+| timeout | long |
+
+| timeout_ms | long |
+
+| low_speed_limit | long |
+
+| low_speed_time | long |
+
+| max_send_speed_large | long long |
+
+| max_recv_speed_large | long long |
+
+| maxconnects | long |
+
+| fresh_connect | long |
+
+| forbid_reuse | long |
+
+| connecttimeout | long |
+
+| connecttimeout_ms | long |
+
+| ipresolve | long | whatever, v4, v6
+
+| connect_only | long |
+
+| use_ssl | long | none, try, control, all
+
+| dns_servers | string |
+
+| accepttimeout_ms | long |
+
+| sslcert | string |
+
+| sslcerttype | string |
+
+| sslkey | string |
+
+| sslkeytype | string |
+
+| keypasswd | string |
+
+| sslengine | string |
+
+| sslengine_default | long |
+
+| sslversion | long | default, tlsv1, sslv2, sslv3
+
+| ssl_verifypeer | long |
+
+| cainfo | string |
+
+| issuercert | string |
+
+| capath | string |
+
+| crlfile | string |
+
+| ssl_verifyhost | long |
+
+| certinfo | long |
+
+| random_file | string |
+
+| egdsocket | string |
+
+| ssl_cipher_list | string |
+
+| ssl_sessionid_cache | long |
+
+| ssl_options | long | allow_beast
+
+| krblevel | string |
+
+| gssapi_delegation | long | none, policy_flag, flag
+
+| ssh_auth_types | mask | none, policy_flag, flag
+
+| ssh_host_public_key_md5 | string |
+
+| ssh_public_keyfile | string |
+
+| ssh_private_keyfile | string |
+
+| ssh_knownhosts | string |
+
+| new_file_perms | long |
+
+| new_directory_perms | long |
+
+|========================================
@@ -1,27 +1,26 @@
 [[command_alias_alias]]
 [command]*`alias`* Einem Befehl wird ein Alias zugewiesen::
 ........................................
-/alias  [-completion <completion>] <alias> [<command> [<arguments>]]
+/alias  [-completion <completion>] <alias> [<command> [;<command>...]]

 completion: optionale Vervollständigung für einen Alias-Befehl (Standardverhalten: Vervollständigung wird auf den Zielbefehl angewendet)
+            Hinweis: Mit der Variablen "%%command" kann eine Vervollständigung eines vorhandenen Befehls durchgeführt werden
     alias: Name des Alias (kann mit Joker "*" beginnen oder enden um Aliase aufzulisten)
   command: Name des zuzuordnenden Befehls (WeeChat- oder IRC-Befehl ohne führenden '/', mehrere Befehle müssen durch Semikolon getrennt werden)
- arguments: Argumente für Befehl

 Ohne Angabe von Argumenten werden alle definierten Aliase angezeigt.

-Anmerkung: im Befehl können Variablen gesetzt werden, die dann durch den entsprechenden Wert ersetzt werden:
+Anmerkung: Im Befehl können Variablen genutzt werden, die dann durch den entsprechenden Wert ersetzt werden:
        $n: Argument 'n' (zwischen 1 und 9)
       $-m: Argumente von 1 bis 'm'
       $n-: Argumente von 'n' bis zum letzten Argument
      $n-m: Argumente von 'n' bis 'm'
        $*: alle Argumente
        $~: letztes Argument
-     $nick: aktueller Nick
-  $channel: aktueller Channel
-   $server: aktueller Server
+      $var: "var" ist eine lokale Variable für den jeweiligen Buffer (siehe /buffer localvar)
+            Beispiel: $nick, $channel, $server, $plugin, $name

-Um ein Alias zu löschen, nutze "/unalias".
+Um ein Alias zu löschen wird der Befehl "/unalias" genutzt.

 Beispiele:
  Alias "/split" wird anlegt um damit ein Fenster horizontal zu teilen:
@@ -1,16 +1,26 @@
 [[command_aspell_aspell]]
 [command]*`aspell`* Konfiguration für Aspell-Erweiterung::
 ........................................
-/aspell  dictlist
-         enable <lang>
-         disable
-         addword [<lang>] <word>
+/aspell  enable|disable|toggle
+         listdict
+         setdict <dict>[,<dict>...]
+         deldict
+         addword [<dict>] <word>

-dictlist: listet installierte Wörterbücher auf
-  enable: aktiviert Aspell in aktuellem Buffer [lang = Wörterbuch)
- disable: deaktiviert Aspell in aktuellem Buffer
+  enable: Aspell wird aktiviert
+ disable: Aspell wird deaktiviert
+  toggle: Aspell Funktionalität umschalten
+listdict: die, auf dem System, installierten Wörterbücher werden aufgelistet
+ setdict: Wörterbuch für den aktuellen Buffer einstellen (mehrere Wörterbücher müssen durch Kommata getrennt werden)
+ deldict: Wörterbuch für den aktuellen Buffer entfernen
 addword: fügt ein Wort in das persönliche Wörterbuch von Aspell hinzu

-Eingaben die mit '/' beginnen werden nicht überprüft, außer bei einigen Befehle.
+Eingaben die mit '/' beginnen werden nicht überprüft, davon ausgenommen sind einige Befehle (siehe /set aspell.check.commands).
+
+Um Aspell auf alle Buffer anzuwenden sollte die Option "default_dict" genutzt und Aspell aktiviert werden:
+  /set aspell.check.default_dict "de_DE-neu"
+  /aspell enable
+
+Die Standardtastaturbelegung zum Umschalten der Aspell Funktionalität lautet alt-s.
 ........................................

@@ -1,30 +1,45 @@
-* *aspell.check.commands*
-** Beschreibung: `Durch Kommata getrennte Liste der Befehle, für die eine Rechtschreibprüfung gelten soll (Rechtschreibprüfung ist für andere Befehle deaktiviert)`
+* [[option_aspell.check.commands]] *aspell.check.commands*
+** Beschreibung: `durch Kommata getrennte Liste der Befehle, für die eine Rechtschreibprüfung gelten soll (Rechtschreibprüfung ist für andere Befehle deaktiviert)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"ame,amsg,away,command,cycle,kick,kickban,me,msg,notice,part,query,quit,topic"`)

-* *aspell.check.default_dict*
-** Beschreibung: `Voreingestelltes Wörterbuch (oder durch Kommata getrennte Liste der Wörterbücher) welche(s) genutzt werden soll, sofern kein Wörterbuch für einen Buffer definiert wurde. Wird kein Wörterbuch angegeben dann ist Aspell in allen Buffer deaktiviert, für die nicht explizit ein Wörterbuch angegeben wurde.`
+* [[option_aspell.check.default_dict]] *aspell.check.default_dict*
+** Beschreibung: `Voreingestelltes Wörterbuch (oder durch Kommata getrennte Liste der Wörterbücher) welche(s) genutzt werden soll, sofern kein Wörterbuch für einen Buffer definiert wurde. Wird kein Wörterbuch angegeben dann ist Aspell in allen Buffer deaktiviert, außer es wird für einen Buffer explizit ein Wörterbuch angegeben`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

-* *aspell.check.during_search*
+* [[option_aspell.check.during_search]] *aspell.check.during_search*
 ** Beschreibung: `Überprüfe Wörter während im Buffer nach einem Text gesucht wird`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)

-* *aspell.check.real_time*
-** Beschreibung: `Echtzeit Korrektur während der Texteingabe (da dies langsamer ist, ist diese Funktion standardmäßig deaktiviert. Wörter werden erst überprüft wenn ein Leerzeichen dem Wort folgt)`
+* [[option_aspell.check.enabled]] *aspell.check.enabled*
+** Beschreibung: `Aspell wird für die Eingabezeile aktiviert`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)

-* *aspell.check.word_min_length*
-** Beschreibung: `Minimallänge für ein Wort welches auf Rechtschreibung überprüft werden soll (bei 0 werden alle Wörter überprüft)`
+* [[option_aspell.check.real_time]] *aspell.check.real_time*
+** Beschreibung: `Eine Korrektur findet während der Texteingabe statt (da dies langsamer ist, ist diese Funktion standardmäßig deaktiviert. Wörter werden erst überprüft sobald ein Leerzeichen dem vorangegangenen Wort folgt)`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `off`)
+
+* [[option_aspell.check.suggestions]] *aspell.check.suggestions*
+** Beschreibung: `legt die Anzahl an Vorschlägen fest, für ein falsch geschriebenes Wort. Die Vorschläge werden in der Bar-Item "aspell_suggest", für die jeweilige(n) Sprache(n), im Buffer, angezeigt (-1 = deaktiviert die Funktion, 0 = zeigt alle verfügbaren Vorschläge an, für alle betreffenden Sprachen)`
+** Typ: integer
+** Werte: -1 .. 2147483647 (Standardwert: `-1`)
+
+* [[option_aspell.check.word_min_length]] *aspell.check.word_min_length*
+** Beschreibung: `Mindestlänge für ein Wort, welches auf Rechtschreibung überprüft werden soll (bei 0 werden alle Wörter überprüft)`
 ** Typ: integer
 ** Werte: 0 .. 2147483647 (Standardwert: `2`)

-* *aspell.look.color*
-** Beschreibung: `In dieser Farbe wird ein Wort mit einem Rechtschreibfehler hervorgehoben`
+* [[option_aspell.color.misspelled]] *aspell.color.misspelled*
+** Beschreibung: `Farbe in der ein Wort mit einem Rechtschreibfehler hervorgehoben werden soll (Eingabezeile)`
 ** Typ: Farbe
-** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `lightred`)
+** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `lightred`)
+
+* [[option_aspell.color.suggestions]] *aspell.color.suggestions*
+** Beschreibung: `Textfarbe für die Vorschläge der Rechtsschreibkorrektur (Statusbar)`
+** Typ: Farbe
+** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `default`)

@@ -1,5 +1,5 @@
 [[command_charset_charset]]
-[command]*`charset`* ändere Zeichensatz für aktuellen Buffer::
+[command]*`charset`* Ändert den Zeichensatz für aktuellen Buffer::
 ........................................
 /charset  decode|encode <charset>
          reset
@@ -1,10 +1,10 @@
-* *charset.default.decode*
-** Beschreibung: `globaler Zeichensatz zum dekodieren`
+* [[option_charset.default.decode]] *charset.default.decode*
+** Beschreibung: `globale Zeichendekodierung: Zeichendekodierung die für eingehende Nachrichten genutzt werden soll (sollte keine Zeichendekodierung angegeben werden, wird UTF-8 verwendet, da WeeChat UTF-8 zur internen Dekodierung nutzt)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"iso-8859-1"`)

-* *charset.default.encode*
-** Beschreibung: `globaler Zeichensatz zum kodieren`
+* [[option_charset.default.encode]] *charset.default.encode*
+** Beschreibung: `globale Zeichenkodierung: Zeichenkodierung die für ausgehende Nachrichten genutzt werden soll (sollte keine Zeichenkodierung angegeben werden, wird UTF-8 verwendet, da WeeChat UTF-8 zur internen Kodierung nutzt)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`weechat-curses: manpage-has-errors-from-man usr/share/man/man1/weechat-curses.1.gz 61: warning [p 1, 9.0i]: cannot adjust line`
				`@@ -0,0 +1 @@`
				`usr/share/doc/weechat-doc/html usr/share/doc/weechat/html`