Version 1.1-rc1

irc: add option "reorder" in command /server (closes #229 )
core: replace irc.freenode.net by chat.freenode.net
2026-06-12 14:14:48 +02:00 · 2014-12-21 13:05:19 +01:00 · 2014-12-21 11:12:32 +01:00 · 2014-12-21 09:20:26 +01:00 · 2014-12-20 08:07:13 +01:00 · 2014-12-15 20:39:47 +01:00
751 changed files with 83434 additions and 39896 deletions
@@ -3,3 +3,4 @@
 .git*               export-ignore
 debian              export-ignore
 weechat.spec        export-ignore
+.mailmap            export-ignore
@@ -0,0 +1,19 @@
+# Map author and committer names and email addresses to canonical real names
+# and email addresses.
+#
+# For example with these commands:
+#   git shortlog -nse
+#   git shortlog -se | cut -f2 | sort
+
+Sébastien Helleu <flashcode@flashtux.org>
+Sébastien Helleu <flashcode@flashtux.org> <flashcode@krypton>
+Sébastien Helleu <flashcode@flashtux.org> <flashcode>
+Sébastien Helleu <flashcode@flashtux.org> <uid67137>
+Nils Görs <weechatter@arcor.de>
+Ryuunosuke Ayanokouzi <i38w7i3@yahoo.co.jp>
+Krzysztof Korościk <soltys@szluug.org>
+Marco Paolone <marcopaolone@gmail.com>
+<marcopaolone@gmail.com> <marco@DrB4tch.sitecomwl601>
+<mikaela.suomalainen@outlook.com> <mkaysi@outlook.com>
+<simon@arlott.org> <sa.me.uk>
+<Simon.Kuhnle@cs.fau.de> <simon@blarzwurst.de>
@@ -0,0 +1,33 @@
+language: c
+
+compiler:
+    - gcc
+    - clang
+
+env:
+    - BUILDTOOL="cmake" BUILDARGS=""
+    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON3=ON"
+    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_GNUTLS=OFF"
+    - BUILDTOOL="autotools" BUILDARGS=""
+    - BUILDTOOL="autotools" BUILDARGS="--enable-python3"
+    - BUILDTOOL="autotools" BUILDARGS="--disable-gnutls"
+
+before_script:
+    - echo 'APT::Install-Recommends "false";' | sudo tee -a /etc/apt/apt.conf
+    - sudo apt-get update -qq
+    - sudo apt-get -y install devscripts equivs python-pip libenchant-dev autopoint asciidoc source-highlight xsltproc docbook-xsl docbook-xml cmake pkg-config libncursesw5-dev gem2deb libperl-dev python-dev python3-dev libaspell-dev liblua5.1-0-dev tcl8.5-dev guile-2.0-dev libcurl4-gnutls-dev libgcrypt11-dev libgnutls-dev zlib1g-dev curl
+    - curl -OL https://weechat.org/files/tests/ubuntu/precise/amd64/libcpputest-dev_3.4-3_amd64.deb
+    - sudo dpkg -i libcpputest-dev_3.4-3_amd64.deb
+    - sudo pip install msgcheck pylint
+
+script:
+    - ./scripts/build.sh
+    - msgcheck po/*.po
+    - pylint doc/docgen.py
+
+after_success:
+    - weechat --help
+    - weechat -r "/debug libs;/quit"
+
+matrix:
+    fast_finish: true
@@ -1,5 +1,7 @@
 = WeeChat Authors
-Sébastien Helleu <flashcode@flashtux.org>
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: en


 == Developers
@@ -16,6 +18,7 @@ Alphabetically:
 * Ailin Nemui (Nei)
 * Aleksey V Zapparov
 * Alex Tarkovsky
+* Anders Bergh
 * Andrew Potter (talisein)
 * Antoine Pietri (seirl)
 * Asakura
@@ -31,12 +34,14 @@ Alphabetically:
 * Elizabeth Myers (Elizacat)
 * Emanuele Giaquinta
 * Esteban I. Ruiz Moreno (Exio)
+* Felix Eckhofer
 * Frank Zacharias
 * Gu1ll4um3r0m41n
 * Guido Berhoerster
 * Gwenn
 * Hasan Kiran (turgay)
 * Ivan Sichmann Freitas
+* Jason A. Donenfeld (zx2c4)
 * JD Horelick (jdhore)
 * Jim Ramsay (lack)
 * Jiri Golembiovsky (GolemJ)
@@ -50,13 +55,17 @@ Alphabetically:
 * Matt Robinson
 * Mantas Mikulėnas (grawity)
 * Mateusz Poszwa
+* Max Anton Teufel
 * Murilo Opsfelder Araujo
 * Nicolas Cavigneaux
 * Nils Görs (nils_2)
+* nyuszika7h
 * Odin
+* Patrick Steinhardt
 * Paul Komkoff
 * Pavel Shevchuk (Stalwart)
 * Peter Boström (pbos)
+* Phillip Sz
 * Pierre Carru
 * Piotr Szymaniak
 * Pistos
@@ -67,10 +76,12 @@ Alphabetically:
 * Rudolf Polzer (divVerent)
 * Ryuunosuke Ayanokouzi
 * Sergio Durigan Junior
+* Shawn Smith
 * Simon Arlott
 * Simon Kuhnle
 * Stefano Pigozzi
 * Stfn
+* Tim D. Smith
 * Tom Alsberg
 * Tor Hveem (xt)
 * Valentin Lorentz (progval)
@@ -79,7 +90,5 @@ Alphabetically:

 == Contact

-Developers are connected to IRC:
-
-* server: 'irc.freenode.net'
-* channels: '#weechat' (english) and '#weechat-fr' (french)
+See https://weechat.org/files/doc/devel/weechat_user.en.html#support[user's guide]
+or https://weechat.org/dev/support
@@ -19,152 +19,259 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-PROJECT(weechat C)
-
 cmake_minimum_required(VERSION 2.4)

-SET(CMAKE_VERBOSE_MAKEFILE OFF)
-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-SET(CMAKE_SKIP_RPATH ON)
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Werror-implicit-function-declaration")
-IF(PREFIX)
-  SET(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix" FORCE)
-ENDIF(PREFIX)
+project(weechat C)

-SET(VERSION_MAJOR "0")
-SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "3-rc1")
-SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-SET(LICENSE "GPL3")
-SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
-STRING(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING})
+# CMake options
+set(CMAKE_VERBOSE_MAKEFILE OFF)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+set(CMAKE_SKIP_RPATH ON)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration")
+if(PREFIX)
+  set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix" FORCE)
+endif()

-IF(DEFINED LIBDIR)
-  SET(LIBDIR ${LIBDIR}/${PROJECT_NAME})
-ELSE(DEFINED LIBDIR)
-  SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
-ENDIF(DEFINED LIBDIR)
+# version
+set(VERSION_MAJOR "1")
+set(VERSION_MINOR "1-rc1")
+set(VERSION_PATCH "")
+if(VERSION_PATCH STREQUAL "")
+  set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
+else()
+  set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+endif()

-IF(NOT DEFINED SHAREDIR)
-  SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
-ENDIF(NOT DEFINED SHAREDIR)
+# license
+set(LICENSE "GPL3")

-IF(NOT DEFINED MANDIR)
-  SET(MANDIR ${SHAREDIR}/man)
-ENDIF(NOT DEFINED MANDIR)
+# package string
+set(PKG_STRING "${PROJECT_NAME} ${VERSION}")
+string(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING})

-IF(NOT DEFINED LOCALEDIR)
-  SET(LOCALEDIR ${SHAREDIR}/locale)
-ENDIF(NOT DEFINED LOCALEDIR)
+if(DEFINED LIBDIR)
+  set(LIBDIR ${LIBDIR}/${PROJECT_NAME})
+else()
+  set(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
+endif()

-IF(DEFINED INCLUDEDIR)
-  SET(INCLUDEDIR ${INCLUDEDIR}/${PROJECT_NAME})
-ELSE(DEFINED INCLUDEDIR)
-  SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
-ENDIF(DEFINED INCLUDEDIR)
+if(NOT DEFINED SHAREDIR)
+  set(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
+endif()

-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)
+if(NOT DEFINED MANDIR)
+  set(MANDIR ${SHAREDIR}/man)
+endif()
+
+if(NOT DEFINED LOCALEDIR)
+  set(LOCALEDIR ${SHAREDIR}/locale)
+endif()
+
+if(DEFINED INCLUDEDIR)
+  set(INCLUDEDIR ${INCLUDEDIR}/${PROJECT_NAME})
+else()
+  set(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
+endif()
+
+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_EXEC      "Enable Exec 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_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_TRIGGER   "Enable Trigger plugin"                     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(ENABLE_TESTS     "Enable tests"                              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
+if(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
+  set(WEECHAT_HOME "~/.weechat")
+endif()
+set(WEECHAT_HOME "${WEECHAT_HOME}" CACHE
  STRING "WeeChat home directory for config, logs, scripts.. (default is \"~/.weechat\")"
  FORCE)
-MARK_AS_ADVANCED(CLEAR WEECHAT_HOME)
+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
+if(NOT DEFINED CA_FILE OR "${CA_FILE}" STREQUAL "")
+  set(CA_FILE "/etc/ssl/certs/ca-certificates.crt")
+endif()
+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)
+mark_as_advanced(CLEAR CA_FILE)

-IF(ENABLE_NLS)
-  ADD_SUBDIRECTORY( po )
-ENDIF(ENABLE_NLS)
+if(COMMAND cmake_policy)
+  if(POLICY CMP0003)
+    cmake_policy(SET CMP0003 NEW)
+  endif()
+  if(POLICY CMP0017)
+    cmake_policy(SET CMP0017 NEW)
+  endif()
+endif()

-ADD_SUBDIRECTORY( src )
-ADD_SUBDIRECTORY( doc )
+add_definitions(-DHAVE_CONFIG_H)

-CONFIGURE_FILE(config.h.cmake config.h @ONLY)
+include(CheckIncludeFiles)
+include(CheckFunctionExists)
+include(CheckSymbolExists)
+
+check_include_files("langinfo.h" HAVE_LANGINFO_CODESET)
+check_include_files("sys/resource.h" HAVE_SYS_RESOURCE_H)
+
+check_function_exists(mallinfo HAVE_MALLINFO)
+
+check_symbol_exists("eat_newline_glitch" "term.h" HAVE_EAT_NEWLINE_GLITCH)
+
+# Check for Large File Support
+if(ENABLE_LARGEFILE)
+  add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_LARGE_FILES)
+endif()
+
+# Check for Gettext
+if(ENABLE_NLS)
+  find_package(Gettext)
+  if(GETTEXT_FOUND)
+    add_definitions(-DENABLE_NLS)
+  endif()
+endif()
+
+# Check for libgcrypt
+find_package(GCRYPT REQUIRED)
+add_definitions(-DHAVE_GCRYPT)
+list(APPEND EXTRA_LIBS ${GCRYPT_LDFLAGS})
+
+# Check for GnuTLS
+if(ENABLE_GNUTLS)
+  find_package(GnuTLS)
+  if(GNUTLS_FOUND)
+    string(REGEX REPLACE "/[^/]*$" "" GNUTLS_LIBRARY_PATH "${GNUTLS_LIBRARY}")
+    add_definitions(-DHAVE_GNUTLS)
+    include_directories(${GNUTLS_INCLUDE_PATH})
+    set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${GNUTLS_LIBRARY_PATH}")
+    list(APPEND EXTRA_LIBS gnutls)
+  endif()
+endif()
+
+# Check for zlib
+find_package(ZLIB REQUIRED)
+add_definitions(-DHAVE_ZLIB)
+
+# Check for iconv
+find_package(Iconv)
+if(ICONV_FOUND)
+  add_definitions(-DHAVE_ICONV)
+endif()
+
+# Check for CURL
+find_package(CURL REQUIRED)
+
+# weechat_gui_common MUST be the first lib in the list
+set(STATIC_LIBS weechat_gui_common)
+
+find_library(DL_LIBRARY
+  NAMES dl
+  PATHS /lib /usr/lib /usr/libexec /usr/local/lib /usr/local/libexec
+)
+list(APPEND STATIC_LIBS weechat_plugins)
+if(DL_LIBRARY)
+  string(REGEX REPLACE "/[^/]*$" "" DL_LIBRARY_PATH "${DL_LIBRARY}")
+  set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${DL_LIBRARY_PATH}")
+  list(APPEND EXTRA_LIBS dl)
+endif()
+
+if(ENABLE_NLS)
+  add_subdirectory(po)
+endif()
+
+add_subdirectory(src)
+add_subdirectory(doc)
+
+if(ENABLE_TESTS)
+  enable_testing()
+  add_subdirectory(tests)
+endif()
+
+configure_file(config.h.cmake config.h @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"
+add_custom_target(version_git ALL
+  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/scripts/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")

-CONFIGURE_FILE(
+configure_file(
  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
  IMMEDIATE @ONLY)

-ADD_CUSTOM_TARGET(uninstall
+add_custom_target(uninstall
  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

-ADD_CUSTOM_TARGET(dist
-  "${CMAKE_CURRENT_SOURCE_DIR}/makedist.sh" "${VERSION}" "HEAD"
+add_custom_target(dist
+  "${CMAKE_CURRENT_SOURCE_DIR}/makedist.sh" "${VERSION}" "HEAD" "${CMAKE_CURRENT_BINARY_DIR}"
  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

 # pkgconfig file
-SET(PACKAGE "${PROJECT_NAME}")
-SET(prefix "${CMAKE_INSTALL_PREFIX}")
-SET(exec_prefix "\${prefix}")
-SET(libdir "\${exec_prefix}/lib")
-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)
+set(PACKAGE "${PROJECT_NAME}")
+set(prefix "${CMAKE_INSTALL_PREFIX}")
+set(exec_prefix "\${prefix}")
+set(libdir "\${exec_prefix}/lib")
+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)

 # cygport file (used to build Cygwin packages)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport @ONLY)
+
+# install some files (only on Cygwin)
+if(CYGWIN)
+  install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/README.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.asciidoc
+    DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+endif()

 # icon
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/32x32/apps)
+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 "Sébastien Helleu")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
-SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
-SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
+set(CPACK_PACKAGE_VENDOR "Sébastien Helleu")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.asciidoc")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})

 # binary package
-SET(CPACK_GENERATOR "STGZ;TGZ;TBZ2")
-SET(CPACK_PACKAGE_FILE_NAME weechat-binary-${VERSION})
+set(CPACK_GENERATOR "STGZ;TGZ;TBZ2")
+set(CPACK_PACKAGE_FILE_NAME weechat-binary-${VERSION})

 # source package
-SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME weechat-${VERSION})
-SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
+set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME weechat-${VERSION})
+set(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
  "/autom4te\\\\.cache/" "/ABOUT-NLS$" "/config\\\\.guess$" "/config\\\\.h$"
  "/config\\\\.h.in$" "/config\\\\.log$" "/config\\\\.rpath$"
  "/config\\\\.status$" "/config\\\\.sub$" "/configure$" "/depcomp$"
@@ -174,4 +281,4 @@ SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
  "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat$"
 )

-INCLUDE(CPack)
+include(CPack)
@@ -0,0 +1,86 @@
+= Contributing to WeeChat
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: en
+
+
+== Reporting bugs
+
+First, some basic things:
+
+* Use only English to communicate with developers.
+* If you can, please check if the problem has been fixed in development version
+  (if you are using a stable release or old version).
+* Report only one bug or feature request per issue.
+
+=== Security reports
+
+Please *DO NOT* file a GitHub issue for security related problems, but send an
+email to <security@weechat.org> instead.
+
+=== Required info
+
+When reporting https://github.com/weechat/weechat/issues[issues] on GitHub,
+please include:
+
+* your *WeeChat version*: the output of `/v` in WeeChat, for example:
+  'WeeChat 1.0-dev (git: v0.4.3-475-gb174b3c)'. +
+  If WeeChat does not start at all, please include the version displayed by
+  `weechat --help` (or the version installed with your package manager).
+* your *operating system*: its name and version (examples: Linux Debian Wheezy,
+  FreeBSD 10.0, Windows/Cygwin 64-bit, ...).
+* the *steps to reproduce*: if possible, please include a reproducible example:
+  explain the steps which led you to the problem. +
+  It's even better if you can reproduce the problem with a new config (and no
+  scripts loaded): try `weechat --dir /tmp/weechat` and check if you have the
+  problem here.
+* the *gdb's backtrace* (only for a crash): if you can reproduce the crash
+(or if you have a core file), please include the backtrace from gdb (look at
+https://weechat.org/files/doc/devel/weechat_user.en.html#report_crashes[User's guide]
+for more info).
+
+[IMPORTANT]
+Most of times, the WeeChat crash log file ('weechat_crash_YYYYMMDD_xxx.log') is
+*NOT USEFUL* to fix the bug, so please report this file *ONLY* if a developer
+asked you to send it (and be extremely careful, this file can contain personal
+data like passwords and contents of your chats).
+
+=== Scripts related issues
+
+If you are using scripts, they can cause problems/crashes. To check if the
+problem is related to one script, try to unload them one by one (using
+command `/script unload <name>`).
+
+Many issues reported are in fact related to bugs in scripts, so please first
+check that before reporting any issue on WeeChat itself.
+
+If you think the problem comes from a specific script, please report the issue
+in the https://github.com/weechat/scripts/issues[scripts git repository]
+instead.
+
+== Translations
+
+Pull requests on GitHub for fixes or new translations are welcome at any
+time, for https://github.com/weechat/weechat[WeeChat] and
+the web site https://github.com/weechat/weechat.org[weechat.org].
+
+To start a translation in a new language (not yet supported), please look at
+https://weechat.org/files/doc/devel/weechat_dev.en.html#translations[translations]
+in Developer's guide.
+
+== Feature requests
+
+WeeChat is under active development, so your idea may already have been
+implemented, or scheduled for a future version (you can check in
+https://weechat.org/dev[roadmap] or
+https://github.com/weechat/weechat/milestones[milestones] on GitHub.
+
+Pull requests on GitHub are welcome for minor new features.
+
+For major new features, it's better to discuss about it in IRC
+(server: 'chat.freenode.net', channel '#weechat').
+
+Before submitting any pull request, be sure you have read the
+https://weechat.org/files/doc/devel/weechat_dev.en.html#coding_rules[coding rules]
+in Developer's guide, which contains info about styles used, naming convention
+and other useful info.
@@ -1,45 +0,0 @@
-= WeeChat Installation instructions
-Sébastien Helleu <flashcode@flashtux.org>
-
-
-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.
-
-== 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
-$ cd build
-$ cmake .. -DPREFIX=/path/to/directory
-$ make
-$ make install     (as root for installation in system directories)
----
-
-For more information or installation with autotools, please look at
-'User's guide': http://weechat.org/doc
@@ -23,18 +23,27 @@
 # (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
+	-$(abs_top_srcdir)/scripts/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h

-SUBDIRS = po doc intl src
+if TESTS
+tests_dir = tests
+endif

-EXTRA_DIST = CMakeLists.txt \
+SUBDIRS = po doc intl src $(tests_dir)
+
+EXTRA_DIST = AUTHORS.asciidoc \
+             ChangeLog.asciidoc \
+             Contributing.asciidoc \
+             README.asciidoc \
+             ReleaseNotes.asciidoc \
+             CMakeLists.txt \
             config.rpath \
             config.h.cmake \
-             git-version.sh \
             makedist.sh \
             cmake/CMakeParseArguments.cmake \
             cmake/FindAsciidoc.cmake \
             cmake/FindAspell.cmake \
+             cmake/FindCppUTest.cmake \
             cmake/FindENCHANT.cmake \
             cmake/FindGCRYPT.cmake \
             cmake/FindGettext.cmake \
@@ -54,6 +63,8 @@ EXTRA_DIST = CMakeLists.txt \
             cmake/cmake_uninstall.cmake.in \
             po/CMakeLists.txt \
             po/srcfiles.cmake \
+             scripts/build.sh \
+             scripts/git-version.sh \
             weechat.png \
             weechat.pc.in \
             weechat.cygport.in
@@ -1,37 +0,0 @@
-= WeeChat Readme
-Sébastien Helleu <flashcode@flashtux.org>
-
-
-WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat
-environment for many operating systems. Everything can be done with a keyboard.
-It is customizable and extensible with scripts.
-
-
-== Features
-
-* chat client with multi-protocols/servers connection
-* small, fast and very light
-* 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)
-* free software, released under GPLv3
-
-== Copyright
-
-Copyright (C) 2003-2014 Sébastien 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/>.
@@ -0,0 +1,91 @@
+= WeeChat
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: en
+
+
+WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat
+environment for many operating systems. Everything can be done with a keyboard.
+It is customizable and extensible with scripts.
+
+Homepage: https://weechat.org/
+
+image:https://travis-ci.org/weechat/weechat.svg?branch=master["Build Status", link="https://travis-ci.org/weechat/weechat"]
+
+== Features
+
+* Modular chat client with a lightweight core and optional plugins.
+* Multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other).
+* Multi-protocols architecture (mainly IRC).
+* Compliant with IRC RFCs 1459, 2810, 2811, 2812 and 2813.
+* Small, fast and very light.
+* Customizable and extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl, Guile).
+* Fully documented and translated into several languages.
+* Developed from scratch.
+* Free software, released under GPLv3.
+
+image::http://static.weechat.org/images/screenshots/weechat/medium/weechat_2013-04-27_phlux_shadow.png[align="center"]
+
+== Install
+
+=== Dependencies
+
+Following packages are *required*:
+
+* CMake
+* libncurses
+* libcurl
+* zlib
+* libgcrypt
+
+Following packages are 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 building tests: C++ compiler, CppUTest
+
+For a complete list of dependencies and versions recommended, please look at
+https://weechat.org/files/doc/devel/weechat_user.en.html#dependencies[user's guide].
+
+=== Compile
+
+WeeChat can be built with http://cmake.org/[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.
+
+----
+$ mkdir build
+$ cd build
+$ cmake .. -DPREFIX=/path/to/directory
+$ make
+$ make install     (as root for installation in system directories)
+----
+
+For more information or installation with autotools, please look at
+https://weechat.org/files/doc/devel/weechat_user.en.html#compile_with_autotools[user's guide].
+
+== Copyright
+
+Copyright (C) 2003-2014 Sébastien 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/>.
@@ -1,17 +1,219 @@
 = WeeChat Release Notes
-Sébastien Helleu <flashcode@flashtux.org>
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: en


 This document lists important changes for each version, that require manual
-actions. It is recommended to read it when upgrading to a new stable
+actions (the latest formatted version of this document can be found
+https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[here]). +
+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).
+https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
+(file 'ChangeLog.asciidoc' in sources).


-== Version 0.4.3 (under dev)
+== Version 1.1 (under dev)
+
+=== New format for regex replacement in triggers
+
+A new format is used in regex replacement to use regex groups, this format
+is incompatible with version 1.0.
+
+The existing triggers are *NOT automatically updated*.
+
+[width="60%",cols="2,2,3",options="header"]
+|===
+| Old format     | New format               | Examples (new format)
+| `$0` ... `$99` | `${re:0}` ... `${re:99}` | `${re:1}`
+| `$+`           | `${re:+}`                | `${re:+}`
+| `$.*N`         | `${hide:*,${re:N}}`      | `${hide:*,${re:2}}` +
+                                              `${hide:-,${re:+}}`
+|===
+
+Moreover, default triggers used to hide passwords have been fixed for *BSD
+operating systems.
+
+You can restore them with the following command:
+
+----
+/trigger restore cmd_pass msg_auth server_pass
+----
+
+If you added triggers with the old regex replacement format, you must update
+them manually.
+
+=== Default "beep" trigger
+
+The command of "beep" trigger is now executed only if the message is displayed
+(not filtered with /filter).
+
+You can restore the default "beep" trigger with the following command:
+
+----
+/trigger restore beep
+----
+
+=== Return code of commands
+
+The API function 'weechat_command' now sends the value returned return by
+command callback.
+
+WeeChat does not display any more an error when a command returns
+'WEECHAT_RC_ERROR'. Consequently, all plugins/scripts should display an
+explicit error message before returning 'WEECHAT_RC_ERROR'.
+
+For C plugins, two macros have been added in weechat-plugin.h:
+'WEECHAT_COMMAND_MIN_ARGS' and 'WEECHAT_COMMAND_ERROR'.
+
+=== Completion of inline commands
+
+WeeChat now completes by default inline commands (not only at beginning of
+line).
+
+When this feature is enabled, there is no more automatic completion of
+absolute paths (except if you are completing a path inside a command argument,
+like `/dcc send <nick> <path>`).
+
+To restore the old behavior (no completion of inline commands):
+
+----
+/set weechat.completion.command_inline off
+----
+
+=== Relay option relay.irc.backlog_tags
+
+The option 'relay.irc.backlog_tags' is now a list separated by commas
+(it was separated by semicolons in older versions).
+
+If you are using a list of tags in this option, you must adjust the value
+manually.
+
+=== IPv4-mapped IPv6 client address in relay
+
+The string "::ffff:" has been removed from IPv4-mapped IPv6 client address
+in relay plugin.
+
+If you are using "::ffff:" in option 'relay.network.allowed_ips', you can
+remove it.
+
+=== Temporary servers disabled by default with /connect
+
+Creating a temporary server with command `/connect <address>` or
+`/connect irc://...` is now forbidden by default.
+
+A new option has been added to unlock the feature, you can do that for
+the old behavior in command `/connect`:
+
+----
+/set irc.look.temporary_servers on
+----
+
+=== Microseconds in API timeval functions
+
+The API functions using timeval are now using or returning microseconds,
+instead of milliseconds:
+
+* function 'util_timeval_diff': returns microseconds
+* function 'util_timeval_add': the argument 'interval' is now expressed in
+  microseconds.
+
+== Version 1.0.1 (2014-09-28)
+
+Bug fix and maintenance release.
+
+== Version 1.0 (2014-08-15)
+
+=== Channel type not added by default on /join
+
+The channel type is not any more automatically added to a channel name on join
+(for example `/join weechat` will not send `/join #weechat`).
+
+If you are lazy and want to automatically add the channel type, you can turn on
+the new option:
+
+----
+/set irc.look.join_auto_add_chantype on
+----
+
+=== Hide IRC channel modes arguments
+
+The option 'irc.look.item_channel_modes_hide_key' has been renamed to
+'irc.look.item_channel_modes_hide_args' and is now a string. +
+It can now hide arguments for multiple channel modes.
+
+By default, a channel key (mode "k") will hide channel arguments. For old
+behavior (never hide arguments, even with a channel key), you can do:
+
+----
+/set irc.look.item_channel_modes_hide_args ""
+----
+
+=== Jump to first/last buffer
+
+The command `/input jump_last_buffer` has been replaced by `/buffer +`.
+You can rebind the key key[alt-j,alt-l]:
+
+----
+/key bind meta-jmeta-l /buffer +
+----
+
+[NOTE]
+The command `/input jump_last_buffer` still works for compatibility reasons,
+but it should not be used any more.
+
+Similarly, a new key has been added to jump to first buffer: key[alt-j,alt-f].
+You can add it with following command:
+
+----
+/key missing
+----
+
+=== Hotlist conditions
+
+A new option 'weechat.look.hotlist_add_conditions' has been added. This option
+replaces the option 'weechat.look.hotlist_add_buffer_if_away', which has been
+removed.
+
+Default conditions are `${away} || ${buffer.num_displayed} == 0`, which means
+that a buffer is added in hotlist if you are away ("away" local variable is
+set), or if the buffer is not visible on screen (not displayed in any window).
+
+If you have set 'weechat.look.hotlist_add_buffer_if_away' to `off` (to not add
+current buffer in hotlist when you are away), then you must manually change the
+default conditions with the following command:
+
+----
+/set weechat.look.hotlist_add_conditions "${buffer.num_displayed} == 0"
+----
+
+=== Rmodifier replaced by Trigger plugin
+
+The trigger plugin replaces the rmodifier plugin, which has been removed
+(and trigger has much more features than rmodifier).
+
+Default triggers have same features as default rmodifiers (to hide passwords
+in commands and output).
+
+If you added some custom rmodifiers, you must create similar triggers, see
+`/help trigger` and the complete trigger doc in the 'WeeChat User's guide'.
+
+[NOTE]
+If on startup you have an error about API mismatch in plugin 'rmodifier.so',
+you can manually remove the file (the command `make install` does not remove
+obsolete plugins).
+
+=== Bare display
+
+A bare display mode has been added (for easy text selection and click on URLs),
+the new default key is key[alt-l].
+
+Use command `/key missing` to add the key or `/key listdiff` to see differences
+between your current keys and WeeChat default keys.
+
+== Version 0.4.3 (2014-02-09)

 === Colors in messages

@@ -67,6 +269,21 @@ The 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_zoom+buffer_filter,[lag],[hotlist],completion,scroll"
 ----

+=== IRC messages on channel join
+
+The names are not displayed any more by default on channel join (they are in
+nicklist anyway).
+
+Names can be displayed with the value "353" in option
+'irc.look.display_join_message' (which is not in default value). +
+The value "366" shows only names count on channel.
+
+If you want to display all messages on join (including names), you can do:
+
+----
+/set irc.look.display_join_message "329,332,333,353,366"
+----
+
 === Maximum lag in IRC

 Option 'irc.network.lag_max' has been added.
@@ -618,7 +835,7 @@ IRC commands /ame and /amsg are now aliases, if you are upgrading from version
 == Version 0.3.0 (2009-09-06)

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

 Major differences:

@@ -24,6 +24,9 @@
 ### common stuff
 ###

+DIR=$(cd $(dirname "$0"); pwd)
+cd $DIR
+
 AUTOGEN_LOG=autogen.log

 err ()
@@ -48,34 +51,20 @@ run ()
    fi
 }

-###
-### cleanning part
-###
-#  remove autotools stuff
-run "rm -rf config"
+# remove autotools stuff
 run "rm -f config.h.in"
 run "rm -f aclocal.m4 configure config.log config.status"
 run "rm -rf autom4te*.cache"
+
 # remove libtool stuff
 run "rm -f libtool"
+
 # remove gettext stuff
 run "rm -f ABOUT-NLS"
 run "rm -rf intl"

-###
-### configuration part
-###
-# create the config directory
-run "mkdir -p config/m4"
-run "mkdir intl"
-
-# execute autotools cmds
-run "autopoint -f"
-run "libtoolize --automake --force --copy"
-run "aclocal --force -I config/m4"
-run "autoheader"
-run "autoconf"
-run "automake --add-missing --copy --gnu"
+# execute autoreconf cmds
+run "autoreconf -fvi"

 # ending
 rm -f $AUTOGEN_LOG
@@ -20,32 +20,32 @@
 # - Find Asciidoc
 # This module finds if asciidoc (version 8 or newer) is installed.

-IF (ASCIIDOC_FOUND)
+if(ASCIIDOC_FOUND)
  # Already in cache, be silent
-  SET(ASCIIDOC_FIND_QUIETLY TRUE)
-ENDIF (ASCIIDOC_FOUND)
+  set(ASCIIDOC_FIND_QUIETLY TRUE)
+endif()

-FIND_PROGRAM(
+find_program(
  ASCIIDOC_EXECUTABLE asciidoc
  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
 )

-FIND_PROGRAM(
+find_program(
  A2X_EXECUTABLE a2x
  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
 )

-IF(ASCIIDOC_EXECUTABLE AND A2X_EXECUTABLE)
-  EXECUTE_PROCESS(
+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.*")
+  if(${ASCIIDOC_VERSION} MATCHES "asciidoc 8.*")
+    set(ASCIIDOC_FOUND TRUE)
+  endif()

-  MARK_AS_ADVANCED(
+  mark_as_advanced(
    ASCIIDOC_EXECUTABLE
    )
-ENDIF(ASCIIDOC_EXECUTABLE AND A2X_EXECUTABLE)
+endif()
@@ -26,31 +26,33 @@
 #  ASPELL_INCLUDE_PATH = path to where aspell.h can be found
 #  ASPELL_LIBRARY = path to where libaspell.so* can be found

-IF (ASPELL_FOUND)
+if(ASPELL_FOUND)
  # Already in cache, be silent
  SET(ASPELL_FIND_QUIETLY TRUE)
-ENDIF (ASPELL_FOUND)
+endif()

-FIND_PATH(ASPELL_INCLUDE_PATH
+find_path(ASPELL_INCLUDE_PATH
  NAMES aspell.h
  PATHS /usr/include /usr/local/include /usr/pkg/include
 )

-FIND_LIBRARY(ASPELL_LIBRARY
+find_library(ASPELL_LIBRARY
  NAMES aspell aspell-15
  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
 )

-IF (ASPELL_INCLUDE_PATH AND ASPELL_LIBRARY)
-  SET(CMAKE_REQUIRED_INCLUDES ${ASPELL_INCLUDE_PATH})
-  SET(CMAKE_REQUIRED_LIBRARIES ${ASPELL_LIBRARY})
-  CHECK_SYMBOL_EXISTS(aspell_version_string "aspell.h" HAVE_ASPELL_VERSION_STRING)
-  SET(CMAKE_REQUIRED_INCLUDES)
-  SET(CMAKE_REQUIRED_LIBRARIES)
-  SET(ASPELL_FOUND TRUE)
-ENDIF (ASPELL_INCLUDE_PATH AND ASPELL_LIBRARY)
+if(ASPELL_INCLUDE_PATH AND ASPELL_LIBRARY)
+  set(ASPELL_FOUND TRUE)

-MARK_AS_ADVANCED(
+  # check if function aspell_version_string() exists
+  set(CMAKE_REQUIRED_INCLUDES ${ASPELL_INCLUDE_PATH})
+  set(CMAKE_REQUIRED_LIBRARIES ${ASPELL_LIBRARY})
+  check_symbol_exists(aspell_version_string "aspell.h" HAVE_ASPELL_VERSION_STRING)
+  set(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_LIBRARIES)
+endif()
+
+mark_as_advanced(
  ASPELL_INCLUDE_PATH
  ASPELL_LIBRARY
  )
@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2014 Sébastien 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/>.
+#
+
+# - Find CppUTest
+# 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:
+#
+# CPPUTEST_FOUND        = CppUTest is installed
+# CPPUTEST_INCLUDE_DIRS = CppUTest include directory
+# CPPUTEST_LIBRARIES    = Link options to compile with CppUTest
+
+if(CPPUTEST_FOUND)
+   # Already in cache, be silent
+   set(CPPUTEST_FIND_QUIETLY TRUE)
+endif()
+
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(CPPUTEST REQUIRED cpputest)
+endif()
@@ -12,19 +12,19 @@
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.


-if (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)

  # in cache already
  set(ENCHANT_FOUND TRUE)

-else (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
-  if (NOT WIN32)
+else()
+  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)
+  endif()

  find_path(ENCHANT_INCLUDE_DIR
            NAMES enchant++.h
@@ -41,4 +41,11 @@ else (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)

  mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)

-endif (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+  # check if function enchant_get_version() exists
+  set(CMAKE_REQUIRED_INCLUDES ${ENCHANT_INCLUDE_DIR})
+  set(CMAKE_REQUIRED_LIBRARIES ${ENCHANT_LIBRARIES})
+  check_symbol_exists(enchant_get_version "enchant.h" HAVE_ENCHANT_GET_VERSION)
+  set(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_LIBRARIES)
+
+endif()
@@ -27,27 +27,27 @@
 #  GCRYPT_LDFLAGS = ldflags to use to compile
 #

-FIND_PROGRAM(LIBGCRYPT_CONFIG_EXECUTABLE NAMES libgcrypt-config)
+find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES libgcrypt-config)

 set(GCRYPT_LDFLAGS)
 set(GCRYPT_CFLAGS)

-IF(LIBGCRYPT_CONFIG_EXECUTABLE)
+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)
+   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_CFLAGS} MATCHES "\n")
+      set(GCRYPT_CFLAGS " ")
+   endif()

-ENDIF(LIBGCRYPT_CONFIG_EXECUTABLE)
+endif()

 # 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)
+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)
+if(GCRYPT_FOUND)
+  mark_as_advanced(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+endif()
@@ -27,46 +27,45 @@
 #
 #  GETTEXT_FOUND = is gettext usable on system?

-IF(GETTEXT_FOUND)
+if(GETTEXT_FOUND)
   # Already in cache, be silent
-   SET(GETTEXT_FIND_QUIETLY TRUE)
-ENDIF(GETTEXT_FOUND)
+   set(GETTEXT_FIND_QUIETLY TRUE)
+endif()

-INCLUDE(CheckIncludeFiles)
-INCLUDE(CheckLibraryExists)
-INCLUDE(CheckFunctionExists)
+include(CheckIncludeFiles)
+include(CheckLibraryExists)
+include(CheckFunctionExists)

-FIND_PATH(LIBINTL_INCLUDE
+find_path(LIBINTL_INCLUDE
  NAMES libintl.h
  PATH /usr/local/include /usr/pkg/include /usr/include
 )

-SET(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE})
+set(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE})

-CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)
+check_include_files(libintl.h HAVE_LIBINTL_H)

-IF(HAVE_LIBINTL_H)
-
-  CHECK_FUNCTION_EXISTS(dgettext LIBC_HAS_DGETTEXT)
-  IF(LIBC_HAS_DGETTEXT)
-    SET(GETTEXT_FOUND TRUE)
-  ELSE(LIBC_HAS_DGETTEXT)
-    FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl
+if(HAVE_LIBINTL_H)
+  check_function_exists(dgettext LIBC_HAS_DGETTEXT)
+  if(LIBC_HAS_DGETTEXT)
+    set(GETTEXT_FOUND TRUE)
+  else()
+    find_library(LIBINTL_LIBRARY NAMES intl
      PATHS
      /usr/local/lib
      /usr/lib
      )
-    IF(LIBINTL_LIBRARY)
-      IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-        SET(CMAKE_REQUIRED_LIBRARIES "iconv")
-        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
-      ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
-      ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+    if(LIBINTL_LIBRARY)
+      if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+        set(CMAKE_REQUIRED_LIBRARIES "iconv")
+        check_library_exists(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
+      else()
+        check_library_exists(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
+      endif()

-      IF(LIBINTL_HAS_DGETTEXT)
-        SET(GETTEXT_FOUND TRUE)
-      ENDIF(LIBINTL_HAS_DGETTEXT)
-    ENDIF(LIBINTL_LIBRARY)
-  ENDIF(LIBC_HAS_DGETTEXT)
-ENDIF(HAVE_LIBINTL_H)
+      if(LIBINTL_HAS_DGETTEXT)
+        set(GETTEXT_FOUND TRUE)
+      endif()
+    endif()
+  endif()
+endif()
@@ -29,45 +29,45 @@
 #  GNUTLS_CFLAGS = cflags to use to compile
 #  GNUTLS_LDFLAGS = ldflags to use to compile

-IF(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
+if(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
   # Already in cache, be silent
   set(GNUTLS_FIND_QUIETLY TRUE)
-ENDIF(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
+endif()

-FIND_PROGRAM(PKG_CONFIG_EXECUTABLE NAMES pkg-config)
+find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config)

-EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix gnutls
+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix gnutls
   OUTPUT_VARIABLE GNUTLS_PREFIX
 )

-EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags gnutls
+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags gnutls
   OUTPUT_VARIABLE GNUTLS_CFLAGS
 )
-STRING(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_FLAGS}")
+string(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_CFLAGS}")

-EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --libs gnutls
+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --libs gnutls
   OUTPUT_VARIABLE GNUTLS_LDFLAGS
 )
-STRING(REGEX REPLACE "[\r\n]" "" GNUTLS_LDFLAGS "${GNUTLS_LDFLAGS}")
+string(REGEX REPLACE "[\r\n]" "" GNUTLS_LDFLAGS "${GNUTLS_LDFLAGS}")

-SET(GNUTLS_POSSIBLE_INCLUDE_PATH "${GNUTLS_PREFIX}/include")
-SET(GNUTLS_POSSIBLE_LIB_DIR "${GNUTLS_PREFIX}/lib")
+set(GNUTLS_POSSIBLE_INCLUDE_PATH "${GNUTLS_PREFIX}/include")
+set(GNUTLS_POSSIBLE_LIB_DIR "${GNUTLS_PREFIX}/lib")

-FIND_PATH(GNUTLS_INCLUDE_PATH
+find_path(GNUTLS_INCLUDE_PATH
  NAMES gnutls/gnutls.h
  PATHS GNUTLS_POSSIBLE_INCLUDE_PATH
 )

-FIND_LIBRARY(GNUTLS_LIBRARY
+find_library(GNUTLS_LIBRARY
  NAMES gnutls
  PATHS GNUTLS_POSSIBLE_LIB_DIR
 )

-IF (GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
-  SET(GNUTLS_FOUND TRUE)
-ENDIF (GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
+if(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
+  set(GNUTLS_FOUND TRUE)
+endif()

-MARK_AS_ADVANCED(
+mark_as_advanced(
  GNUTLS_INCLUDE_PATH
  GNUTLS_LIBRARY
  GNUTLS_CFLAGS
@@ -26,12 +26,20 @@
 # GUILE_INCLUDE_DIRS = Guile include directory
 # GUILE_LIBRARIES    = Link options to compile Guile

-IF(GUILE_FOUND)
+if(GUILE_FOUND)
   # Already in cache, be silent
-   SET(GUILE_FIND_QUIETLY TRUE)
-ENDIF(GUILE_FOUND)
+   set(GUILE_FIND_QUIETLY TRUE)
+endif()

-FIND_PACKAGE(PkgConfig)
-IF(PKG_CONFIG_FOUND)
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
  pkg_search_module(GUILE guile-2.0)
-ENDIF(PKG_CONFIG_FOUND)
+  if(GUILE_FOUND)
+    # check if variable "scm_install_gmp_memory_functions" exists
+    set(CMAKE_REQUIRED_INCLUDES ${GUILE_INCLUDE_DIRS})
+    set(CMAKE_REQUIRED_LIBRARIES ${GUILE_LDFLAGS})
+    check_symbol_exists(scm_install_gmp_memory_functions "libguile.h" HAVE_GUILE_GMP_MEMORY_FUNCTIONS)
+    set(CMAKE_REQUIRED_INCLUDES)
+    set(CMAKE_REQUIRED_LIBRARIES)
+  endif()
+endif()
@@ -28,45 +28,45 @@
 #
 #  ICONV_FOUND = is iconv usable on system?

-IF(ICONV_FOUND)
+if(ICONV_FOUND)
   # Already in cache, be silent
   set(ICONV_FIND_QUIETLY TRUE)
-ENDIF(ICONV_FOUND)
+endif()

-INCLUDE(CheckLibraryExists)
-INCLUDE(CheckFunctionExists)
+include(CheckLibraryExists)
+include(CheckFunctionExists)

-FIND_PATH(ICONV_INCLUDE_PATH
+find_path(ICONV_INCLUDE_PATH
  NAMES iconv.h
  PATHS /usr/include /usr/local/include /usr/pkg/include
 )

-FIND_LIBRARY(ICONV_LIBRARY
+find_library(ICONV_LIBRARY
  NAMES iconv
  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
 )

-IF(ICONV_INCLUDE_PATH)
-  IF(ICONV_LIBRARY)
-    STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
-    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)
-ENDIF(ICONV_INCLUDE_PATH)
+if(ICONV_INCLUDE_PATH)
+  if(ICONV_LIBRARY)
+    string(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
+    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()
+  else()
+    check_function_exists(iconv_open ICONV_FOUND)
+  endif()
+endif()

 include(CheckCSourceCompiles)

-IF(ICONV_LIBRARY)
-  SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
-  SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
-ENDIF(ICONV_LIBRARY)
+if(ICONV_LIBRARY)
+  set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
+  set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
+endif()

-SET(CMAKE_REQUIRED_FLAGS -Werror)
+set(CMAKE_REQUIRED_FLAGS -Werror)
 check_c_source_compiles("
  #include <iconv.h>
  int main(){
@@ -79,7 +79,8 @@ check_c_source_compiles("
    return 0;
  }
 " ICONV_2ARG_IS_CONST)
-MARK_AS_ADVANCED(
+
+mark_as_advanced(
  ICONV_INCLUDE_PATH
  ICONV_LIBRARY
  ICONV_FOUND
@@ -28,60 +28,12 @@
 #
 #  LUA_FOUND = is liblua usable on system?

-IF(LUA_FOUND)
+if(LUA_FOUND)
   # Already in cache, be silent
-   SET(LUA_FIND_QUIETLY TRUE)
-ENDIF(LUA_FOUND)
+   set(LUA_FIND_QUIETLY TRUE)
+endif()

-FIND_PATH(
-        LUA51_INCLUDE_PATH lua.h
-        PATHS /usr/include /usr/local/include /usr/pkg/include
-        PATH_SUFFIXES lua51 lua5.1 lua-5.1
-)
-
-FIND_LIBRARY(
-        LUA51_LIBRARY NAMES lua51 lua5.1 lua-5.1 lua
-        PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
-        PATH_SUFFIXES lua51 lua5.1 lua-5.1
-)
-
-IF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
-  SET(LUA_INCLUDE_PATH "${LUA51_INCLUDE_PATH}")
-  SET(LUA_LIBRARY "${LUA51_LIBRARY}")
-  SET(LUA_VERSION "5.1")
-  SET(LUA_FOUND TRUE)
-ELSE(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
-  FIND_PATH(
-        LUA50_INCLUDE_PATH lua.h
-        PATHS /usr/include /usr/local/include /usr/pkg/include
-        PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
-  )
-
-  FIND_LIBRARY(
-        LUA50_LIBRARY NAMES lua50 lua5.0 lua-5.0 lua
-        PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
-        PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
-  )
-
-  FIND_LIBRARY(
-        LUALIB50_LIBRARY NAMES lualib50 lualib5.0 lualib-5.0 lualib
-        PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
-        PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
-  )
-
-  IF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY)
-    SET(LUA_INCLUDE_PATH "${LUA50_INCLUDE_PATH}")
-    SET(LUA_LIBRARY "${LUA50_LIBRARY}")
-    SET(LUALIB_LIBRARY "${LUALIB50_LIBRARY}")
-    SET(LUA_VERSION "5.0")
-    SET(LUA_FOUND TRUE)
-  ENDIF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY)
-ENDIF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
-
-
-MARK_AS_ADVANCED(
-  LUA_INCLUDE_PATH
-  LUA_LIBRARY
-  LUALIB_LIBRARY
-#  LUA_VERSION
-)
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
+endif()
@@ -17,41 +17,41 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-IF(NCURSES_FOUND)
-  SET(NCURSES_FIND_QUIETLY TRUE)
-ENDIF(NCURSES_FOUND)
+if(NCURSES_FOUND)
+  set(NCURSES_FIND_QUIETLY TRUE)
+endif()

-FIND_PATH(NCURSES_INCLUDE_PATH
+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/ncurses /usr/local/include
  /usr/pkg/include/ncursesw /usr/pkg/include/ncurses /usr/pkg/include
 )

-FIND_LIBRARY(NCURSESW_LIBRARY
+find_library(NCURSESW_LIBRARY
  NAMES ncursesw
  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
 )

-IF (NCURSESW_LIBRARY)
-  SET(NCURSES_LIBRARY ${NCURSESW_LIBRARY})
-ELSE(NCURSESW_LIBRARY)
-  FIND_LIBRARY(NCURSES_LIBRARY
+if(NCURSESW_LIBRARY)
+  set(NCURSES_LIBRARY ${NCURSESW_LIBRARY})
+else()
+  find_library(NCURSES_LIBRARY
    NAMES ncurses
    PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
  )
-  IF (NCURSES_LIBRARY)
-    MESSAGE("*** WARNING:\n"
+  if(NCURSES_LIBRARY)
+    message("*** WARNING:\n"
      "*** ncursesw library not found! Falling back to \"ncurses\"\n"
      "*** Be careful, UTF-8 display may not work properly if your locale is UTF-8.")
-  ENDIF(NCURSES_LIBRARY)
-ENDIF(NCURSESW_LIBRARY)
+  endif()
+endif()

-IF (NCURSES_INCLUDE_PATH AND NCURSES_LIBRARY)
-  SET(NCURSES_FOUND TRUE)
-ENDIF(NCURSES_INCLUDE_PATH AND NCURSES_LIBRARY)
+if(NCURSES_INCLUDE_PATH AND NCURSES_LIBRARY)
+  set(NCURSES_FOUND TRUE)
+endif()

-MARK_AS_ADVANCED(
+mark_as_advanced(
  NCURSES_INCLUDE_PATH
  NCURSES_LIBRARY
 )
@@ -28,58 +28,57 @@
 #  PERL_CFLAGS = perl compiler options for compiling
 #  PERL_LFLAGS = perl compiler options for linking

-IF(PERL_FOUND)
+if(PERL_FOUND)
   # Already in cache, be silent
-   SET(PERL_FIND_QUIETLY TRUE)
-ENDIF(PERL_FOUND)
+   set(PERL_FIND_QUIETLY TRUE)
+endif()

-FIND_PROGRAM(PERL_EXECUTABLE
+find_program(PERL_EXECUTABLE
  NAMES perl perl5
  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
  )

-IF(PERL_EXECUTABLE)
+if(PERL_EXECUTABLE)

-  EXECUTE_PROCESS(
+  execute_process(
    COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \"\$Config{archlibexp}/CORE\""
    OUTPUT_VARIABLE PERL_INTERNAL_DIR
    )

-  EXECUTE_PROCESS(
+  execute_process(
    COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts
    OUTPUT_VARIABLE PERL_CFLAGS
    )

-  EXECUTE_PROCESS(
+  execute_process(
    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}")
+  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
+  find_path(PERL_INCLUDE_PATH
    NAMES perl.h
    PATHS ${PERL_INTERNAL_DIR}
    )

-  FIND_LIBRARY(PERL_LIBRARY
+  find_library(PERL_LIBRARY
    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)
+  if(PERL_LIBRARY AND PERL_INCLUDE_PATH)
+    set(PERL_FOUND TRUE)
+  endif()

-  MARK_AS_ADVANCED(
+  mark_as_advanced(
    PERL_EXECUTABLE
    PERL_INCLUDE_PATH
    PERL_LIBRARY
    PERL_CFLAGS
    PERL_LFLAGS
    )
-ENDIF(PERL_EXECUTABLE)
-
+endif()
@@ -28,76 +28,76 @@
 #  PYTHON_LIBRARY = path to where libpython.so* can be found
 #  PYTHON_LFLAGS = python compiler options for linking

-IF(PYTHON_FOUND)
+if(PYTHON_FOUND)
   # Already in cache, be silent
-   SET(PYTHON_FIND_QUIETLY TRUE)
-ENDIF(PYTHON_FOUND)
+   set(PYTHON_FIND_QUIETLY TRUE)
+endif()

-IF(ENABLE_PYTHON3)
-  FIND_PROGRAM(PYTHON_EXECUTABLE
+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
+else()
+  find_program(PYTHON_EXECUTABLE
    NAMES python2.7 python2.6 python2.5 python
    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
    )
-ENDIF(ENABLE_PYTHON3)
+endif()

-IF(PYTHON_EXECUTABLE)
-  EXECUTE_PROCESS(
+if(PYTHON_EXECUTABLE)
+  execute_process(
    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('INCLUDEPY'))"
    OUTPUT_VARIABLE PYTHON_INC_DIR
    )

-  EXECUTE_PROCESS(
+  execute_process(
    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(
+  execute_process(
    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LINKFORSHARED'))"
    OUTPUT_VARIABLE PYTHON_LFLAGS
    )

-  FIND_PATH(PYTHON_INCLUDE_PATH
+  find_path(PYTHON_INCLUDE_PATH
    NAMES Python.h
-    PATHS ${PYTHON_INC_DIR}
+    HINTS ${PYTHON_INC_DIR}
    )
-  IF(ENABLE_PYTHON3)
-    FIND_LIBRARY(PYTHON_LIBRARY
+  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}
+      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
      )
-  ELSE(ENABLE_PYTHON3)
-    FIND_LIBRARY(PYTHON_LIBRARY
+  else()
+    find_library(PYTHON_LIBRARY
      NAMES python2.7 python2.6 python2.5 python
-      PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
      )
-  ENDIF(ENABLE_PYTHON3)
+  endif()

-  IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
-    EXECUTE_PROCESS(
+  if(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
+    execute_process(
      COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])"
      OUTPUT_VARIABLE PYTHON_VERSION
      )
-    EXECUTE_PROCESS(
+    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)
+    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()
+  endif()

-  MARK_AS_ADVANCED(
+  mark_as_advanced(
    PYTHON_EXECUTABLE
    PYTHON_INCLUDE_PATH
    PYTHON_LIBRARY
    PYTHON_LFLAGS
    )

-ENDIF(PYTHON_EXECUTABLE)
+endif()
@@ -22,71 +22,62 @@
 # and libraries are. It also determines what the name of the library is. This
 # code sets the following variables:
 #
-#  RUBY_EXECUTABLE   = full path to the ruby binary
-#  RUBY_INCLUDE_PATH = path to where ruby.h can be found
-#  RUBY_LIBRARY = path to where libruby.so* can be found
+#  RUBY_INCLUDE_DIRS = C flags to compile with ruby
+#  RUBY_LIBRARY_DIRS = linker flags to compile with ruby (found with pkg-config)
+#  RUBY_LIB          = ruby library (found without pkg-config)

-IF(RUBY_FOUND)
+if(RUBY_FOUND)
   # Already in cache, be silent
-   SET(RUBY_FIND_QUIETLY TRUE)
-ENDIF(RUBY_FOUND)
+   set(RUBY_FIND_QUIETLY TRUE)
+endif()

-FIND_PROGRAM(RUBY_EXECUTABLE
-  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
-  )
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(RUBY ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
+endif()

-IF(RUBY_EXECUTABLE)
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
-    OUTPUT_VARIABLE RUBY_ARCH_DIR
+if(RUBY_FOUND)
+  set(RUBY_LIB "")
+  mark_as_advanced(RUBY_LIB)
+else()
+  find_program(RUBY_EXECUTABLE
+    NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
+    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']"
-    OUTPUT_VARIABLE RUBY_ARCH
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
-    OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
-    OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
-    )
-
-  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['ruby_version']"
-    OUTPUT_VARIABLE RUBY_VERSION
-    )
-
-  FIND_PATH(RUBY_INCLUDE_PATH
-    NAMES ruby.h
-    PATHS ${RUBY_ARCH_DIR}
-    )
-
-  SET(RUBY_ARCH
-    "${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")
-
-  FIND_LIBRARY(RUBY_LIBRARY
-    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
-    RUBY_ARCH
-    RUBY_INCLUDE_PATH
-    )
-ENDIF(RUBY_EXECUTABLE)
+  if(RUBY_EXECUTABLE)
+    execute_process(
+      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 "print RbConfig::CONFIG['arch']"
+      OUTPUT_VARIABLE RUBY_ARCH
+      )
+    execute_process(
+      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
+      OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
+      )
+    execute_process(
+      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
+      OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
+      )
+    find_path(RUBY_INCLUDE_DIRS
+      NAMES ruby.h
+      PATHS ${RUBY_ARCH_DIR}
+      )
+    set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}")
+    find_library(RUBY_LIB
+      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 ruby
+      PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
+      )
+    if(RUBY_LIB AND RUBY_INCLUDE_DIRS)
+      set(RUBY_FOUND TRUE)
+    endif()
+    set(RUBY_INCLUDE_DIRS "${RUBY_INCLUDE_DIRS};${RUBY_INCLUDE_ARCH}")
+    mark_as_advanced(
+      RUBY_INCLUDE_DIRS
+      RUBY_LIBRARY_DIRS
+      RUBY_LIB
+      )
+  endif()
+endif()
@@ -21,19 +21,19 @@
 # - Find Source-Highlight
 # This module finds if source-highlight is installed.

-IF (SOURCEHIGHLIGHT_FOUND)
+if(SOURCEHIGHLIGHT_FOUND)
  # Already in cache, be silent
-  SET(SOURCEHIGHLIGHT_FIND_QUIETLY TRUE)
-ENDIF (SOURCEHIGHLIGHT_FOUND)
+  set(SOURCEHIGHLIGHT_FIND_QUIETLY TRUE)
+endif()

-FIND_PROGRAM(
+find_program(
  SOURCEHIGHLIGHT_EXECUTABLE source-highlight
  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
 )

-IF(SOURCEHIGHLIGHT_EXECUTABLE)
-  SET(SOURCEHIGHLIGHT_FOUND TRUE)
-  MARK_AS_ADVANCED(
+if(SOURCEHIGHLIGHT_EXECUTABLE)
+  set(SOURCEHIGHLIGHT_FOUND TRUE)
+  mark_as_advanced(
    SOURCEHIGHLIGHT_EXECUTABLE
    )
-ENDIF(SOURCEHIGHLIGHT_EXECUTABLE)
+endif()
@@ -51,26 +51,26 @@
 #      this point it is safer you ask directly where the *source* tree is
 #      and dig from there.

-IF(TCL_FOUND)
-  SET(TCL_FIND_QUIETLY TRUE)
-ENDIF(TCL_FOUND)
+if(TCL_FOUND)
+  set(TCL_FIND_QUIETLY TRUE)
+endif()

-INCLUDE(CMakeFindFrameworks)
-INCLUDE(FindTclsh)
+include(CMakeFindFrameworks)
+include(FindTclsh)

-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
-STRING(REGEX REPLACE
+get_filename_component(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
+get_filename_component(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
+string(REGEX REPLACE
  "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")

-GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
+get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)

-GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
-GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
-STRING(REGEX REPLACE
+get_filename_component(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
+get_filename_component(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
+string(REGEX REPLACE
  "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_VERSION "${TCL_LIBRARY}")

-SET(TCL_POSSIBLE_LIB_PATHS
+set(TCL_POSSIBLE_LIB_PATHS
  "${TCL_INCLUDE_PATH_PARENT}/lib"
  "${TCL_INCLUDE_PATH_PARENT}/lib64"
  "${TCL_LIBRARY_PATH}"
@@ -82,12 +82,12 @@ SET(TCL_POSSIBLE_LIB_PATHS
  /usr/local/lib64
  )

-IF(WIN32)
-  GET_FILENAME_COMPONENT(
+if(WIN32)
+  get_filename_component(
    ActiveTcl_CurrentVersion
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
    NAME)
-  SET(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
+  set(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib"
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib"
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib"
@@ -95,9 +95,9 @@ IF(WIN32)
    "C:/Program Files/Tcl/lib"
    "C:/Tcl/lib"
    )
-ENDIF(WIN32)
+endif()

-FIND_LIBRARY(TCL_LIBRARY
+find_library(TCL_LIBRARY
  NAMES
  tcl86 tcl8.6
  tcl85 tcl8.5
@@ -106,18 +106,18 @@ FIND_LIBRARY(TCL_LIBRARY
  PATHS ${TCL_POSSIBLE_LIB_PATHS}
  )

-CMAKE_FIND_FRAMEWORKS(Tcl)
+cmake_find_frameworks(Tcl)

-SET(TCL_FRAMEWORK_INCLUDES)
-IF(Tcl_FRAMEWORKS)
-  IF(NOT TCL_INCLUDE_PATH)
-    FOREACH(dir ${Tcl_FRAMEWORKS})
-      SET(TCL_FRAMEWORK_INCLUDES ${TCL_FRAMEWORK_INCLUDES} ${dir}/Headers)
-    ENDFOREACH(dir)
-  ENDIF(NOT TCL_INCLUDE_PATH)
-ENDIF(Tcl_FRAMEWORKS)
+set(TCL_FRAMEWORK_INCLUDES)
+if(Tcl_FRAMEWORKS)
+  if(NOT TCL_INCLUDE_PATH)
+    foreach(dir ${Tcl_FRAMEWORKS})
+      set(TCL_FRAMEWORK_INCLUDES ${TCL_FRAMEWORK_INCLUDES} ${dir}/Headers)
+    endforeach(dir)
+  endif()
+endif()

-SET(TCL_POSSIBLE_INCLUDE_PATHS
+set(TCL_POSSIBLE_INCLUDE_PATHS
  "${TCL_LIBRARY_PATH_PARENT}/include"
  "${TCL_INCLUDE_PATH}"
  ${TCL_FRAMEWORK_INCLUDES}
@@ -132,9 +132,8 @@ SET(TCL_POSSIBLE_INCLUDE_PATHS
  /usr/local/include/tcl8.5
  )

-
-IF(WIN32)
-  SET(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
+if(WIN32)
+  set(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include"
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include"
@@ -142,21 +141,21 @@ IF(WIN32)
    "C:/Program Files/Tcl/include"
    "C:/Tcl/include"
    )
-ENDIF(WIN32)
+endif()

-FIND_PATH(TCL_INCLUDE_PATH
+find_path(TCL_INCLUDE_PATH
  NAMES tcl.h
  PATHS ${TCL_POSSIBLE_INCLUDE_PATHS}
  )

-IF(TCL_LIBRARY AND TCL_INCLUDE_PATH)
-  SET(TCL_VERSION ${TCL_VERSION})
-  SET(TCL_LIBARY ${TCL_LIBRARY})
-  SET(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH})
-  SET(TCL_FOUND TRUE)
-ENDIF(TCL_LIBRARY AND TCL_INCLUDE_PATH)
+if(TCL_LIBRARY AND TCL_INCLUDE_PATH)
+  set(TCL_VERSION ${TCL_VERSION})
+  set(TCL_LIBARY ${TCL_LIBRARY})
+  set(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH})
+  set(TCL_FOUND TRUE)
+endif()

-MARK_AS_ADVANCED(
+mark_as_advanced(
  TCL_INCLUDE_PATH
  TCL_LIBRARY
  TCL_VERSION
@@ -31,48 +31,47 @@
 # (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"
+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)
+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 \"[^\"]*\"$")
+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}")
+  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]+).*$")
+  # 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()

-    SET(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
-    SET(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
-    SET(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
-ENDIF()
+  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()
+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()
@@ -17,23 +17,24 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+endif()

-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 \"$ENV{DESTDIR}${file}\"")
-  IF(EXISTS "$ENV{DESTDIR}${file}")
-    EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+string(REGEX REPLACE ";$" "" files "${files}")
+list(REVERSE files)
+foreach(file ${files})
+  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)
+    if("${rm_retval}" GREATER 0)
+      message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+    endif()
+  else()
+    message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+  endif()
+endforeach(file)
@@ -7,6 +7,8 @@
 #cmakedefine HAVE_MALLINFO
 #cmakedefine HAVE_EAT_NEWLINE_GLITCH
 #cmakedefine HAVE_ASPELL_VERSION_STRING
+#cmakedefine HAVE_ENCHANT_GET_VERSION
+#cmakedefine HAVE_GUILE_GMP_MEMORY_FUNCTIONS
 #define PACKAGE_VERSION "@VERSION@"
 #define PACKAGE "@PROJECT_NAME@"
 #define PACKAGE_NAME "@PROJECT_NAME@"
@@ -24,14 +24,15 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.4.3-rc1, flashcode@flashtux.org)
+AC_INIT(WeeChat, 1.1-rc1, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign])
 LICENSE="GPL3"

 # Checks for programs
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_MAKE_SET
 AC_GNU_SOURCE
 AC_PROG_LN_S
@@ -101,14 +102,16 @@ 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([HAVE_ASPELL_VERSION_STRING], [#undef HAVE_ASPELL_VERSION_STRING])
+AH_VERBATIM([HAVE_ENCHANT_GET_VERSION], [#undef HAVE_ENCHANT_GET_VERSION])
+AH_VERBATIM([HAVE_GUILE_GMP_MEMORY_FUNCTIONS], [#undef HAVE_GUILE_GMP_MEMORY_FUNCTIONS])
 AH_VERBATIM([PLUGIN_ALIAS], [#undef PLUGIN_ALIAS])
 AH_VERBATIM([PLUGIN_ASPELL], [#undef PLUGIN_ASPELL])
 AH_VERBATIM([PLUGIN_CHARSET], [#undef PLUGIN_CHARSET])
+AH_VERBATIM([PLUGIN_EXEC], [#undef PLUGIN_EXEC])
 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])
@@ -116,7 +119,9 @@ 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_TRIGGER], [#undef PLUGIN_TRIGGER])
 AH_VERBATIM([PLUGIN_XFER], [#undef PLUGIN_XFER])
+AH_VERBATIM([TESTS], [#undef TESTS])
 AH_VERBATIM([MAN], [#undef MAN])
 AH_VERBATIM([DOC], [#undef DOC])
 AH_VERBATIM([WEECHAT_HOME], [#define WEECHAT_HOME "~/.weechat"])
@@ -131,11 +136,11 @@ AC_ARG_ENABLE(alias,        [  --disable-alias         turn off Alias plugin (de
 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(exec,         [  --disable-exec          turn off Exec plugin (default=compiled)],enable_exec=$enableval,enable_exec=yes)
 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(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)
@@ -145,14 +150,13 @@ AC_ARG_ENABLE(ruby,         [  --disable-ruby          turn off Ruby script plug
 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(trigger,      [  --disable-trigger       turn off Trigger plugin (default=compiled)],enable_trigger=$enableval,enable_trigger=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_WITH(debug,          [  --with-debug            debugging: 0=no debug, 1=debug compilation (default=1)],debug=$withval,debug=1)
+AC_ARG_ENABLE(tests,        [  --enable-tests          turn on build of tests (default=not built)],enable_tests=$enableval,enable_tests=no)
 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".])
@@ -252,7 +256,7 @@ if test "x$ac_found_iconv_header" = "xyes" ; then
                return 0;
            }
            return 1;
-      }],iconv_found="yes")
+      }],iconv_found="yes", iconv_found="no", iconv_found="assume-yes")
  if test "x$iconv_found" = "xno" ; then
     AC_MSG_RESULT(no)
  else
@@ -302,6 +306,23 @@ if test "x$enable_aspell" = "xyes" ; then
    if test "x$ac_found_enchant_lib" = "xyes" ; then
        CFLAGS="$CFLAGS -DUSE_ENCHANT"
        ASPELL_LIB_USED="enchant"
+
+        # check if function enchant_get_version() exists
+        ac_save_CFLAGS="$CFLAGS"
+        ac_save_LDFLAGS="$LDFLAGS"
+        CFLAGS="$CFLAGS $ENCHANT_CFLAGS"
+        LDFLAGS="$LDFLAGS $ENCHANT_LIBS"
+        AC_CACHE_CHECK([for enchant_get_version() support], ac_cv_have_enchant_get_version, [
+        AC_LINK_IFELSE([AC_LANG_PROGRAM(
+            [[ #include <enchant.h>]],
+            [[ const char *version = enchant_get_version(); ]])],
+            [ ac_have_enchant_get_version="yes" ],
+            [ ac_have_enchant_get_version="no" ])])
+        CFLAGS="$ac_save_CFLAGS"
+        LDFLAGS="$ac_save_LDFLAGS"
+        if test "x$ac_have_enchant_get_version" = "xyes"; then
+            AC_DEFINE(HAVE_ENCHANT_GET_VERSION)
+        fi
    else
        ASPELL_CFLAGS=""
        ASPELL_LFLAGS=""
@@ -322,6 +343,8 @@ if test "x$enable_aspell" = "xyes" ; then
            AC_MSG_RESULT(yes)
            ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
            ASPELL_LIB_USED="aspell"
+
+            # check if function aspell_version_string() exists
            ac_save_LDFLAGS="$LDFLAGS"
            LDFLAGS="$LDFLAGS $ASPELL_LFLAGS"
            AC_CACHE_CHECK([for aspell_version_string() support], ac_cv_have_aspell_version_string, [
@@ -358,6 +381,18 @@ else
    not_asked="$not_asked charset"
 fi

+# ---------------------------------- exec --------------------------------------
+
+if test "x$enable_exec" = "xyes" ; then
+    EXEC_CFLAGS=""
+    EXEC_LFLAGS=""
+    AC_SUBST(EXEC_CFLAGS)
+    AC_SUBST(EXEC_LFLAGS)
+    AC_DEFINE(PLUGIN_EXEC)
+else
+    not_asked="$not_asked exec"
+fi
+
 # ---------------------------------- fifo --------------------------------------

 if test "x$enable_fifo" = "xyes" ; then
@@ -402,14 +437,6 @@ else
    not_asked="$not_asked relay"
 fi

-# ------------------------------- rmodifier ------------------------------------
-
-if test "x$enable_rmodifier" = "xyes" ; then
-    AC_DEFINE(PLUGIN_RMODIFIER)
-else
-    not_asked="$not_asked rmodifier"
-fi
-
 # --------------------------------- script -------------------------------------

 if test "x$enable_script" = "xyes" ; then
@@ -435,7 +462,7 @@ if test "x$enable_perl" = "xyes" ; then
        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`
+        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 -e ldopts) 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`
@@ -553,31 +580,34 @@ fi
 RUBY_VERSION=

 if test "x$enable_ruby" = "xyes" ; then
-    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_CFLAGS=""
+    RUBY_LFLAGS=""
+    for v in "2.1" "2.0" "1.9" "1.8" ; do
+        pkgconfig_ruby_found=`$PKGCONFIG --exists ruby-$v 2>/dev/null`
+        if test "x$?" = "x0" ; then
+            RUBY_VERSION=`$PKGCONFIG --modversion ruby-$v`
+            RUBY_CFLAGS=`$PKGCONFIG --cflags ruby-$v`
+            RUBY_LFLAGS=`$PKGCONFIG --libs ruby-$v`
+            break
+        fi
+    done
+
+    if test "x$RUBY_CFLAGS" = "x" -o "x$RUBY_LFLAGS" = "x" ; then
+        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.
 *** Please check that ruby is in path, or install it with your software package manager.
-*** WeeChat will be built without Ruby support.])
-        enable_ruby="no"
-        not_found="$not_found ruby"
-    else
-        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.
-*** Ruby 1.9.0 is an unstable release and should not be used in production.
-*** Please install Ruby 1.8.x (>= 1.8.6) or >= 1.9.1.
 *** WeeChat will be built without Ruby support.])
            enable_ruby="no"
            not_found="$not_found ruby"
        else
+            RUBY_VERSION=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG[['MAJOR']] + '.' + RbConfig::CONFIG[['MINOR']] + '.' + RbConfig::CONFIG[['TEENY']]"`
            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 RbConfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,3]]"`
-                RUBY_CFLAGS="-I$RUBY_INCLUDE/ -I$RUBY_INCLUDE/$RUBY_ARCH -DRUBY_VERSION=$M_RUBY_VERSION"
+                RUBY_CFLAGS="-I$RUBY_INCLUDE/ -I$RUBY_INCLUDE/$RUBY_ARCH"
            else
                AC_MSG_WARN([
 *** Ruby header files couldn't be found on your system.
@@ -621,32 +651,28 @@ if test "x$enable_lua" = "xyes" ; then
    fi

    if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
-        PKGCONFIG=""
-        AC_CHECK_PROGS(PKGCONFIG, pkg-config)
-        if test "x$PKGCONFIG" != "x"; then
-            AC_MSG_CHECKING(for Lua headers and librairies with pkg-config)
-            echo
-            for l in "$lua_suffix" "" "51" "5.1" "50" "5.0" ; do
-                pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null`
-                if test "x$?" = "x0" ; then
-                    LUA_VERSION=`$PKGCONFIG --modversion lua$l`
-                    LUA_CFLAGS="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
-                    LUA_LFLAGS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
+        AC_MSG_CHECKING(for Lua headers and librairies with pkg-config)
+        echo
+        for l in "$lua_suffix" "" "52" "5.2" "51" "5.1" "50" "5.0" ; do
+            pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null`
+            if test "x$?" = "x0" ; then
+                LUA_VERSION=`$PKGCONFIG --modversion lua$l`
+                LUA_CFLAGS="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
+                LUA_LFLAGS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`

-                    pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
-                    if test  "x$?" = "x0"; then
-                        LUA_CFLAGS="$LUA_CFLAGS "`$PKGCONFIG --cflags lualib$l`
-                        LUA_LFLAGS="$LUA_LFLAGS "`$PKGCONFIG --libs lualib$l`
-                    fi
-                    break
+                pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
+                if test  "x$?" = "x0"; then
+                    LUA_CFLAGS="$LUA_CFLAGS "`$PKGCONFIG --cflags lualib$l`
+                    LUA_LFLAGS="$LUA_LFLAGS "`$PKGCONFIG --libs lualib$l`
                fi
-            done
-        fi
+                break
+            fi
+        done
    fi

    if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
        LUACONFIG=""
-        AC_CHECK_PROGS(LUACONFIG, lua-config lua-config51 lua-config5.1 lua-config50 lua-config5.0)
+        AC_CHECK_PROGS(LUACONFIG, lua-config lua-config52 lua-config5.2 lua-config51 lua-config5.1 lua-config50 lua-config5.0)
        if test "x$LUACONFIG" != "x" ; then
            AC_MSG_CHECKING(for Lua headers and librairies with lua-config)
            echo
@@ -664,7 +690,7 @@ if test "x$enable_lua" = "xyes" ; then
        if test "x$ac_found_lua_header" = "xyes" -a "x$ac_found_liblua_header" = "xyes"; then
            LUA_CFLAGS="$CFLAGS"
        fi
-        for l in "$lua_suffix" "" "51" "5.1" "50" "5.0" ; do
+        for l in "$lua_suffix" "" "52" "5.2" "51" "5.1" "50" "5.0" ; do
            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"
@@ -773,24 +799,37 @@ 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
+    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

-    if test "x$guile_found" = "xno" ; then
+    if test "x$guile_found" = "xyes" ; then
+        # check if variable "scm_install_gmp_memory_functions" exists
+        ac_save_CFLAGS="$CFLAGS"
+        ac_save_LDFLAGS="$LDFLAGS"
+        CFLAGS="$CFLAGS $GUILE_CFLAGS"
+        LDFLAGS="$LDFLAGS $GUILE_LFLAGS"
+        AC_CACHE_CHECK([for variable scm_install_gmp_memory_functions], ac_cv_have_guile_gmp_memory_functions, [
+        AC_LINK_IFELSE([AC_LANG_PROGRAM(
+            [[ #include <libguile.h>]],
+            [[ scm_install_gmp_memory_functions = 0; ]])],
+            [ ac_have_guile_gmp_memory_functions="yes" ],
+            [ ac_have_guile_gmp_memory_functions="no" ])])
+        CFLAGS="$ac_save_CFLAGS"
+        LDFLAGS="$ac_save_LDFLAGS"
+        if test "x$ac_have_guile_gmp_memory_functions" = "xyes"; then
+            AC_DEFINE(HAVE_GUILE_GMP_MEMORY_FUNCTIONS)
+        fi
+    else
        AC_MSG_WARN([
 *** Guile >= 2.0 couldn't be found on your system.
 *** WeeChat will be built without Guile (scheme) support.])
@@ -805,6 +844,18 @@ if test "x$enable_guile" = "xyes" ; then
    AC_DEFINE(PLUGIN_GUILE)
 fi

+# --------------------------------- trigger ------------------------------------
+
+if test "x$enable_trigger" = "xyes" ; then
+    TRIGGER_CFLAGS=""
+    TRIGGER_LFLAGS=""
+    AC_SUBST(TRIGGER_CFLAGS)
+    AC_SUBST(TRIGGER_LFLAGS)
+    AC_DEFINE(PLUGIN_TRIGGER)
+else
+    not_asked="$not_asked trigger"
+fi
+
 # ---------------------------------- xfer --------------------------------------

 if test "x$enable_xfer" = "xyes" ; then
@@ -889,6 +940,7 @@ fi
 # ------------------------------------------------------------------------------
 #                               large file support
 # ------------------------------------------------------------------------------
+
 if test "x$enable_largefile" = "xyes" ; then
   CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_LARGE_FILES"
 else
@@ -970,6 +1022,36 @@ CURL_LFLAGS=`$CURL_CONFIG --libs`
 AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LFLAGS)

+# ------------------------------------------------------------------------------
+#                                    tests
+# ------------------------------------------------------------------------------
+
+if test "x$enable_tests" = "xyes" ; then
+    cpputest_found="no"
+    AC_MSG_CHECKING(for CppUTest headers and librairies)
+    echo
+    pkgconfig_cpputest_found=`$PKGCONFIG --exists cpputest 2>/dev/null`
+    if test "x$?" = "x0" ; then
+        CPPUTEST_VERSION=`$PKGCONFIG --modversion cpputest`
+        CPPUTEST_CFLAGS=`$PKGCONFIG --cflags cpputest`
+        CPPUTEST_LFLAGS=`$PKGCONFIG --libs cpputest`
+    else
+        AC_MSG_WARN([
+*** CppUTest couldn't be found on your system.
+*** WeeChat will be built without tests.])
+        enable_tests="no"
+        not_found="$not_found tests"
+    fi
+else
+    not_asked="$not_asked tests"
+fi
+
+if test "x$enable_tests" = "xyes" ; then
+    AC_SUBST(CPPUTEST_CFLAGS)
+    AC_SUBST(CPPUTEST_LFLAGS)
+    AC_DEFINE(TESTS)
+fi
+
 # ------------------------------------------------------------------------------
 #                           man page / documentation
 # ------------------------------------------------------------------------------
@@ -1058,7 +1140,7 @@ AC_DEFINE_UNQUOTED(WEECHAT_SHAREDIR, "$WEECHAT_SHAREDIR")
 weechat_libdir=${libdir}/weechat
 AC_SUBST(weechat_libdir)

-COMMON_CFLAGS="-Wall -W -Werror-implicit-function-declaration"
+COMMON_CFLAGS="-Wall -Wextra -Werror-implicit-function-declaration"
 AC_MSG_CHECKING([whether we have GNU assembler])
 GAS=`as --version < /dev/null 2>/dev/null | grep GNU`
 if test "$GAS"; then
@@ -1118,11 +1200,11 @@ AM_CONDITIONAL(GUI_NCURSES,             test "$enable_ncurses" = "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_EXEC,             test "$enable_exec" = "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")
@@ -1130,7 +1212,9 @@ 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_TRIGGER,          test "$enable_trigger" = "yes")
 AM_CONDITIONAL(PLUGIN_XFER,             test "$enable_xfer" = "yes")
+AM_CONDITIONAL(TESTS,                   test "$enable_tests" = "yes")
 AM_CONDITIONAL(MAN,                     test "$enable_man" = "yes")
 AM_CONDITIONAL(DOC,                     test "$enable_doc" = "yes")

@@ -1150,11 +1234,11 @@ AC_OUTPUT([Makefile
           src/plugins/alias/Makefile
           src/plugins/aspell/Makefile
           src/plugins/charset/Makefile
+           src/plugins/exec/Makefile
           src/plugins/fifo/Makefile
           src/plugins/irc/Makefile
           src/plugins/logger/Makefile
           src/plugins/relay/Makefile
-           src/plugins/rmodifier/Makefile
           src/plugins/script/Makefile
           src/plugins/perl/Makefile
           src/plugins/python/Makefile
@@ -1162,9 +1246,11 @@ AC_OUTPUT([Makefile
           src/plugins/lua/Makefile
           src/plugins/tcl/Makefile
           src/plugins/guile/Makefile
+           src/plugins/trigger/Makefile
           src/plugins/xfer/Makefile
           src/gui/Makefile
           src/gui/curses/Makefile
+           tests/Makefile
           intl/Makefile
           po/Makefile.in])

@@ -1193,6 +1279,9 @@ fi
 if test "x$enable_charset" = "xyes"; then
    listplugins="$listplugins charset"
 fi
+if test "x$enable_exec" = "xyes"; then
+    listplugins="$listplugins exec"
+fi
 if test "x$enable_fifo" = "xyes"; then
    listplugins="$listplugins fifo"
 fi
@@ -1205,9 +1294,6 @@ fi
 if test "x$enable_relay" = "xyes"; then
    listplugins="$listplugins relay"
 fi
-if test "x$enable_rmodifier" = "xyes"; then
-    listplugins="$listplugins rmodifier"
-fi
 if test "x$enable_script" = "xyes"; then
    listplugins="$listplugins script"
 fi
@@ -1229,6 +1315,9 @@ fi
 if test "x$enable_guile" = "xyes"; then
    listplugins="$listplugins guile($GUILE_VERSION)"
 fi
+if test "x$enable_trigger" = "xyes"; then
+    listplugins="$listplugins trigger"
+fi
 if test "x$enable_xfer" = "xyes"; then
    listplugins="$listplugins xfer"
 fi
@@ -1252,6 +1341,11 @@ if test "x$debug" != "x0"; then
    msg_debug="yes"
 fi

+msg_tests="no"
+if test "x$enable_tests" = "xyes"; then
+    msg_tests="yes"
+fi
+
 if test "x$msg_man" = "x"; then
    msg_man="no"
 else
@@ -1269,6 +1363,7 @@ echo "   Interfaces............. :$listgui"
 echo "   Plugins................ :$listplugins"
 echo "   Optional features...... :$listoptional"
 echo "   Compile with debug..... : $msg_debug"
+echo "   Compile tests.......... : $msg_tests"
 echo "   Man page............... : $msg_man"
 echo "   Documentation.......... : $msg_doc"
 echo "   Certificate authorities : ${CA_FILE}"
@@ -1,3 +1,90 @@
+weechat (1.0-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #758230, #751108)
+    - Remove the patch to fix FTBFS while building against ruby 2.1
+    - Fix the way to install upstream changelog
+    - Add new plugins (exec, trigger)
+    - Fix the way to install docs (upstream changes to asciidoc)
+  * Re-enable the build of guile plugin
+  * Fix various typos in packaging
+  * Update copyright years in debian/copyright
+  * Add new doc-base files (Relay Protocol in Japanese)
+  * Add git-buildpackage configuration
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 24 Aug 2014 17:40:36 +0200
+
+weechat (0.4.3-4) unstable; urgency=medium
+
+  * Fix FTBFS by adding a missing Build Depends on docbook-xml
+    (Closes:#753166)
+  * Update libgnutls and libgcrypt Build Depends to libgnutls28-dev and
+    libgcrypt20-dev (Closes: #753167)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 02 Jul 2014 23:42:41 +0200
+
+weechat (0.4.3-3) unstable; urgency=medium
+
+  * Add patch (backported from upstream) to fix a FTBFS while building
+    against ruby 2.1 (Closes: #747708)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 12 May 2014 12:49:14 +0200
+
+weechat (0.4.3-2) unstable; urgency=medium
+
+  * Add missing symlink for Polish manpage
+  * Change ruby-* Build-Depends to gem2deb so that ruby plugin will be
+    built against the newest Ruby interpreter available (Closes: #738685)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Thu, 13 Feb 2014 12:11:54 +0000
+
+weechat (0.4.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 3.9.5
+  * Update debian/watch to check upstream tarballs signatures
+  * Add new doc-base files:
+    - Devel guide in French and Japanese
+    - Plugins guide in Japanese
+    - Relay protocol guide in French
+    - User guide in Polish
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 10 Feb 2014 17:15:21 +0000
+
+weechat (0.4.2-3) unstable; urgency=low
+
+  * Fix FTBS while building without Internet access (add a missing build
+    dependency on docbook-xsl) (Closes: #727206)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 23 Oct 2013 20:54:08 +0000
+
+weechat (0.4.2-2) unstable; urgency=low
+
+  * Move dependencies from Build-Depends-Indep to Build-Depends (weechat-curses
+    as arch:any needs them to build manpages)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 08 Oct 2013 07:16:59 +0000
+
+weechat (0.4.2-1) unstable; urgency=low
+
+  * New upstream release
+    - Add build dependency on xsltproc
+    - Enable build of documentation and manpages (now disabled by default)
+    - Install new localized manpages
+    - weechat-curses renamed to weechat
+      o update packaging accordingly
+      o add symlinks for backward compatibility
+  * Refresh XPM menu icon following upstream changes
+  * Switch to debhelper >= 9
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 07 Oct 2013 21:40:15 +0000
+
+weechat (0.4.1-2) unstable; urgency=low
+
+  * Disable build of guile plugin (as guile-2.0-dev FTBFS on multiple
+    architectures)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 29 Jun 2013 14:48:33 +0000
+
 weechat (0.4.1-1) unstable; urgency=low

  * New upstream release
@@ -1 +1 @@
-7
+9
@@ -2,13 +2,28 @@ Source: weechat
 Section: net
 Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@debian.org>
-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, 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/
+Build-Depends:
+    asciidoc (>= 8.5),
+    source-highlight,
+    xsltproc,
+    docbook-xsl,
+    docbook-xml,
+    debhelper (>= 9),
+    cmake, pkg-config,
+    libncursesw5-dev,
+    gem2deb,
+    libperl-dev,
+    python-dev,
+    libaspell-dev,
+    liblua5.1-0-dev,
+    tcl8.5-dev,
+    guile-2.0-dev,
+    libcurl4-gnutls-dev,
+    libgcrypt20-dev,
+    libgnutls28-dev,
+    zlib1g-dev
+Standards-Version: 3.9.5
+Homepage: https://weechat.org/
 Vcs-Git: git://anonscm.debian.org/users/kolter/weechat.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/kolter/weechat.git

@@ -93,7 +108,7 @@ Description: Fast, light and extensible chat client - plugins
  - Spell checking (thanks to aspell)
  - FIFO pipe for remote control
  - IRC proxy
-  - Realtime input/output changes through regular expressions
+  - Trigger

 Package: weechat-doc
 Section: doc
@@ -109,7 +124,7 @@ Package: weechat-dev
 Section: devel
 Architecture: all
 Depends: ${misc:Depends}
-Description: Fast, light and extensible chat client - developement headers
+Description: Fast, light and extensible chat client - development headers
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -1,7 +1,7 @@
 Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
 Upstream-Name: weechat
 Upstream-Contact: Sébastien Helleu <flashcode@flashtux.org>
-Source: http://weechat.org/
+Source: https://weechat.org/

 Files: *
 Copyright: 2003-2014, Sébastien Helleu <flashcode@flashtux.org>
@@ -11,7 +11,7 @@ License: GPL-3+

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

 License: GPL-3+
@@ -0,0 +1,5 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = unstable
+upstream-tag = v%(version)s
+compression = xz
@@ -1,22 +1,14 @@
 #!/usr/bin/make -f

-# 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 \
+		-DENABLE_DOC:BOOL=ON \
+		-DENABLE_MAN:BOOL=ON \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
 		-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
@@ -26,18 +18,14 @@ $(BUILDDIR)/Makefile:
 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_installchangelogs:
+	dh_installchangelogs ChangeLog.asciidoc
+
 override_dh_strip:
 	dh_strip --dbg-package=weechat-dbg

@@ -0,0 +1 @@
+debian/upstream-signing-key.pgp
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes
@@ -1,2 +1,2 @@
-version=2
-http://weechat.org/files/src/weechat-(\d.*)\.tar\.bz2
+version=3
+opts=pgpsigurlmangle=s/$/.asc/  https://weechat.org/files/src/weechat-(\d.*)\.tar\.bz2
@@ -1,3 +1,4 @@
-AUTHORS
-NEWS
-README
+AUTHORS.asciidoc
+Contributing.asciidoc
+README.asciidoc
+ReleaseNotes.asciidoc
@@ -0,0 +1,7 @@
+usr/bin/weechat usr/bin/weechat-curses
+usr/share/man/man1/weechat.1.gz usr/share/man/man1/weechat-curses.1.gz
+usr/share/man/fr/man1/weechat.1.gz usr/share/man/fr/man1/weechat-curses.1.gz
+usr/share/man/ja/man1/weechat.1.gz usr/share/man/ja/man1/weechat-curses.1.gz
+usr/share/man/it/man1/weechat.1.gz usr/share/man/it/man1/weechat-curses.1.gz
+usr/share/man/de/man1/weechat.1.gz usr/share/man/de/man1/weechat-curses.1.gz
+usr/share/man/pl/man1/weechat.1.gz usr/share/man/pl/man1/weechat-curses.1.gz
@@ -1,5 +1,5 @@
 Document: weechat-dev-en
-Title: WeeChat Developer's Guide (English)
+Title: WeeChat developer's guide (English)
 Author: Sébastien Helleu
 Abstract: This manual describes WeeChat internals and
 how to contribute to WeeChat (English version).
@@ -0,0 +1,10 @@
+Document: weechat-dev-fr
+Title: WeeChat developer's guide (French)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat internals and
+ how to contribute to WeeChat (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_dev.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_dev.fr.html
@@ -1,5 +1,5 @@
 Document: weechat-dev-ja
-Title: WeeChat Developer's Guide (Japanese)
+Title: WeeChat developer's guide (Japanese)
 Author: Sébastien Helleu
 Abstract: This manual describes WeeChat internals and
 how to contribute to WeeChat (Japanese version).
@@ -1,5 +1,5 @@
 Document: weechat-plugin-en
-Title: WeeChat plugins API (English)
+Title: WeeChat plugin API reference (English)
 Author: Sébastien Helleu
 Abstract: This document describes the API to create plugins
 for WeeChat (English version).
@@ -1,5 +1,5 @@
 Document: weechat-plugin-fr
-Title: WeeChat plugins API (French)
+Title: WeeChat plugin API reference (French)
 Author: Sébastien Helleu
 Abstract: This document describes the API to create plugins
 for WeeChat (French version).
@@ -1,5 +1,5 @@
 Document: weechat-plugin-it
-Title: WeeChat plugins API (Italian)
+Title: WeeChat plugin API reference (Italian)
 Author: Sébastien Helleu
 Abstract: This document describes the API to create plugins
 for WeeChat (Italian version).
@@ -1,5 +1,5 @@
 Document: weechat-plugin-ja
-Title: WeeChat plugins API (Japanese)
+Title: WeeChat plugin API reference (Japanese)
 Author: Sébastien Helleu
 Abstract: This document describes the API to create plugins
 for WeeChat (Japanese version).
@@ -1,5 +1,5 @@
 Document: weechat-quickstart-de
-Title: WeeChat Quickstart (German)
+Title: WeeChat quick start guide (German)
 Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (German version).
 Section: Network/Communication
@@ -1,5 +1,5 @@
 Document: weechat-quickstart-en
-Title: WeeChat Quickstart (English)
+Title: WeeChat quick start guide (English)
 Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (English version).
 Section: Network/Communication
@@ -1,5 +1,5 @@
 Document: weechat-quickstart-es
-Title: WeeChat Quickstart (Spanish)
+Title: WeeChat quick start guide (Spanish)
 Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (Spanish version).
 Section: Network/Communication
@@ -1,5 +1,5 @@
 Document: weechat-quickstart-fr
-Title: WeeChat Quickstart (French)
+Title: WeeChat quick start guide (French)
 Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (French version).
 Section: Network/Communication
@@ -1,5 +1,5 @@
 Document: weechat-quickstart-it
-Title: WeeChat Quickstart (Italian)
+Title: WeeChat quick start guide (Italian)
 Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (Italian version).
 Section: Network/Communication
@@ -1,5 +1,5 @@
 Document: weechat-quickstart-ja
-Title: WeeChat Quickstart (Japanese)
+Title: WeeChat quick start guide (Japanese)
 Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (Japanese version).
 Section: Network/Communication
@@ -1,5 +1,5 @@
 Document: weechat-quickstart-pl
-Title: WeeChat Quickstart (Polish)
+Title: WeeChat quick start guide (Polish)
 Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (Polish version).
 Section: Network/Communication
@@ -1,5 +1,5 @@
 Document: weechat-quickstart-ru
-Title: WeeChat Quickstart (Russian)
+Title: WeeChat quick start guide (Russian)
 Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (Russian version).
 Section: Network/Communication
@@ -1,5 +1,5 @@
 Document: weechat-relay-protocol-en
-Title: WeeChat Relay Protocol (English)
+Title: WeeChat Relay protocol (English)
 Author: Sébastien Helleu
 Abstract: This manual describes WeeChat Relay Protocol, used by
 remote GUI to communicate with Relay plugin (English version).
@@ -0,0 +1,10 @@
+Document: weechat-relay-protocol-fr
+Title: WeeChat Relay protocol (French)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat Relay Protocol, used by
+ remote GUI to communicate with Relay plugin (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.fr.html
@@ -0,0 +1,10 @@
+Document: weechat-relay-protocol-ja
+Title: WeeChat Relay protocol (Japanese)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat Relay Protocol, used by
+ remote GUI to communicate with Relay plugin (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.ja.html
@@ -1,5 +1,5 @@
 Document: weechat-scripting-de
-Title: WeeChat Scripting Guide (German)
+Title: WeeChat scripting guide (German)
 Author: Sébastien Helleu
 Abstract: This document describes the API to create scripts
 for WeeChat (German version).
@@ -1,5 +1,5 @@
 Document: weechat-scripting-en
-Title: WeeChat Scripting Guide (English)
+Title: WeeChat scripting guide (English)
 Author: Sébastien Helleu
 Abstract: This document describes the API to create scripts
 for WeeChat (English version).
@@ -1,5 +1,5 @@
 Document: weechat-scripting-fr
-Title: WeeChat Scripting Guide (French)
+Title: WeeChat scripting guide (French)
 Author: Sébastien Helleu
 Abstract: This document describes the API to create scripts
 for WeeChat (French version).
@@ -1,5 +1,5 @@
 Document: weechat-scripting-it
-Title: WeeChat Scripting Guide (Italian)
+Title: WeeChat scripting guide (Italian)
 Author: Sébastien Helleu
 Abstract: This document describes the API to create scripts
 for WeeChat (Italian version).
@@ -1,5 +1,5 @@
 Document: weechat-scripting-ja
-Title: WeeChat Scripting Guide (Japanese)
+Title: WeeChat scripting guide (Japanese)
 Author: Sébastien Helleu
 Abstract: This document describes the API to create scripts
 for WeeChat (Japanese version).
@@ -1,5 +1,5 @@
 Document: weechat-scripting-pl
-Title: WeeChat Scripting Guide (Polish)
+Title: WeeChat scripting guide (Polish)
 Author: Sébastien Helleu
 Abstract: This document describes the API to create scripts
 for WeeChat (Polish version).
@@ -1,5 +1,5 @@
 Document: weechat-tester-de
-Title: WeeChat Tester's Guide (German)
+Title: WeeChat tester's guide (German)
 Author: Sébastien Helleu
 Abstract: This document describes how to test and report
 bugs against the WeeChat IRC Client (German version).
@@ -1,5 +1,5 @@
 Document: weechat-tester-en
-Title: WeeChat Tester's Guide (English)
+Title: WeeChat tester's guide (English)
 Author: Sébastien Helleu
 Abstract: This document describes how to test and report
 bugs against the WeeChat IRC Client (English version).
@@ -1,5 +1,5 @@
 Document: weechat-tester-fr
-Title: WeeChat Tester's Guide (French)
+Title: WeeChat tester's guide (French)
 Author: Sébastien Helleu
 Abstract: This document describes how to test and report
 bugs against the WeeChat IRC Client (French version).
@@ -1,5 +1,5 @@
 Document: weechat-tester-it
-Title: WeeChat Tester's Guide (Italian)
+Title: WeeChat tester's guide (Italian)
 Author: Sébastien Helleu
 Abstract: This document describes how to test and report
 bugs against the WeeChat IRC Client (Italian version).
@@ -1,5 +1,5 @@
 Document: weechat-tester-ja
-Title: WeeChat Tester's Guide (Japanese)
+Title: WeeChat tester's guide (Japanese)
 Author: Sébastien Helleu
 Abstract: This document describes how to test and report
 bugs against the WeeChat IRC Client (Japanese version).
@@ -1,5 +1,5 @@
 Document: weechat-tester-pl
-Title: WeeChat Tester's Guide (Polish)
+Title: WeeChat tester's guide (Polish)
 Author: Sébastien Helleu
 Abstract: This document describes how to test and report
 bugs against the WeeChat IRC Client (Polish version).
@@ -1,5 +1,5 @@
 Document: weechat-user-de
-Title: WeeChat User's Guide (German)
+Title: WeeChat user's guide (German)
 Author: Sébastien Helleu
 Abstract: This manual describes how to use the WeeChat
 IRC client (German version).
@@ -1,5 +1,5 @@
 Document: weechat-user-en
-Title: WeeChat User's Guide (English)
+Title: WeeChat user's guide (English)
 Author: Sébastien Helleu
 Abstract: This manual describes how to use the WeeChat
 IRC client (English version).
@@ -1,5 +1,5 @@
 Document: weechat-user-fr
-Title: WeeChat User's Guide (French)
+Title: WeeChat user's guide (French)
 Author: Sébastien Helleu
 Abstract: This manual describes how to use the WeeChat
 IRC client (French version).
@@ -1,5 +1,5 @@
 Document: weechat-user-it
-Title: WeeChat User's Guide (Italian)
+Title: WeeChat user's guide (Italian)
 Author: Sébastien Helleu
 Abstract: This manual describes how to use the WeeChat
 IRC client (Italian version).
@@ -1,5 +1,5 @@
 Document: weechat-user-ja
-Title: WeeChat User's Guide (Japanese)
+Title: WeeChat user's guide (Japanese)
 Author: Sébastien Helleu
 Abstract: This manual describes how to use the WeeChat
 IRC client (Japanese version).
@@ -1,5 +1,5 @@
 Document: weechat-user-pl
-Title: WeeChat User's Guide (Polish)
+Title: WeeChat user's guide (Polish)
 Author: Sébastien Helleu
 Abstract: This manual describes how to use the WeeChat
 IRC client (Polish version).
@@ -1,4 +1,5 @@
 usr/lib/weechat/plugins/aspell.so
+usr/lib/weechat/plugins/exec.so
 usr/lib/weechat/plugins/fifo.so
 usr/lib/weechat/plugins/guile.so
 usr/lib/weechat/plugins/perl.so
@@ -8,4 +9,4 @@ 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
+usr/lib/weechat/plugins/trigger.so
@@ -18,19 +18,17 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-IF(ENABLE_MAN OR ENABLE_DOC)
-
-  FIND_PACKAGE(Sourcehighlight)
-  FIND_PACKAGE(Asciidoc)
-  IF(ASCIIDOC_FOUND)
-    ADD_SUBDIRECTORY( en )
-    ADD_SUBDIRECTORY( fr )
-    ADD_SUBDIRECTORY( it )
-    ADD_SUBDIRECTORY( de )
-    ADD_SUBDIRECTORY( pl )
-    ADD_SUBDIRECTORY( es )
-    ADD_SUBDIRECTORY( ru )
-    ADD_SUBDIRECTORY( ja )
-  ENDIF(ASCIIDOC_FOUND)
-
-ENDIF(ENABLE_MAN OR ENABLE_DOC)
+if(ENABLE_MAN OR ENABLE_DOC)
+  find_package(Sourcehighlight)
+  find_package(Asciidoc)
+  if(ASCIIDOC_FOUND)
+    add_subdirectory(en)
+    add_subdirectory(fr)
+    add_subdirectory(it)
+    add_subdirectory(de)
+    add_subdirectory(pl)
+    add_subdirectory(es)
+    add_subdirectory(ru)
+    add_subdirectory(ja)
+  endif()
+endif()
@@ -6,8 +6,7 @@ key\[([^,\]]+),([^\]]+)\]=key[\1], key[\2]
 key\[(ctrl|alt|shift)\]=<span class="key \1">\1</span>
 key\[(ctrl|alt|shift)-\]=<span class="key \1">\1</span><span class="keyplus">+</span>
 key\[(ctrl|alt|shift)-([^\]]+)\]=<span class="key \1">\1</span><span class="keyplus">+</span>key[\2]
-key\[l\]=<span class="key">l</span><span class="keyplus"> (L)</span>
-key\[([A-Za-z0-9/_&\=])\]=<span class="key">\1</span>
-key\[([a-z0-9/_&\=][^\]]*)\]=<span class="key">\1</span>
+key\[([A-Za-z0-9/_&\=!-])\]=<span class="key">\1</span>
+key\[([a-z0-9/_&\=!-][^\]]*)\]=<span class="key">\1</span>
 key\[([^\]]+)\]=<span class="key other">\1</span>
 hex\[([0-9a-fA-F]+)\]=<span class="hexa">\1</span>
@@ -80,6 +80,8 @@ h5 {
 span.command {
  padding: .2em .5em;
  border: solid 1px #ccc;
+  border-radius: 4px;
+  box-shadow: 1px 1px 2px #ccc;
  margin-right: 12px;
  background: #eee;
  font-size: 1.1em;
@@ -122,48 +124,57 @@ dt.hdlist1 {
  word-wrap: break-word;
 }
 .key {
-  padding: 0 .3em;
+  padding: .1em .4em;
  border-top: solid 1px #d5d5e5;
  border-left: solid 1px #d5d5e5;
  border-bottom: solid 1px #a5a5b5;
  border-right: solid 1px #a5a5b5;
+  border-radius: 3px;
+  box-shadow: 1px 1px 3px #d5d5e5;
  margin: 0 2px;
  background: #eef;
-  font-family: serif, Helvetica, arial;
+  font-family: monospace;
  font-size: 1.1em;
-  line-height: 1.5em;
+  line-height: 1.6em;
 }
 .key.ctrl {
  border-top: solid 1px #dfd0d0;
  border-left: solid 1px #dfd0d0;
  border-bottom: solid 1px #afa0a0;
  border-right: solid 1px #afa0a0;
+  border-radius: 3px;
+  box-shadow: 1px 1px 3px #dfd0d0;
  background: #fff0f0;
-  font-variant: small-caps;
+  text-transform: capitalize;
 }
 .key.alt {
-  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;
+  border-top: solid 1px #dfc5b4;
+  border-left: solid 1px #dfc5b4;
+  border-bottom: solid 1px #af9484;
+  border-right: solid 1px #af9484;
+  border-radius: 3px;
+  box-shadow: 1px 1px 3px #dfc5b4;
+  background: #ffe4d4;
+  text-transform: capitalize;
 }
 .key.shift {
  border-top: solid 1px #d5d5d5;
  border-left: solid 1px #d5d5d5;
  border-bottom: solid 1px #a5a5a5;
  border-right: solid 1px #a5a5a5;
+  border-radius: 3px;
+  box-shadow: 1px 1px 3px #d5d5d5;
  background: #f5f5f5;
-  font-variant: small-caps;
+  text-transform: capitalize;
 }
 .key.other {
  border-top: solid 1px #d0e0d0;
  border-left: solid 1px #d0e0d0;
  border-bottom: solid 1px #a0b0a0;
  border-right: solid 1px #a0b0a0;
+  border-radius: 3px;
+  box-shadow: 1px 1px 3px #d0e0d0;
  background: #eafaea;
-  font-variant: small-caps;
 }
 .keyplus {
  font-size: .8em;
@@ -175,7 +186,6 @@ dt.hdlist1 {
  color: #007;
  font-family: monospace;
  font-size: .85em;
-  font-variant: small-caps;
 }
 #footer {
  border-top: 1px solid silver;
@@ -17,79 +17,79 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-IF (ENABLE_MAN)
+if(ENABLE_MAN)
  # man page
-  ADD_CUSTOM_COMMAND(
+  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.txt ${CMAKE_CURRENT_BINARY_DIR}/
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.txt ${CMAKE_CURRENT_BINARY_DIR}/
-    COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L ${CMAKE_CURRENT_BINARY_DIR}/weechat.1.de.txt
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.asciidoc ${CMAKE_CURRENT_BINARY_DIR}/
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.asciidoc ${CMAKE_CURRENT_BINARY_DIR}/
+    COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L ${CMAKE_CURRENT_BINARY_DIR}/weechat.1.de.asciidoc
    DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.asciidoc
    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)
+  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()

-IF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
+if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)

  # user's guide
-  ADD_CUSTOM_COMMAND(
+  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
-    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -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
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -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.asciidoc
    DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc
    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})
+  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})

  # scripting guide
-  ADD_CUSTOM_COMMAND(
+  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html
-    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -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_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -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_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.asciidoc
    DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.asciidoc
    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})
+  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})

  # FAQ
-  ADD_CUSTOM_COMMAND(
+  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html
-    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -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
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -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.asciidoc
    DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.asciidoc
    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})
+  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(
+  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html
-    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -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_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -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_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.asciidoc
    DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.asciidoc
    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})
+  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(
+  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html
-    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -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_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -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_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.asciidoc
    DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.asciidoc
    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})
+  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)
+endif()
@@ -21,14 +21,14 @@
 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 \
-             weechat_quickstart.de.txt \
-             weechat_tester.de.txt \
-             $(wildcard autogen/user/*.txt)
+             weechat.1.de.asciidoc \
+             cmdline_options.de.asciidoc \
+             weechat_user.de.asciidoc \
+             weechat_scripting.de.asciidoc \
+             weechat_faq.de.asciidoc \
+             weechat_quickstart.de.asciidoc \
+             weechat_tester.de.asciidoc \
+             $(wildcard autogen/user/*.asciidoc)

 if MAN
  man_targets = weechat.1
@@ -47,30 +47,30 @@ endif
 all-local: $(man_targets) $(doc_targets)

 # man page
-weechat.1: weechat.1.de.txt cmdline_options.de.txt
-	cp -f $(abs_top_srcdir)/doc/de/weechat.1.de.txt .
-	cp -f $(abs_top_srcdir)/doc/de/cmdline_options.de.txt .
-	$(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.de.txt
+weechat.1: weechat.1.de.asciidoc cmdline_options.de.asciidoc
+	cp -f $(abs_top_srcdir)/doc/de/weechat.1.de.asciidoc .
+	cp -f $(abs_top_srcdir)/doc/de/cmdline_options.de.asciidoc .
+	$(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.de.asciidoc

 # user's guide
-weechat_user.de.html: weechat_user.de.txt cmdline_options.de.txt $(wildcard autogen/user/*.txt)
-	$(ASCIIDOC) -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.asciidoc cmdline_options.de.asciidoc $(wildcard autogen/user/*.asciidoc)
+	$(ASCIIDOC) -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.asciidoc

 # scripting guide
-weechat_scripting.de.html: weechat_scripting.de.txt
-	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_scripting.de.html $(abs_top_srcdir)/doc/de/weechat_scripting.de.txt
+weechat_scripting.de.html: weechat_scripting.de.asciidoc
+	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_scripting.de.html $(abs_top_srcdir)/doc/de/weechat_scripting.de.asciidoc

 # FAQ
-weechat_faq.de.html: weechat_faq.de.txt
-	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.de.html $(abs_top_srcdir)/doc/de/weechat_faq.de.txt
+weechat_faq.de.html: weechat_faq.de.asciidoc
+	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.de.html $(abs_top_srcdir)/doc/de/weechat_faq.de.asciidoc

 # quickstart
-weechat_quickstart.de.html: weechat_quickstart.de.txt
-	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.de.html $(abs_top_srcdir)/doc/de/weechat_quickstart.de.txt
+weechat_quickstart.de.html: weechat_quickstart.de.asciidoc
+	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.de.html $(abs_top_srcdir)/doc/de/weechat_quickstart.de.asciidoc

 # tester's guide
-weechat_tester.de.html: weechat_tester.de.txt
-	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.txt
+weechat_tester.de.html: weechat_tester.de.asciidoc
+	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.asciidoc

 # install man/docs

@@ -99,5 +99,5 @@ uninstall-doc:
 # clean

 clean-local:
-	-rm -f weechat.1
+	-rm -f weechat.1 weechat.1.de.asciidoc cmdline_options.de.asciidoc
 	-rm -f *.html
@@ -10,9 +10,11 @@

 | aspell | aspell_langs | Liste aller Sprachen die durch Aspell unterstützt werden

+| exec | exec_commands_ids | IDs (Nummern und Namen) von ausgeführten Befehlen
+
 | guile | guile_script | Liste der Skripten

-| irc | irc_channel | Aktueller IRC-Channel
+| irc | irc_channel | aktueller IRC-Channel

 | irc | irc_channel_nicks_hosts | Liste der Nicks und Hostnamen des aktuellen Channels

@@ -24,7 +26,7 @@

 | irc | irc_msg_kick | Standardmitteilung wenn man jemanden aus einem Channel wirft

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

 | irc | irc_notify_nicks | Nicks für die eine Benachrichtigung existiert

@@ -56,8 +58,6 @@

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

-| rmodifier | rmodifier | Liste der rmodifier
-
 | ruby | ruby_script | Liste der Skripten

 | script | script_files | Dateien die sich in den Skript-Verzeichnissen befinden
@@ -70,9 +70,31 @@

 | tcl | tcl_script | Liste der Skripten

+| trigger | trigger_hook_arguments | Standardargumente für einen Hook
+
+| trigger | trigger_hook_command | Standardbefehl für einen Hook
+
+| trigger | trigger_hook_conditions | Standardbedingungen für einen Hook
+
+| trigger | trigger_hook_rc | Standardrückgabewerte für einen Hook-Callback
+
+| trigger | trigger_hook_regex | standardmäßiger regulärer Ausdruck für einen Hook
+
+| trigger | trigger_hooks | Hooks für Trigger
+
+| trigger | trigger_hooks_filter | Hooks für Trigger (definiert den Filter für den Monitor-Buffer)
+
+| trigger | trigger_names | trigger
+
+| trigger | trigger_names_default | voreingestellte Trigger
+
+| trigger | trigger_option_value | Werte für Trigger-Einstellung
+
+| trigger | trigger_options | Einstellungen für Trigger
+
 | weechat | bars_names | Namen der Infobars

-| weechat | bars_options | Optionen für Infobars
+| weechat | bars_options | Einstellungen für Infobars

 | weechat | buffer_properties_get | Eigenschaften die für den Buffer gelesen werden können

@@ -94,6 +116,10 @@

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

+| weechat | env_value | Wert einer Umgebungsvariable
+
+| weechat | env_vars | Umgebungsvariablen
+
 | weechat | filename | Dateinamen

 | weechat | filters_names | Liste der Filter
@@ -110,7 +136,7 @@

 | weechat | layouts_names | Namen der Layouts

-| weechat | nicks | Nicks in Nickliste für aktuellen Buffer
+| weechat | nicks | Nicks in Benutzerliste für aktuellen Buffer

 | weechat | palette_colors | Farbpalette

@@ -122,7 +148,7 @@

 | weechat | proxies_names | Namen aller Proxys

-| weechat | proxies_options | Optionen für Proxys
+| weechat | proxies_options | Einstellungen für Proxys

 | weechat | secured_data | Namen der geschützten Daten (Datei sec.conf, section data)

@@ -175,6 +175,7 @@
 *** 'nick_alternate_number' (integer)
 *** 'nick' (string)
 *** 'nick_modes' (string)
+*** 'cap_away_notify' (integer)
 *** 'isupport' (string)
 *** 'prefix_modes' (string)
 *** 'prefix_chars' (string)
@@ -489,10 +490,15 @@
 *** 'notify' (integer)
 *** 'num_displayed' (integer)
 *** 'active' (integer)
+*** 'hidden' (integer)
+*** 'zoomed' (integer)
 *** 'print_hooks_enabled' (integer)
 *** 'day_change' (integer)
+*** 'clear' (integer)
+*** 'filter' (integer)
 *** 'close_callback' (pointer)
 *** 'close_callback_data' (pointer)
+*** 'closing' (integer)
 *** 'title' (string)
 *** 'own_lines' (pointer, hdata: "lines")
 *** 'mixed_lines' (pointer, hdata: "lines")
@@ -580,21 +586,13 @@
 *** 'direction' (integer)
 *** 'add_space' (integer)
 *** 'force_partial_completion' (integer)
-*** 'completion_list' (pointer)
+*** 'list' (pointer)
 *** 'word_found' (string)
 *** 'word_found_is_nick' (integer)
 *** 'position_replace' (integer)
 *** 'diff_size' (integer)
 *** 'diff_length' (integer)
-*** 'partial_completion_list' (pointer, hdata: "completion_partial")
-*** 'last_partial_completion' (pointer, hdata: "completion_partial")
-* 'completion_partial': Struktur mit teilweise Vervollständigung
-** Erweiterung: weechat
-** Variablen:
-*** 'word' (string)
-*** 'count' (integer)
-*** 'prev_item' (pointer, hdata: "completion_partial")
-*** 'next_item' (pointer, hdata: "completion_partial")
+*** 'partial_list' (pointer)
 * 'config_file': Konfigurationsdatei
 ** Erweiterung: weechat
 ** Variablen:
@@ -809,7 +807,7 @@
 *** 'buffer_max_length_refresh' (integer)
 *** 'prefix_max_length' (integer)
 *** 'prefix_max_length_refresh' (integer)
-* 'nick': Nick in Nickliste
+* 'nick': Nick in Benutzerliste
 ** Erweiterung: weechat
 ** Variablen:
 *** 'group' (pointer, hdata: "nick_group")
@@ -820,7 +818,7 @@
 *** 'visible' (integer)
 *** 'prev_nick' (pointer, hdata: "nick")
 *** 'next_nick' (pointer, hdata: "nick")
-* 'nick_group': Gruppen in Nickliste
+* 'nick_group': Gruppen in Benutzerliste
 ** Erweiterung: weechat
 ** Variablen:
 *** 'name' (shared_string)
@@ -2,53 +2,53 @@
 |===
 | Erweiterung | Name | Beschreibung | Pointer | Argumente

-| alias | alias | Liste der Alias | Alias Pointer (optional) | Alias Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| alias | alias | Liste der Alias | Alias Pointer (optional) | Name des Alias (Platzhalter "*" kann verwendet werden) (optional)

-| guile | guile_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| guile | guile_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (Platzhalter "*" kann verwendet werden) (optional)

 | irc | irc_channel | Liste der Channels eines IRC-Servers | Channel Pointer (optional) | Server,Channel (Channel ist optional)

+| irc | irc_color_weechat | Zuordnung der IRC Farbkodierung und der WeeChat Farbnamen | - | -
+
 | irc | irc_ignore | Liste von ignorierten IRCs | Ignore Pointer (optional) | -

-| irc | irc_nick | Liste der Nicks im IRC-Channel | Nick Pointer (optional) | Server,Channel,Nick (Channel und Nick sind optional)
+| irc | irc_nick | Liste der Nicks im IRC-Channel | Nick Pointer (optional) | server,channel,nick (nick ist optional)

-| irc | irc_notify | Liste mit Benachrichtigungen | Benachrichtigungspointer (optional) | Servername (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| irc | irc_notify | Liste mit Benachrichtigungen | Benachrichtigungspointer (optional) | Servername (Platzhalter "*" kann verwendet werden) (optional)

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

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

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

-| perl | perl_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 Skriptes (Platzhalter "*" kann verwendet werden) (optional)

-| python | python_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 Skriptes (Platzhalter "*" kann verwendet werden) (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 Skriptes (Platzhalter "*" kann verwendet werden) (optional)

-| ruby | ruby_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| script | script_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes, mit Dateierweiterung (Platzhalter "*" kann verwendet werden) (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 (Platzhalter "*" kann verwendet werden) (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) | Name der Bar (Platzhalter "*" kann verwendet werden) (optional)

-| weechat | bar | Auflistung der Bars | Bar Pointer (optional) | Bar 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_item | Auflistung der Bar-Items | Bar Item Pointer (optional) | Name des Bar-Item (Platzhalter "*" kann verwendet werden) (optional)

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

-| weechat | buffer | Auflistung 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 (Platzhalter "*" kann verwendet werden) (optional)

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

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

 | weechat | history | Verlaufspeicher der Befehle | Buffer Pointer (falls nicht gesetzt, wird der globale Verlauf zurückgegeben) (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 | hook | Auflistung der Hooks | Hook-Pointer (optional) | type,arguments (type ist ein command/timer/.., arguments dient dazu nur einige hooks abzufragen (Platzhalter "*" kann verwendet werden), beide Einstellungen sind optional)

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

@@ -56,15 +56,15 @@

 | 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 | nicklist | Nicks in Benutzerliste für einen Buffer | Buffer Pointer | nick_xxx oder group_xxx um nur den Nick/Group xxx abzufragen (optional)

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

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

-| weechat | proxy | Liste der Proxys | Proxy Pointer (optional) | Name des Proxy (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+| weechat | proxy | Liste der Proxys | Proxy Pointer (optional) | Name des Proxy (Platzhalter "*" kann verwendet werden) (optional)

-| weechat | url_options | Optionen für URL | - | -
+| weechat | url_options | Einstellungen für URL | - | -

 | weechat | window | Auflistung der Fenster | Fenster Pointer (optional) | "current" für aktuelles Fenster oder die Nummer eines Fensters (optional)

@@ -14,9 +14,9 @@

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

-| irc | irc_nick_color | holt Farbe-Code des Nick | Nickname
+| irc | irc_nick_color | zeigt Farbecode des Nick | Nickname

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

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

@@ -26,10 +26,18 @@

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

+| relay | relay_client_count | Anzahl an Clients für Relay | Statusname (optional): connecting, waiting_auth, connected, auth_failed, disconnected
+
 | weechat | charset_internal | Interner WeeChat Zeichensatz | -

 | weechat | charset_terminal | Terminal Zeichensatz | -

+| weechat | color_ansi_regex | erweiterte reguläre POSIX Ausdrücke um ANSI Escapesequenz zu suchen | -
+
+| weechat | color_rgb2term | RGB Farbe wurde umgewandelt in Terminalfarbe (0-255) | RGB,limit (Obergrenze ist optional und ist Standardmäßig 256)
+
+| weechat | color_term2rgb | Terminalfarbe (0-255) wurde umgewandelt in RGB Farbe | Farben (Terminalfarben: 0-255)
+
 | weechat | cursor_mode | 1, falls Cursor-Modus aktiviert ist | -

 | weechat | date | Datum der WeeChat Kompilierung | -
@@ -1,6 +1,6 @@
 [width="100%",cols="2,^1,7",options="header"]
 |===
-| Option | Type | Konstanten ^(1)^
+| Einstellung | Type | Konstanten ^(1)^

 | verbose | long |

@@ -14,40 +14,40 @@

 | 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 |
+| port | long |

 | httpproxytunnel | long |

-| socks5_gssapi_service | string |
-
-| socks5_gssapi_nec | long |
-
 | interface | string |

+| dns_cache_timeout | long |
+
+| proxytype | long | http, socks4, socks5, socks4a, socks5_hostname, http_1_0
+
+| buffersize | long |
+
+| tcp_nodelay | long |
+
 | localport | long |

 | localportrange | long |

-| dns_cache_timeout | long |
-
-| buffersize | long |
-
-| port | long |
-
-| tcp_nodelay | long |
-
 | address_scope | long |

+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+
+| noproxy | string |
+
+| socks5_gssapi_service | string |
+
+| socks5_gssapi_nec | long |
+
 | tcp_keepalive | long |

 | tcp_keepidle | long |
@@ -56,12 +56,16 @@

 | netrc | long | ignored, optional, required

-| netrc_file | string |
-
 | userpwd | string |

 | proxyuserpwd | string |

+| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+
+| netrc_file | string |
+
 | username | string |

 | password | string |
@@ -70,42 +74,28 @@

 | 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
+| sasl_ir | long |
+
+| xoauth2_bearer | string |
+
+| login_options | string |

 | 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 |
@@ -114,22 +104,42 @@

 | cookiefile | string |

-| cookiejar | string |
+| postfieldsize | long |

-| cookiesession | long |
-
-| cookielist | string |
+| maxredirs | long |

 | httpget | long |

+| cookiejar | string |
+
 | http_version | long | none, 1_0, 1_1

+| cookiesession | long |
+
+| unrestricted_auth | long |
+
+| postfieldsize_large | long long |
+
+| cookielist | string |
+
 | ignore_content_length | long |

+| accept_encoding | string |
+
+| transfer_encoding | long |
+
 | http_content_decoding | long |

 | http_transfer_decoding | long |

+| copypostfields | string |
+
+| postredir | mask | post_301, post_302
+
+| expect_100_timeout_ms | long |
+
+| headeropt | mask | unified, separate
+
 | mail_from | string |

 | mail_auth | string |
@@ -138,32 +148,32 @@

 | ftpport | string |

-| dirlistonly | long |
-
-| append | long |
-
-| ftp_use_eprt | long |
-
 | ftp_use_epsv | long |

-| ftp_use_pret | long |
+| ftp_use_eprt | 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_skip_pasv_ip | long |
+
 | ftp_filemethod | long | multicwd, nocwd, singlecwd

+| ftp_alternative_to_user | string |
+
+| ftp_ssl_ccc | long | ccc_none, ccc_active, ccc_passive
+
+| dirlistonly | long |
+
+| append | long |
+
+| ftp_use_pret | long |
+
 | rtsp_request | long | options, describe, announce, setup, play, pause, teardown, get_parameter, set_parameter, record, receive

 | rtsp_session_id | string |
@@ -176,122 +186,132 @@

 | 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 |
+| transfertext | long |

-| timeout_ms | long |
+| filetime | long |
+
+| maxfilesize | long |
+
+| proxy_transfer_mode | long |
+
+| resume_from_large | long long |
+
+| infilesize_large | long long |
+
+| maxfilesize_large | long long |
+
+| timeout | 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 |

+| max_send_speed_large | long long |
+
+| max_recv_speed_large | long long |
+
+| timeout_ms | long |
+
+| connecttimeout_ms | long |
+
+| maxconnects | long |
+
 | use_ssl | long | none, try, control, all

 | dns_servers | string |

 | accepttimeout_ms | long |

+| dns_interface | string |
+
+| dns_local_ip4 | string |
+
+| dns_local_ip6 | string |
+
 | 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_verifyhost | long |
+
 | ssl_cipher_list | string |

+| sslcerttype | string |
+
+| sslkey | string |
+
+| sslkeytype | string |
+
+| sslengine | string |
+
+| sslengine_default | long |
+
+| capath | string |
+
 | ssl_sessionid_cache | long |

-| ssl_options | long | allow_beast
-
 | krblevel | string |

+| keypasswd | string |
+
+| issuercert | string |
+
+| crlfile | string |
+
+| certinfo | long |
+
 | gssapi_delegation | long | none, policy_flag, flag

-| ssh_auth_types | mask | none, policy_flag, flag
+| ssl_options | long | allow_beast

-| ssh_host_public_key_md5 | string |
+| ssl_enable_alpn | long |
+
+| ssl_enable_npn | long |
+
+| ssh_auth_types | mask | none, policy_flag, flag

 | ssh_public_keyfile | string |

 | ssh_private_keyfile | string |

+| ssh_host_public_key_md5 | string |
+
 | ssh_knownhosts | string |

 | new_file_perms | long |
@@ -6,7 +6,7 @@

 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)
+     alias: Name des Alias (Platzhalter "*" kann verwendet werden)
   command: Name des zuzuordnenden Befehls (WeeChat- oder IRC-Befehl ohne führenden '/', mehrere Befehle müssen durch Semikolon getrennt werden)

 Ohne Angabe von Argumenten werden alle definierten Aliase angezeigt.
@@ -18,7 +18,7 @@ listdict: die, auf dem System, installierten Wörterbücher werden aufgelistet

 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:
+Um Aspell auf alle Buffer anzuwenden sollte die Einstellung "default_dict" genutzt und Aspell aktiviert werden:
  /set aspell.check.default_dict "de_DE-neu"
  /aspell enable

@@ -1,5 +1,5 @@
 * [[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)`
+** Beschreibung: `globale Zeichendekodierung: Zeichendekodierung die für eingehende Nachrichten genutzt werden soll, falls diese nicht UTF-8 gültig ist`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"iso-8859-1"`)

@@ -0,0 +1,72 @@
+[[command_exec_exec]]
+[command]*`exec`* führe externe Befehle aus::
+
+----
+/exec  -list
+       [-sh|-nosh] [-bg|-nobg] [-stdin|-nostdin] [-buffer <name>] [-l|-o|-n|-nf] [-cl|-nocl] [-sw|-nosw] [-ln|-noln] [-flush|-noflush] [-color ansi|auto|irc|weechat|strip] [-rc|-norc] [-timeout <timeout>] [-name <name>] [-pipe <command>] [-hsignal <name>] <command>
+       -in <id> <text>
+       -inclose <id> [<text>]
+       -signal <id> <signal>
+       -kill <id>
+       -killall
+       -set <id> <property> <value>
+       -del <id>|-all [<id>...]
+
+   -list: zeigt laufende Befehle an
+     -sh: es wird die shell verwendet um Befehle auszuführen (WARNUNG: Dieses Argument sollte nur verwendet werden, falls alle Argumente unbedenklich sind, siehe Argument -nosh)
+   -nosh: die shell wird nicht verwendet um Befehle auszuführen (wird benötigt, falls der Befehl mit sensiblen Daten hantiert. Zum Beispiel der Inhalt einer Nachricht eines anderen Users)
+     -bg: führt Prozess im Hintergrund aus: gibt weder eine Prozessausgabe noch einen Rückgabewert aus (nicht kompatibel mit Argumenten -o/-n)
+   -nobg: gibt Prozessausgabe und Rückgabewert aus (Standardverhalten)
+  -stdin: erstellt eine PIPE um Daten zu dem Prozess zu senden (mittels /exec -in/-inclose)
+-nostdin: es wird keine PIPE für stdin erstellt (Standardverhalten)
+ -buffer: zeigt/sendet Ausgabe des Befehls an diesen Buffer (wird der angegebene Buffer nicht gefunden wird ein neuer Bufger mit dem Namen "exec.exec.xxx" erstellt)
+      -l: gibt die Ausgabe des Befehls lokal im Buffer aus (Standardverhalten)
+      -o: gibt die Ausgabe des Befehls im Buffer aus (nicht kompatibel mit Argument -bg)
+      -n: gibt die Ausgabe des Befehls in einem neuen Buffer aus (nicht kompatibel mit Argument -bg)
+     -nf: gibt die Ausgabe des Befehls in einem neuen Buffer, mit einem freien Inhalt (kein Zeilenumbruch, keine Limitierung in der Anzahl der Zeilen), aus (nicht kompatibel mit Argument -bg)
+     -cl: der neue Buffer wird vor einer Ausgabe gelöscht
+   -nocl: Ausgabe wird an neuen Buffer angehangen, ohne diesen vorher zu löschen (Standardverhalten)
+     -sw: es wird zum Ausgabebuffer gewechselt (Standardverhalten)
+   -nosw: es wird nicht zum Ausgabebuffer gewechselt
+     -ln: legt eine Zeilennummerierung an (Standardverhalten, nur für neue Buffer)
+   -noln: es wird keine Zeilennummerierung angezeigt
+  -flush: die Ausgabe des Befehls findet in Echtzeit statt (Standardwert)
+-noflush: die Ausgabe des Befehls wird am Ende der Ausführung ausgegeben
+  -color: es wird eine der folgenden Aktionen bei ANSI Zeichenkodierungen in der Ausgabe durchgeführt:
+             ansi: ANSI-Kodierung wird beibehalten
+             auto: konvertiert ANSI-Farben nach WeeChat/IRC (Standardverhalten)
+              irc: konvertiert ANSI-Farben nach IRC Farben
+          weechat: konvertiert ANSI-Farben nach WeeChat-Farben
+            strip: ANSI-Farben werden entfernt
+     -rc: der Rückgabewert wird ausgegeben (Standardverhalten)
+   -norc: der Rückgabewert wird unterdrückt
+-timeout: gibt eine Zeitbeschränkung für den auszuführenden Befehl an (in Sekunden)
+   -name: dem Befehl wird ein Name zugewiesen (um den Befehl später mittels /exec zu nutzen)
+   -pipe: sendet die Ausgabe an einen Befehl von WeeChat/Erweiterung (Zeile für Zeile); sollen Leerzeichen im Befehl/Argument verwendet werden, müssen diese mit Anführungszeichen eingeschlossen werden; Variable $line wird durch die entsprechende Zeile ersetzt (standardmäßig wird die Zeile, getrennt durch ein Leerzeichen, dem Befehl nachgestellt (nicht kompatibel mit den Argumenten -bg/-o/-n)
+ -hsignal: sendet die Ausgabe als hsignal (um es z.B. mittels /trigger zu verwenden) (nicht kompatibel mit den Argumenten -bg/-o/-n)
+ command: Befehl der ausgeführt werden soll; beginnt der Befehl mit "url:", wird die shell deaktiviert und der Inhalt der URL wird heruntergeladen und im Buffer ausgegeben
+      id: identifiziert eindeutig einen Befehl: entweder durch eine Nummer oder einen Namen (sofern ein Name mittels "-name xxx" zugewiesen wurde)
+     -in: sendet Text an die Standardeingabe des Prozesses
+-inclose: wie -in aber stdin wird danach geschlossen (und der Text ist optional: ohne Text wird stdin umgehend geschlossen
+ -signal: schickt ein Signal an den Prozess; das Signal kann entweder ein Integerwert oder eines der folgenden Schlüsselworte sein: hup, int, quit, kill, term, usr1, usr2
+   -kill: Alias für "-signal <id> kill"
+-killall: beendet alle laufenden Prozesse
+    -set: nutzt eine Hook-Fähigkeit (siehe Funktion hook_set in Anleitung für API Erweiterung)
+property: Hook-Fähigkeit
+   value: neuer Wert für Hook-Fähigkeit
+    -del: entfernt einen beendeten Befehl
+    -all: entfernt alle beendeten Befehle
+
+Standardoptionen können in der Einstellung exec.command.default_options bestimmt werden.
+
+Beispiele:
+  /exec -n ls -l /tmp
+  /exec -n ps xu | grep weechat
+  /exec -n -norc url:http://pastebin.com/raw.php?i=xxxxxxxx
+  /exec -nf -noln links -dump https://weechat.org/files/doc/devel/weechat_user.en.html
+  /exec -o uptime
+  /exec -pipe "/print Machine uptime:" uptime
+  /exec -n tail -f /var/log/messages
+  /exec -kill 0
+----
+
@@ -0,0 +1,20 @@
+* [[option_exec.color.flag_finished]] *exec.color.flag_finished*
+** Beschreibung: `Textfarbe des Statusindikator (in der Auflistung der Befehle) für beendete Befehle`
+** 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 kursiv, "_" für unterstrichen (Standardwert: `lightred`)
+
+* [[option_exec.color.flag_running]] *exec.color.flag_running*
+** Beschreibung: `Textfarbe des Statusindikator (in der Auflistung der Befehle) für Befehle die zur Zeit ausgeführt werden`
+** 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 kursiv, "_" für unterstrichen (Standardwert: `lightgreen`)
+
+* [[option_exec.command.default_options]] *exec.command.default_options*
+** Beschreibung: `Standardoptionen für den Befehl /exec (siehe /help exec); Beispiele: "-nosh -bg" führt alle Befehle im Hintergrund aus (keine Textausgabe) und ohne das die shell genutzt wird`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
+* [[option_exec.command.purge_delay]] *exec.command.purge_delay*
+** Beschreibung: `Wartezeit bis nicht mehr ausgeführte Befehle gelöscht werden (in Sekunden, 0 = lösche Befehle unmittelbar, -1 = niemals löschen)`
+** Typ: integer
+** Werte: -1 .. 25920000 (Standardwert: `0`)
+
@@ -1,5 +1,5 @@
 [[command_guile_guile]]
-[command]*`guile`* auflisten/installieren/deinstallieren von Skripten::
+[command]*`guile`* auflisten/installieren/beenden von Skripten::

 ----
 /guile  list|listfull [<name>]
@@ -10,9 +10,9 @@
    list: installierte Skripten werden aufgelistet
 listfull: detaillierte Auflistung aller installierten Skripten
    load: installiert ein Skript
-autoload: installiert automatisch alle Skripten aus dem "autoload" Verzeichnis
-  reload: ein Skript wird erneut installiert (wird kein Name angegeben, dann werden alle Skripten entfernt und erneut installiert)
-  unload: deinstalliert ein Skript (wird kein Name angegeben, dann werden alle Skripten deinstalliert)
+autoload: startet automatisch alle Skripten aus dem "autoload" Verzeichnis
+  reload: ein Skript wird erneut gestartet (wird kein Name angegeben, dann werden alle Skripten beendet und erneut gestartet)
+  unload: beendet ein Skript (wird kein Name angegeben, dann werden alle Skripten beendet)
 filename: Skript (Datei) welches geladen werden soll
    name: Name eines Skriptes (der Name der in der "register" Funktion der Skript-API genutzt wird)
      -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben
--- a/Show More
+++ b/Show More