Version 2.0.2-dev

Version 2.0.1
core: add version 2.0.1 in release notes
2026-06-12 22:24:47 +02:00 · 2017-12-20 22:19:57 +01:00 · 2017-12-20 22:03:06 +01:00 · 2017-12-09 16:26:57 +01:00 · 2017-12-09 16:00:20 +01:00 · 2017-12-09 15:59:01 +01:00
1017 changed files with 39629 additions and 85095 deletions
@@ -5,4 +5,5 @@ debian-devel           export-ignore
 debian-stable          export-ignore
 weechat.spec           export-ignore
 .mailmap               export-ignore
+tests/ubuntu/          export-ignore
 tools/build-debian.sh  export-ignore
@@ -1 +0,0 @@
-custom: https://weechat.org/donate/
@@ -1,41 +0,0 @@
---
-name: Bug report
-about: Create a bug report (please do not report security issues here)
-labels: bug
-
---
-
-<!-- Please do not report any security issue here, see file Contributing.adoc -->
-
-## Bug summary
-
-
-
-## Steps to reproduce
-
-1. 
-2. 
-3. 
-
-## Current behavior
-
-
-
-## Expected behavior
-
-
-
-## Suggested solutions
-
-
-
-## Additional information
-
-
-
---
-
-<!-- MANDATORY INFO: -->
-
- WeeChat version: 
- OS, distribution and version: 
@@ -1,8 +0,0 @@
---
-name: Feature request
-about: Request a new feature / enhancement
-labels: feature
-
---
-
-## Feature description
@@ -1,15 +0,0 @@
---
-name: Question
-about: Ask a question (please read first FAQ and docs)
-labels: question
-
---
-
-## Question
-
-
-
---
-
- WeeChat version: 
- OS, distribution and version: 
@@ -16,8 +16,7 @@

 ABOUT-NLS
 autom4te*
-build/*
-builddir/*
+build*/*
 compile
 config.guess
 config.h
@@ -11,7 +11,7 @@ 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 <soltys1@gmail.com> <soltys@szluug.org> <soltys@soltys.info>
+Krzysztof Korościk <soltys1@gmail.com> <soltys@szluug.org>
 Marco Paolone <marcopaolone@gmail.com>
 <marcopaolone@gmail.com> <marco@DrB4tch.sitecomwl601>
 <mikaela.suomalainen@outlook.com> <mkaysi@outlook.com>
@@ -1,37 +1,30 @@
-dist: xenial
-sudo: required
 language: c

 compiler:
    - gcc
    - clang

+sudo: required
+dist: trusty
+
 env:
    - BUILDTOOL="cmake" BUILDARGS=""
-    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON2=ON"
+    # - BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON3=ON"
    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_GNUTLS=OFF"
-    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_CODE_COVERAGE=ON" CODECOVERAGE="1"
    - BUILDTOOL="autotools" BUILDARGS=""
-    - BUILDTOOL="autotools" BUILDARGS="--enable-python2"
+    # - BUILDTOOL="autotools" BUILDARGS="--enable-python3"
    - BUILDTOOL="autotools" BUILDARGS="--disable-gnutls"

-matrix:
-    fast_finish: true
-    exclude:
-      - compiler: clang
-        env: BUILDTOOL="cmake" BUILDARGS="-DENABLE_CODE_COVERAGE=ON" CODECOVERAGE="1"
-
 before_script:
-    - rm -rf "$HOME/.pyenv"
-    - sudo rm -rf /opt/pyenv
+    # Workaround https://github.com/travis-ci/travis-ci/issues/5326
+    - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
    - echo 'APT::Install-Recommends "false";' | sudo tee -a /etc/apt/apt.conf
-    - travis_retry sudo apt-get update -qq
-    - travis_retry sudo apt-get -y install devscripts equivs python-pip libenchant-dev autopoint cmake lcov pkg-config libncursesw5-dev gem2deb libperl-dev python-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-2.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls-dev zlib1g-dev curl libcpputest-dev php7.0-dev libphp7.0-embed
-    - travis_retry sudo gem install asciidoctor
-    - travis_retry sudo -H pip install --ignore-installed msgcheck pylint
+    - sudo add-apt-repository -y ppa:ondrej/php
+    - sudo apt-get update -qq
+    - sudo apt-get -y install devscripts equivs python-pip libenchant-dev autopoint 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 libv8-dev libcurl4-gnutls-dev libgcrypt11-dev libgnutls-dev zlib1g-dev curl libcpputest-dev php7.0-dev libphp7.0-embed
+    - sudo gem install asciidoctor
+    - sudo pip install msgcheck pylint
    - phpenv local system
-      # work around broken travis environment variables, see https://github.com/travis-ci/travis-ci/issues/5301
-    - unset PYTHON_CFLAGS

 script:
    - ./tools/build-test.sh
@@ -41,13 +34,10 @@ script:
    - pylint tests/scripts/python/testapigen.py
    - pylint tests/scripts/python/testapi.py
    - pylint tests/scripts/python/unparse.py
-    - ./tools/build-debian.sh test-patches

 after_success:
    - weechat --help
    - weechat-curses --help
-    - weechat --colors
-    - weechat --license
-    - weechat --version
-    - weechat --temp-dir --run-command "/debug dirs;/debug libs" --run-command "/quit"
-    - if [ "$CODECOVERAGE" = "1" ]; then bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov error"; fi
+
+matrix:
+    fast_finish: true
@@ -16,7 +16,6 @@
 Alphabetically:

 * Adam Saponara (adsr)
-* Adrian Bjugård
 * Ailin Nemui (Nei)
 * Aleksey V Zapparov
 * Alex Tarkovsky
@@ -27,48 +26,37 @@ Alphabetically:
 * Asakura
 * Bazerka
 * Benoit Papillault (benoit)
-* Chris Hills
 * Christian Heinz
 * Christopher O'Neill (deltafire)
 * coypoop
 * David Flatz
 * Dmitry Kobylin
 * Dominik Honnef
-* Dominique Martinet
 * Eduardo Elias
-* Eli Schwartz
 * Elizabeth Myers (Elizacat)
 * Elián Hanisch (m4v)
 * Emanuele Giaquinta
-* emk
 * Esteban I. Ruiz Moreno (Exio)
 * Evgeny Shmarnev
 * Felix Eckhofer
 * Frank Zacharias
-* Fredrik Fornwall
 * Grant Wu
 * Gu1ll4um3r0m41n
 * Guido Berhoerster
 * Gwenn
 * Hasan Kiran (turgay)
 * Ivan Sichmann Freitas
-* Jakub Jirutka
 * Jason A. Donenfeld (zx2c4)
 * JD Horelick (jdhore)
-* jesopo
 * Jim Ramsay (lack)
 * Jiri Golembiovsky (GolemJ)
 * Joey Pabalinas (alyptik)
-* Johan Rylander
-* Jos Ahrens
-* Joseph Kichline
 * Juan Francisco Cantero Hurtado
 * Julien Louis (ptitlouis)
 * Karthik K
 * Koka El Kiwi (KiwiDash)
 * Krzysztof Koroscik (soltys)
 * Kyle Fuller (kylef)
-* Kyle Sabo
 * Leonid Evdokimov
 * Lázaro A.
 * Linus Heckemann
@@ -77,10 +65,7 @@ Alphabetically:
 * Marco Paolone
 * Mateusz Poszwa
 * Matt Robinson
-* Matthew Martin
 * Max Anton Teufel
-* Maxim Baz
-* Michael Siegel
 * Miroslav Koskar
 * Murilo Opsfelder Araujo
 * Neui
@@ -91,7 +76,6 @@ Alphabetically:
 * Odin
 * Ondřej Súkup
 * Patrick Steinhardt
-* Patrik Janoušek
 * Paul Komkoff
 * Pavel Shevchuk (Stalwart)
 * Peter Boström (pbos)
@@ -102,15 +86,12 @@ Alphabetically:
 * Quentin Glidic (SardemFF7)
 * Quentin Pradet
 * Quico Noizeux
-* rafasc
 * Raghavendra Prabhu
 * raspbeguy
 * Rettub
 * Rob Campbell
 * Romero B. de S. Malaquias
 * Rudolf Polzer (divVerent)
-* Ruslan Bekenev
-* Ryan Farley
 * Ryuunosuke Ayanokouzi
 * scumjr
 * Sergio Durigan Junior
@@ -128,17 +109,13 @@ Alphabetically:
 * Tom Alsberg
 * Tomoe Mami
 * Tor Hveem (xt)
-* Trevor Bergeron
 * Valentin Lorentz (progval)
 * Vasco Almeida
 * Voroskoi
 * Wojciech Kwolek
-* W. Trevor King
 * Yannick Palanque
-* ZethJack
-* Ørjan Malde

 == Contact

 See https://weechat.org/files/doc/devel/weechat_user.en.html#support[user's guide]
-or https://weechat.org/about/support
+or https://weechat.org/dev/support
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007-2008 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2008-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -16,10 +16,10 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 2.4)

 project(weechat C)

@@ -27,8 +27,8 @@ project(weechat C)
 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} -fsigned-char -Wall -Wextra -Werror-implicit-function-declaration")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -Wall -Wextra")
+set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration")
+set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration")

 # version
 execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-major OUTPUT_VARIABLE VERSION_MAJOR)
@@ -58,12 +58,10 @@ endif()
 set(PKG_STRING "${PROJECT_NAME} ${VERSION}")
 string(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING})

-if(NOT DEFINED LIBDIR)
-  set(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
-endif()
-
-if(NOT DEFINED WEECHAT_LIBDIR)
-  set(WEECHAT_LIBDIR ${LIBDIR}/${PROJECT_NAME})
+if(DEFINED LIBDIR)
+  set(LIBDIR ${LIBDIR}/${PROJECT_NAME})
+else()
+  set(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
 endif()

 if(NOT DEFINED SHAREDIR)
@@ -84,51 +82,37 @@ else()
  set(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
 endif()

-option(ENABLE_NCURSES       "Compile the Ncurses interface"               ON)
-option(ENABLE_HEADLESS      "Compile the headless binary (required for tests)" 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_BUFLIST       "Enable Buflist plugin"                       ON)
-option(ENABLE_CHARSET       "Enable Charset plugin"                       ON)
-option(ENABLE_EXEC          "Enable Exec plugin"                          ON)
-option(ENABLE_FIFO          "Enable FIFO plugin"                          ON)
-option(ENABLE_FSET          "Enable Fast Set 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 (script 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_PYTHON2       "Use Python 2 instead of Python 3"            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_JAVASCRIPT    "Enable JavaScript scripting language"        ON)
-option(ENABLE_PHP           "Enable PHP scripting language"               ON)
-option(ENABLE_SPELL         "Enable Spell checker plugin"                 ON)
-option(ENABLE_ENCHANT       "Enable Enchant lib for Spell checker plugin" OFF)
-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(ENABLE_CODE_COVERAGE "Enable code coverage"                        OFF)
-
-# code coverage
-add_library(coverage_config INTERFACE)
-if(ENABLE_CODE_COVERAGE)
-  target_compile_options(coverage_config INTERFACE -O0 -g --coverage)
-  target_link_libraries(coverage_config INTERFACE --coverage)
-endif()
-
-# headless mode is required for tests
-if(ENABLE_TESTS AND NOT ENABLE_HEADLESS)
-  message(FATAL_ERROR "Headless mode is required for tests.")
-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_BUFLIST    "Enable Buflist plugin"                     ON)
+option(ENABLE_CHARSET    "Enable Charset plugin"                     ON)
+option(ENABLE_EXEC       "Enable Exec plugin"                        ON)
+option(ENABLE_FIFO       "Enable FIFO plugin"                        ON)
+option(ENABLE_FSET       "Enable Fast Set 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 because many \"official\" scripts won't work)" 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_JAVASCRIPT "Enable JavaScript scripting language"      ON)
+option(ENABLE_PHP        "Enable PHP 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 "")
@@ -180,12 +164,6 @@ if(ENABLE_NLS)
  find_package(Gettext)
  if(GETTEXT_FOUND)
    add_definitions(-DENABLE_NLS)
-    find_package(Intl)
-    if(Intl_FOUND)
-      list(APPEND EXTRA_LIBS "${Intl_LIBRARIES}")
-    endif()
-  else()
-    message(SEND_ERROR "Gettext not found")
  endif()
 endif()

@@ -203,8 +181,6 @@ if(ENABLE_GNUTLS)
    include_directories(${GNUTLS_INCLUDE_PATH})
    set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${GNUTLS_LIBRARY_PATH}")
    list(APPEND EXTRA_LIBS gnutls)
-  else()
-    message(SEND_ERROR "GnuTLS not found")
  endif()
 endif()

@@ -235,8 +211,6 @@ if(DL_LIBRARY)
  list(APPEND EXTRA_LIBS dl)
 endif()

-add_subdirectory(icons)
-
 if(ENABLE_NLS)
  add_subdirectory(po)
 endif()
@@ -244,14 +218,10 @@ endif()
 add_subdirectory(src)
 add_subdirectory(doc)

-if(ENABLE_TESTS)
-  find_package(CppUTest)
-  if(CPPUTEST_FOUND)
-    enable_testing()
-    add_subdirectory(tests)
-  else()
-    message(SEND_ERROR "CppUTest not found")
-  endif()
+find_package(CppUTest)
+if(ENABLE_TESTS AND CPPUTEST_FOUND)
+  enable_testing()
+  add_subdirectory(tests)
 endif()

 configure_file(config.h.cmake config.h @ONLY)
@@ -259,32 +229,28 @@ 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}/tools/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
-  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-)
+  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")

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

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

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

 # pkgconfig file
 set(PACKAGE "${PROJECT_NAME}")
 set(prefix "${CMAKE_INSTALL_PREFIX}")
 set(exec_prefix "\${prefix}")
-string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir "${LIBDIR}")
+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)
+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)
@@ -297,12 +263,11 @@ if(CYGWIN)
    ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/README.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc
-    DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}
-  )
+    DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 endif()

-# desktop file
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop DESTINATION ${SHAREDIR}/applications)
+# icon
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/32x32/apps)

 # packages
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
@@ -320,8 +285,7 @@ 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_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$"
@@ -1,7 +1,7 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
@@ -65,7 +65,7 @@ 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 website
+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
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2006-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -16,7 +16,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # This target will update file config-git.h with output of command "git describe"
@@ -29,7 +29,7 @@ if TESTS
 tests_dir = tests
 endif

-SUBDIRS = icons po doc intl src $(tests_dir)
+SUBDIRS = po doc intl src $(tests_dir)

 EXTRA_DIST = AUTHORS.adoc \
             ChangeLog.adoc \
@@ -56,6 +56,7 @@ EXTRA_DIST = AUTHORS.adoc \
             cmake/FindPkgConfig.cmake \
             cmake/FindPython.cmake \
             cmake/FindRuby.cmake \
+             cmake/FindTCL.cmake \
             cmake/FindV8.cmake \
             cmake/FindZLIB.cmake \
             cmake/cmake_uninstall.cmake.in \
@@ -65,17 +66,17 @@ EXTRA_DIST = AUTHORS.adoc \
             tools/git-version.sh \
             tools/makedist.sh \
             version.sh \
-             weechat.desktop \
+             weechat.png \
             weechat.pc.in \
             weechat.cygport.in

 ACLOCAL_AMFLAGS = -I m4

-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = weechat.pc

-desktopdir = $(datadir)/applications
-desktop_DATA = weechat.desktop
+icondir   = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = weechat.png

 clean-local:
 	$(RM) config-git.h
@@ -1,21 +1,18 @@
+= WeeChat
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: en


-pass:[<p align="center">] image:https://weechat.org/media/images/weechat_logo_large.png[align="center"] pass:[</p>]
-
 image:https://img.shields.io/badge/diaspora*-follow-blue.svg["Diaspora*", link="https://diasp.eu/u/weechat"]
-image:https://img.shields.io/badge/mastodon-follow-blue.svg["Mastodon", link="https://hostux.social/@weechat"]
-image:https://img.shields.io/badge/twitter-follow-blue.svg["Twitter", link="https://twitter.com/WeeChatClient"]
-image:https://img.shields.io/badge/devel%20blog-follow-blue.svg["Devel blog", link="https://blog.weechat.org/"]
-image:https://img.shields.io/badge/slant-recommend-28acad.svg["Slant", link="https://www.slant.co/topics/1323/~best-irc-clients-for-linux"]
-image:https://img.shields.io/badge/help-donate%20%E2%9D%A4-ff69b4.svg["Donate", link="https://weechat.org/donate/"]
+image:https://img.shields.io/badge/google%2B-follow-blue.svg["Google+", link="https://plus.google.com/+WeeChat"]
+image:https://img.shields.io/badge/devel%20blog-follow-blue.svg["Devel blog", link="https://weechat.org/blog/"]
+image:https://img.shields.io/badge/slant-recommend-28acad.svg["Slant", link="http://www.slant.co/topics/1323/~irc-clients-for-linux"]
+image:https://img.shields.io/badge/paypal-donate%20%E2%9D%A4-yellow.svg["Paypal", link="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4LSMSNLUAJWNS"]

 image:https://travis-ci.org/weechat/weechat.svg?branch=master["Build Status", link="https://travis-ci.org/weechat/weechat"]
-image:https://codecov.io/gh/weechat/weechat/branch/master/graph/badge.svg["Code coverage", link="https://codecov.io/gh/weechat/weechat"]

-*WeeChat* (Wee Enhanced Environment for Chat) is a free chat client, fast and
+WeeChat (Wee Enhanced Environment for Chat) is a free chat client, fast and
 light, designed for many operating systems.
 It is highly customizable and extensible with scripts.

@@ -23,19 +20,19 @@ Homepage: https://weechat.org/

 == Features

-* *Modular chat client*: WeeChat has a lightweight core and optional https://weechat.org/files/doc/stable/weechat_user.en.html#plugins[plugins]. All plugins (including https://weechat.org/files/doc/stable/weechat_user.en.html#irc_plugin[IRC]) are independent and can be unloaded.
-* *Multi-platform*: WeeChat runs on GNU/Linux, *BSD, GNU/Hurd, Haiku, macOS and Windows (Bash/Ubuntu and Cygwin).
+* *Modular chat client*: WeeChat has a lightweight core and optional plugins. All plugins (including IRC) are independent and can be unloaded.
+* *Multi-platform*: WeeChat runs on GNU/Linux, *BSD, GNU/Hurd, Mac OS X and Windows (Bash/Ubuntu and Cygwin).
 * *Multi-protocols*: WeeChat is designed to support multiple protocols by plugins, like IRC.
-* *Standards-compliant*: the IRC plugin is compliant with RFCs https://tools.ietf.org/html/rfc1459[1459], https://tools.ietf.org/html/rfc2810[2810], https://tools.ietf.org/html/rfc2811[2811], https://tools.ietf.org/html/rfc2812[2812] and https://tools.ietf.org/html/rfc2813[2813].
+* *Standards-compliant*: the IRC plugin is compliant with RFCs 1459, 2810, 2811, 2812 and 2813.
 * *Small, fast and very light*: the core is and should stay as light and fast as possible.
-* *Customizable and extensible*: there are a lot of options to customize WeeChat, and it is extensible with C plugins and https://weechat.org/scripts/[scripts] (https://weechat.org/scripts/stable/language/perl/[Perl], https://weechat.org/scripts/stable/language/python/[Python], https://weechat.org/scripts/stable/language/ruby[Ruby], https://weechat.org/scripts/stable/language/lua/[Lua], https://weechat.org/scripts/stable/language/tcl/[Tcl], https://weechat.org/scripts/stable/language/guile/[Scheme], https://weechat.org/scripts/stable/language/javascript/[JavaScript] and https://weechat.org/scripts/stable/language/php/[PHP]).
-* *Fully documented*: there is comprehensive https://weechat.org/doc/[documentation], which is https://weechat.org/files/doc/stable/weechat_dev.en.html#translations[translated] into several languages.
+* *Customizable and extensible*: there are a lot of options to customize WeeChat, and it is extensible with C plugins and scripts (Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP).
+* *Fully documented*: there is comprehensive documentation, which is translated into several languages.
 * *Developed from scratch*: WeeChat was built from scratch and is not based on any other client.
-* *Free software*: WeeChat is released under https://www.gnu.org/licenses/gpl-3.0.html[GPLv3].
+* *Free software*: WeeChat is released under GPLv3.

-pass:[<p align="center">] image:https://weechat.org/media/images/screenshots/weechat/medium/weechat_2013-04-27_phlux_shadow.png[align="center"] pass:[</p>]
+image::https://weechat.org/media/images/screenshots/weechat/medium/weechat_2013-04-27_phlux_shadow.png[align="center"]

-On WeeChat's website you can find https://weechat.org/about/screenshots/[more screenshots].
+Other screenshots are on https://weechat.org/about/screenshots/[this page].

 == Install

@@ -53,7 +50,7 @@ Following packages are optional:

 * for i18n: gettext
 * for SSL: gnutls, ca-certificates
-* for spell checking: aspell or enchant
+* for spell checking: aspell
 * for scripting: python, perl, ruby, lua, tcl, guile, libv8 (javascript), php
 * for building doc and man page: asciidoctor
 * for building tests: C++ compiler, CppUTest
@@ -63,7 +60,7 @@ https://weechat.org/files/doc/devel/weechat_user.en.html#dependencies[user's gui

 === Compile

-WeeChat can be built with https://cmake.org/[CMake] (recommended) or autotools.
+WeeChat can be built with http://cmake.org/[CMake] (recommended) or autotools.

 [NOTE]
 Only CMake is officially supported to build WeeChat. You should only use
@@ -114,7 +111,7 @@ $ ctest -V

 == Copyright

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

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

@@ -129,4 +126,4 @@ 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 <https://www.gnu.org/licenses/>.
+along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
@@ -17,388 +17,6 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
 (file _ChangeLog.adoc_ in sources).


-[[v2.7.1]]
-== Version 2.7.1 (2020-02-20)
-
-Bug fix and maintenance release.
-
-[[v2.7]]
-== Version 2.7 (2019-12-08)
-
-[[v2.7_cmake_errors]]
-=== CMake errors on missing dependencies
-
-When compiling WeeChat with CMake (which is the recommended way), errors are
-now displayed on any missing dependency, if the optional feature was enabled
-(most features are automatically enabled, except documentation, man page and
-tests).
-
-Any error on a missing dependency is fatal, so WeeChat can not be compiled.
-This is a new behavior compared to old versions, where any missing dependency
-was silently ignored and the compilation was possible anyway.
-
-For example if PHP is not installed on your system, CMake will display an error
-on missing PHP library:
-
----
-- checking for one of the modules 'php7'
-CMake Warning at cmake/FindPHP.cmake:57 (message):
-  Could not find libphp7.  Ensure PHP >=7.0.0 development libraries are
-  installed and compiled with `--enable-embed`.  Ensure `php-config` is in
-  `PATH`.  You may set `-DCMAKE_LIBRARY_PATH=...` to the directory containing
-  libphp7.
-Call Stack (most recent call first):
-  src/plugins/CMakeLists.txt:157 (find_package)
-
-
-CMake Error at src/plugins/CMakeLists.txt:161 (message):
-  Php not found
----
-
-Then you can either install PHP or explicitly disable PHP if you don't need this
-plugin, using this cmake option:
-
----
-cmake .. -DENABLE_PHP=OFF
----
-
-[[v2.7_python3_callbacks_strings]]
-=== Strings received in Python 3 callbacks
-
-The strings sent to script callbacks in Python 3 are now automatically converted
-according to the content:
-
-* if the string is valid UTF-8, it is sent as `str` (legacy behavior)
-* if the string is not valid UTF-8, it is sent as `bytes` (new).
-
-In some cases only, the string may not be valid UTF-8, so it is received as
-`bytes` in the callback, which must take care of that.
-
-For more information, see the WeeChat scripting guide: chapter about strings
-received in callbacks (see also issue #1389).
-
-Note: there are no changes for Python 2 (which is now deprecated and should not
-be used any more), the strings sent to callbacks are always of type `str`, and
-may contain invalid UTF-8 data, in the cases mentioned in the WeeChat scripting
-guide.
-
-[[v2.7_irc_message_decoding]]
-=== IRC message decoding/encoding
-
-A new server option called "charset_message" has been added, replacing the
-option _irc.network.channel_encode_.
-
-This new server option has three possible values:
-
-* _message_ (default): the whole IRC message is decoded/encoded, this is the
-  new default behavior; in case of problem with channel names, try to use
-  _text_ instead
-* _channel_: the message is decoded/encoded starting at the channel name (or
-  the text if no channel is present); this is like setting the old option
-  _irc.network.channel_encode_ to _on_
-* _text_: the message is decoded/encoded starting from the text (for example
-  the user message); this is like setting the old option
-  _irc.network.channel_encode_ to _off_ (so this was the default behavior
-  in previous versions)
-
-[[v2.7_xfer_file_receive_suffix]]
-=== Suffix for files received via DCC
-
-Files received via DCC (xfer plugin) now have a suffix ".part" during the
-transfer. When the transfer is successful, the suffix is removed.
-
-This suffix can be customized with the new option
-_xfer.file.download_temporary_suffix_.
-
-If you prefer the legacy behavior (no suffix added), you can set an empty value
-in the new option:
-
----
-/set xfer.file.download_temporary_suffix ""
----
-
-[[v2.6]]
-== Version 2.6 (2019-09-08)
-
-[[v2.6_python3_default]]
-=== Python 3 by default
-
-Python 3 is now used by default to compile the "python" plugin (no fallback
-on Python 2).
-
-The CMake option `ENABLE_PYTHON3` has been renamed to `ENABLE_PYTHON2`
-(configure option `--enable-python2`). If this option is enabled, the "python"
-plugin is built with Python 2 (no fallback on Python 3).
-
-[[v2.6_nick_colors]]
-=== Nick colors
-
-The function to compute the colors based on the nick letters has been fixed
-(now the function uses only a 64-bit integer even if the underlying architecture
-is 32-bit).
-
-If you're running WeeChat on a 32-bit architecture and want to keep same colors
-as the previous releases, you can use one of the two new hash values.
-
-If you were using "djb2", you can switch to "djb2_32":
-
----
-/set weechat.look.nick_color_hash djb2_32
----
-
-If you were using "sum", you can switch to "sum_32":
-
----
-/set weechat.look.nick_color_hash sum_32
----
-
-[[v2.5]]
-== Version 2.5 (2019-06-06)
-
-[[v2.5_aspell_plugin_renamed]]
-=== Aspell plugin renamed to Spell
-
-The "aspell" plugin has been renamed to "spell", a more generic term, because
-it supports aspell and also enchant.
-
-Consequently, the following things have been renamed as well:
-
-* file _aspell.conf_ renamed to _spell.conf_; the content of the
-  file has not changed, so you can just rename the file to keep your changes
-* options _aspell.*_ renamed to _spell.*_
-* command `/aspell` renamed to `/spell`
-* default key kbd:[Alt+s] changed to `/mute spell toggle`
-* bar item _aspell_dict_ renamed to _spell_dict_
-* bar item _aspell_suggest_ renamed to _spell_suggest_
-* info _aspell_dict_ renamed to _spell_dict_
-
-If you are upgrading from a previous release, you can copy the config file
-before doing `/upgrade`, in WeeChat:
-
----
-/save aspell
-/exec -sh cp ~/.weechat/aspell.conf ~/.weechat/spell.conf
-/upgrade
----
-
-If you already upgraded WeeChat:
-
----
-/exec -sh cp ~/.weechat/aspell.conf ~/.weechat/spell.conf
-/reload spell
----
-
-Once configuration is OK, you can delete the file _~/.weechat/aspell.conf_.
-
-Then you can search if you are using "aspell" in values of options:
-
----
-/fset =aspell
----
-
-If there are options displayed, replace "aspell" by "spell" in values.
-
-The default key kbd:[Alt+s] can be changed to the new `/spell` command:
-
----
-/key bind meta-s /mute spell toggle
----
-
-[[v2.5_xfer_option_speed_limit]]
-=== Speed limit option for DCC files
-
-The option _xfer.network.speed_limit_ has been renamed to
-_xfer.network.speed_limit_send_.
-
-If you changed the value of this option, you must set it again after upgrade.
-
-A new option _xfer.network.speed_limit_recv_ has been added to limit the
-speed of received files.
-
-[[v2.5_hook_info_allocated_string]]
-=== Allocated string in hook info and function info_get
-
-The hook info callback now returns an allocated string, which must be freed
-after use (in previous versions, a pointer to a static string was returned).
-
-Consequently, the function info_get returns an allocated string, which must
-be freed after use.
-
-This affects only C code, no changes are required in scripts.
-
-[[v2.4]]
-== Version 2.4 (2019-02-17)
-
-[[v2.4_nick_completer]]
-=== Nick completer
-
-A space is not added automatically any more when you complete a nick at the
-beginning of command line. +
-Purpose of this change is to be more flexible: you can choose whether the space
-is added or not (it was always added in previous releases).
-
-The default value of option `weechat.completion.nick_completer` has been changed
-to add the space by default, but the value of option is not changed automatically
-on upgrade.
-
-So you can run this command if you upgraded from an old version
-and want the space still added automatically:
-
----
-/set weechat.completion.nick_completer ": "
----
-
-[[v2.4_api_base64_functions]]
-=== Base64 API functions
-
-The functions to encode/decode base64 strings have been renamed and now support
-base 16, 32, and 64.
-
-New functions in C API, supporting base 16, 32, and 64:
-
-* string_base_encode
-* string_base_decode
-
-Functions removed from C API:
-
-* string_encode_base64
-* string_decode_base64
-
-[[v2.3]]
-== Version 2.3 (2018-10-21)
-
-No release note.
-
-[[v2.2]]
-== Version 2.2 (2018-07-14)
-
-[[v2.2_default_hotlist_conditions]]
-=== Default conditions for hotlist
-
-The default value for option `weechat.look.hotlist_add_conditions` has been
-changed to take care about the number of connected clients on the relay
-with weechat protocol: if at least one client is connected, the buffer is
-always added to the hotlist.
-
-The new value contains three conditions, if one of them is true, the buffer
-is added to the hotlist:
-
-* `${away}`: true if you are away on the server matching the buffer,
-* `${buffer.num_displayed} == 0`: true if the buffer is not displayed in any
-  window
-* `${info:relay_client_count,weechat,connected} > 0`: true if at least
-  one client is connected on a weechat relay (new condition).
-
-To use the new default value, you can reset the option with this command:
-
----
-/unset weechat.look.hotlist_add_conditions
----
-
-Or set explicitly the value:
-
----
-/set weechat.look.hotlist_add_conditions "${away} || ${buffer.num_displayed} == 0 || ${info:relay_client_count,weechat,connected} > 0"
----
-
-[[v2.2_default_triggers]]
-=== Default triggers
-
-The existing triggers "cmd_pass" and "msg_auth" have been updated to hide
-password in command `/msg nickserv set password` and support the option
-`-server xxx`.
-
-You can restore the default triggers with the following command:
-
----
-/trigger restore cmd_pass msg_auth
----
-
-[[v2.2_irc_signals_tags]]
-=== Tags in IRC "in" signals
-
-The IRCv3 tags are now sent in these IRC signals for received messages
-(_xxx_ is IRC server name, _yyy_ is IRC command name):
-
-* _xxx,irc_in_yyy_
-* _xxx,irc_in2_yyy_
-* _xxx,irc_raw_in_yyy_
-* _xxx,irc_raw_in2_yyy_
-
-This could break plugins or scripts that parse IRC messages and don't expect
-to receive tags (even if tags *are* part of the IRC message, so this was a bug
-in the IRC signals).
-
-See issue #787 for more information.
-
-[NOTE]
-It is recommended for plugins and scripts to use the WeeChat IRC parser:
-see the function "info_get_hashtable" in the Plugin API reference.
-
-Now the whole IRC message is received by the signal callback, for example:
-
----
-@tag1=abc;tag2=def :nick!user@host PRIVMSG #test :this is a test
----
-
-In older releases, this message was received:
-
----
-:nick!user@host PRIVMSG #test :this is a test
----
-
-[[v2.2_debian_headless_package]]
-=== New Debian package for headless version
-
-A new Debian package has been added: _weechat-headless_ which contains the
-binary _weechat-headless_ and its man page.
-
-In version 2.1, this binary was in the package _weechat-curses_.
-
-[[v2.1]]
-== Version 2.1 (2018-03-18)
-
-[[v2.1_option_name_completion]]
-=== Completion for /set and /help commands
-
-A new option weechat.completion.partial_completion_templates has been added to
-force partial completion on some templates.  By default, the option name
-completed in `/set` and `/help` commands are now using partial completion.
-
-If you prefer old behavior, you can remove the templates from the new option
-with this command:
-
----
-/set weechat.completion.partial_completion_templates ""
----
-
-For more information about this feature, you can read help with:
-
----
-/help weechat.completion.partial_completion_templates
----
-
-[[v2.1_script_plugin_check_license]]
-=== Option to check license of scripts loaded
-
-A configuration file has been added for each script plugin: _python.conf_,
-_perl.conf_, _ruby.conf_, ...
-
-Therefore the option to check license of loaded scripts has been moved from
-_plugins.var.<language>.check_license_ (type: string) to the plugin
-configuration file (type: boolean, default is _off_).
-
-List of options moved:
-
-* _plugins.var.python.check_license_ (string) moved to _python.look.check_license_ (boolean)
-* _plugins.var.perl.check_license_ (string) moved to _perl.look.check_license_ (boolean)
-* _plugins.var.ruby.check_license_ (string) moved to _ruby.look.check_license_ (boolean)
-* _plugins.var.lua.check_license_ (string) moved to _lua.look.check_license_ (boolean)
-* _plugins.var.tcl.check_license_ (string) moved to _tcl.look.check_license_ (boolean)
-* _plugins.var.guile.check_license_ (string) moved to _guile.look.check_license_ (boolean)
-* _plugins.var.javascript.check_license_ (string) moved to _javascript.look.check_license_ (boolean)
-* _plugins.var.php.check_license_ (string) moved to _php.look.check_license_ (boolean)
-
 [[v2.0.1]]
 == Version 2.0.1 (2017-12-20)

@@ -407,36 +25,12 @@ Bug fix and maintenance release.
 [[v2.0]]
 == Version 2.0 (2017-12-03)

-[[v2.0_fset_plugin]]
-=== Fset plugin
-
-A new plugin "fset" has been added, it replaces the script iset.pl and has many
-new features.
-
-By default the fset plugin changes the behavior of `/set` command when it is
-used with only an option name: it opens the fset buffer if at least one option
-is found.
-
-The old behavior was to display the list of options in the core buffer.
-
-If you prefer the old behavior, you can restore it with this command:
-
----
-/set fset.look.condition_catch_set ""
----
-
-For more information about this feature, you can read help with:
-
----
-/help fset.look.condition_catch_set
----
-
 [[v2.0_debian_packaging]]
 === Split of scripting Debian packages

 The Debian packaging has changed (for now only on weechat.org repositories,
 not in Debian official repositories). +
-The package _weechat-plugins_ has been split into 9 packages:
+The package `weechat-plugins` has been split into 9 packages:

 - weechat-plugins (with only the following plugins: aspell, exec, fifo, relay,
  script, trigger)
@@ -506,6 +100,20 @@ No release note.

 [[v1.8]]
 == Version 1.8 (2017-05-13)
+[[v1.8_options]]
+
+=== Options
+
+The option _script.scripts.url_force_https_ has been removed because now the
+site weechat.org can only be used with HTTPS. +
+Both HTTP and HTTPS protocols are allowed in the option _script.scripts.url_.
+For http://weechat.org an automatic redirection to https://weechat.org will
+occur, so you should check that the CA certificates are properly installed
+on your machine.
+
+Aspell option with color for suggestion on a misspelled word has been renamed:
+
+* _aspell.color.suggestions_ has been renamed to _aspell.color.suggestion_

 [[v1.8_buflist_plugin]]
 === Buflist plugin
@@ -537,20 +145,6 @@ prevent the plugin from loading on next startup:
 /set weechat.plugin.autoload "*,!buflist"
 ----

-[[v1.8_options]]
-=== Options
-
-The option _script.scripts.url_force_https_ has been removed because now the
-site weechat.org can only be used with HTTPS. +
-Both HTTP and HTTPS protocols are allowed in the option _script.scripts.url_.
-For http://weechat.org/ an automatic redirection to https://weechat.org/ will
-occur, so you should check that the CA certificates are properly installed
-on your machine.
-
-Aspell option with color for suggestion on a misspelled word has been renamed:
-
-* _aspell.color.suggestions_ has been renamed to _aspell.color.suggestion_
-
 [[v1.7.1]]
 == Version 1.7.1 (2017-04-22)

@@ -956,7 +550,7 @@ behavior (never hide arguments, even with a channel key), you can do:
 === Jump to first/last buffer

 The command `/input jump_last_buffer` has been replaced by `/buffer +`.
-You can rebind the key kbd:[Alt+j], kbd:[Alt+l] (`L`):
+You can rebind the key kbd:[Alt+j], kbd:[Alt+l]:

 ----
 /key bind meta-jmeta-l /buffer +
@@ -1013,7 +607,7 @@ obsolete plugins).
 === Bare display

 A bare display mode has been added (for easy text selection and click on URLs),
-the new default key is kbd:[Alt+l] (`L`).
+the new default key is kbd:[Alt+l].

 Use command `/key missing` to add the key or `/key listdiff` to see differences
 between your current keys and WeeChat default keys.
@@ -1211,17 +805,17 @@ accordingly).

 [NOTE]
 For packagers: you should create the link `weechat-curses` -> `weechat` if it's
-not automatically created in the package (both CMake and configure are creating
+not automatically created in the package (both cmake and configure are creating
 this link on make install).

 [[v0.4.2_man_page_documentation]]
 === Man page / documentation

 Documentation is not built by default any more, you have to use option
-`-DENABLE_DOC=ON` in cmake command to enable it.
+`-DENABLE_DOC=ON` in cmake to enable it.

 The man page is now built with asciidoc and translated in several
-languages. A new CMake option `ENABLE_MAN` has been added to compile man page
+languages. A new cmake option `ENABLE_MAN` has been added to compile man page
 (`OFF` by default).

 [[v0.4.2_aspell_colors]]
@@ -1736,6 +1330,10 @@ Major differences:
  accordingly, scripts and plugins must have been designed for version 0.3.x to
  be loaded into WeeChat.

+More information about new API is available on wiki:
+http://wiki.flashtux.org/wiki/WeeChat_0.3.0
+and http://wiki.flashtux.org/wiki/WeeChat_0.3.0_API
+
 [[v0.2.6.3]]
 == Version 0.2.6.3 (2009-06-13)

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -17,15 +17,15 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 ###
 ### common stuff
 ###

-DIR=$(cd "$(dirname "$0")" || exit 1; pwd)
-cd "$DIR" || exit 1
+DIR=$(cd $(dirname "$0"); pwd)
+cd $DIR

 AUTOGEN_LOG=autogen.log

@@ -41,8 +41,9 @@ err ()

 run ()
 {
-    printf "Running \"%s\"..." "$@"
-    if eval "$@" >$AUTOGEN_LOG 2>&1 ; then
+    echo -n "Running \"$@\"..."
+    eval $@ >$AUTOGEN_LOG 2>&1
+    if [ $? = 0 ] ; then
        echo " OK"
    else
        echo " FAILED"
@@ -63,7 +64,7 @@ run "rm -f ABOUT-NLS"
 run "rm -rf intl"

 # execute autoreconf cmds
-run "autoreconf -vi"
+run "autoreconf -fvi"

 # ending
 rm -f $AUTOGEN_LOG
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Asciidoctor
@@ -34,7 +34,7 @@ if(ASCIIDOCTOR_EXECUTABLE)
  execute_process(
    COMMAND ${ASCIIDOCTOR_EXECUTABLE} --version
    OUTPUT_VARIABLE ASCIIDOCTOR_VERSION
-  )
+    )

  string(REGEX REPLACE "^Asciidoctor ([^ ]+) .*" "\\1" ASCIIDOCTOR_VERSION "${ASCIIDOCTOR_VERSION}")

@@ -45,5 +45,5 @@ if(ASCIIDOCTOR_EXECUTABLE)
  mark_as_advanced(
    ASCIIDOCTOR_EXECUTABLE
    ASCIIDOCTOR_VERSION
-  )
+    )
 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Aspell
@@ -55,4 +55,4 @@ endif()
 mark_as_advanced(
  ASPELL_INCLUDE_PATH
  ASPELL_LIBRARY
-)
+  )
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2014-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find CppUTest
@@ -27,8 +27,8 @@
 # CPPUTEST_LIBRARIES    = Link options to compile with CppUTest

 if(CPPUTEST_FOUND)
-  # Already in cache, be silent
-  set(CPPUTEST_FIND_QUIETLY TRUE)
+   # Already in cache, be silent
+   set(CPPUTEST_FIND_QUIETLY TRUE)
 endif()

 find_package(PkgConfig)
@@ -13,8 +13,10 @@


 if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+
  # in cache already
  set(ENCHANT_FOUND TRUE)
+
 else()
  if(NOT WIN32)
    # use pkg-config to get the directories and then use these values
@@ -25,19 +27,17 @@ else()
  endif()

  find_path(ENCHANT_INCLUDE_DIR
-    NAMES enchant++.h
-    HINTS ${PC_ENCHANT_INCLUDEDIR} ${PC_ENCHANT_INCLUDE_DIRS}
-    PATH_SUFFIXES enchant
-  )
+            NAMES enchant++.h
+            HINTS ${PC_ENCHANT_INCLUDEDIR}
+                  ${PC_ENCHANT_INCLUDE_DIRS}
+            PATH_SUFFIXES enchant )

-  find_library(ENCHANT_LIBRARIES
-    NAMES enchant
-    HINTS ${PC_ENCHANT_LIBDIR}
-    ${PC_ENCHANT_LIBRARY_DIRS}
-  )
+  find_library(ENCHANT_LIBRARIES NAMES enchant
+               HINTS ${PC_ENCHANT_LIBDIR}
+                      ${PC_ENCHANT_LIBRARY_DIRS} )

  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(ENCHANT DEFAULT_MSG ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)
+  find_package_handle_standard_args(ENCHANT  DEFAULT_MSG  ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES )

  mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)

@@ -47,4 +47,5 @@ else()
  check_symbol_exists(enchant_get_version "enchant.h" HAVE_ENCHANT_GET_VERSION)
  set(CMAKE_REQUIRED_INCLUDES)
  set(CMAKE_REQUIRED_LIBRARIES)
+
 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Gcrypt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -16,7 +16,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Gettext
@@ -28,8 +28,8 @@
 #  GETTEXT_FOUND = is gettext usable on system?

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

 include(CheckIncludeFiles)
@@ -54,7 +54,7 @@ if(HAVE_LIBINTL_H)
      PATHS
      /usr/local/lib
      /usr/lib
-    )
+      )
    if(LIBINTL_LIBRARY)
      if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
        set(CMAKE_REQUIRED_LIBRARIES "iconv")
@@ -62,6 +62,7 @@ if(HAVE_LIBINTL_H)
      else()
        check_library_exists(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
      endif()
+
      if(LIBINTL_HAS_DGETTEXT)
        set(GETTEXT_FOUND TRUE)
      endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -15,7 +15,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find GnuTLS
@@ -30,23 +30,23 @@
 #  GNUTLS_LDFLAGS = ldflags to use to compile

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

 find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config)

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

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

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

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2011-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Guile
@@ -27,13 +27,13 @@
 # GUILE_LIBRARIES    = Link options to compile Guile

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

 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(GUILE guile-2.2 guile-2.0)
+  pkg_search_module(GUILE guile-2.0)
  if(GUILE_FOUND)
    # check if variable "scm_install_gmp_memory_functions" exists
    set(CMAKE_REQUIRED_INCLUDES ${GUILE_INCLUDE_DIRS})
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Iconv
@@ -29,8 +29,8 @@
 #  ICONV_FOUND = is iconv usable on system?

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

 include(CheckLibraryExists)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Lua
@@ -29,8 +29,8 @@
 #  LUA_FOUND = is liblua usable on system?

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

 find_package(PkgConfig)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 if(NCURSES_FOUND)
@@ -23,8 +23,9 @@ endif()

 find_path(NCURSES_INCLUDE_PATH
  NAMES ncurses.h curses.h
-  PATH_SUFFIXES ncursesw ncurses
-  PATHS /usr/include /usr/local/include /usr/pkg/include
+  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
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 if(PHP_FOUND)
@@ -28,12 +28,10 @@ endif()

 if(NOT PHP_FOUND)
  find_program(PHP_CONFIG_EXECUTABLE NAMES
-    php-config7.3 php-config73
    php-config7.2 php-config72
    php-config7.1 php-config71
    php-config7.0 php-config70
-    php-config php-config7
-  )
+    php-config php-config7)
  if (PHP_CONFIG_EXECUTABLE)
    execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --prefix OUTPUT_VARIABLE PHP_LIB_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
    execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --includes OUTPUT_VARIABLE PHP_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -41,9 +39,8 @@ if(NOT PHP_FOUND)
    execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE PHP_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
    if(${PHP_VERSION} MATCHES "^7")
      find_library(PHP_LIB
-        NAMES php7.3 php7.2 php7.1 php7.0 php7
-        HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64
-      )
+        NAMES php7.2 php7.1 php7.0 php7
+        HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64)
      if(PHP_LIB)
        get_filename_component(PHP_LIB_DIR ${PHP_LIB} DIRECTORY)
        string(REPLACE "-I" "" PHP_INCLUDE_DIRS ${PHP_INCLUDE_DIRS})
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Perl libraries
@@ -29,31 +29,31 @@
 #  PERL_LFLAGS = perl compiler options for linking

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

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

 if(PERL_EXECUTABLE)

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

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

  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}")
@@ -63,12 +63,12 @@ if(PERL_EXECUTABLE)
  find_path(PERL_INCLUDE_PATH
    NAMES perl.h
    PATHS ${PERL_INTERNAL_DIR}
-  )
+    )

  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)
@@ -80,5 +80,5 @@ if(PERL_EXECUTABLE)
    PERL_LIBRARY
    PERL_CFLAGS
    PERL_LFLAGS
-  )
+    )
 endif()
@@ -1,60 +1,117 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
+# - a pkg-config module for CMake
+#
+# Usage:
+#   pkg_check_modules(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
+#     checks for all the given modules
+#
+#   pkg_search_module(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
+#     checks for given modules and uses the first working one
+#
+# When the 'REQUIRED' argument was set, macros will fail with an error
+# when module(s) could not be found
+#
+# It sets the following variables:
+#   PKG_CONFIG_FOUND         ... true iff pkg-config works on the system
+#   PKG_CONFIG_EXECUTABLE    ... pathname of the pkg-config program
+#   <PREFIX>_FOUND           ... set to 1 iff module(s) exist
+#
+# For the following variables two sets of values exist; first one is the
+# common one and has the given PREFIX. The second set contains flags
+# which are given out when pkgconfig was called with the '--static'
+# option.
+#   <XPREFIX>_LIBRARIES      ... only the libraries (w/o the '-l')
+#   <XPREFIX>_LIBRARY_DIRS   ... the paths of the libraries (w/o the '-L')
+#   <XPREFIX>_LDFLAGS        ... all required linker flags
+#   <XPREFIX>_LDFLAGS_OTHER ... all other linker flags
+#   <XPREFIX>_INCLUDE_DIRS   ... the '-I' preprocessor flags (w/o the '-I')
+#   <XPREFIX>_CFLAGS         ... all required cflags
+#   <XPREFIX>_CFLAGS_OTHER  ... the other compiler flags
+#
+#   <XPREFIX> = <PREFIX>        for common case
+#   <XPREFIX> = <PREFIX>_STATIC for static linking
+#
+# There are some special variables whose prefix depends on the count
+# of given modules. When there is only one module, <PREFIX> stays
+# unchanged. When there are multiple modules, the prefix will be
+# changed to <PREFIX>_<MODNAME>:
+#   <XPREFIX>_VERSION    ... version of the module
+#   <XPREFIX>_PREFIX     ... prefix-directory of the module
+#   <XPREFIX>_INCLUDEDIR ... include-dir of the module
+#   <XPREFIX>_LIBDIR     ... lib-dir of the module
+#
+#   <XPREFIX> = <PREFIX>  when |MODULES| == 1, else
+#   <XPREFIX> = <PREFIX>_<MODNAME>
+#
+# A <MODULE> parameter can have the following formats:
+#   {MODNAME}            ... matches any version
+#   {MODNAME}>={VERSION} ... at least version <VERSION> is required
+#   {MODNAME}={VERSION}  ... exactly version <VERSION> is required
+#   {MODNAME}<={VERSION} ... modules must not be newer than <VERSION>
+#
+# Examples
+#   pkg_check_modules (GLIB2   glib-2.0)
+#
+#   pkg_check_modules (GLIB2   glib-2.0>=2.10)
+#     requires at least version 2.10 of glib2 and defines e.g.
+#       GLIB2_VERSION=2.10.3
+#
+#   pkg_check_modules (FOO     glib-2.0>=2.10 gtk+-2.0)
+#     requires both glib2 and gtk2, and defines e.g.
+#       FOO_glib-2.0_VERSION=2.10.3
+#       FOO_gtk+-2.0_VERSION=2.8.20
+#
+#   pkg_check_modules (XRENDER REQUIRED xrender)
+#     defines e.g.:
+#       XRENDER_LIBRARIES=Xrender;X11
+#       XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
+#
+#   pkg_search_module (BAR     libxml-2.0 libxml2 libxml>=2)

-#[========================================[.rst:
-FindPkgConfig
-------------

-A ``pkg-config`` module for CMake.
+# Copyright (C) 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+#
+# Redistribution and use, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#    1. Redistributions must retain the above copyright notice, this
+#       list of conditions and the following disclaimer.
+#    2. The name of the author may not be used to endorse or promote
+#       products derived from this software without specific prior
+#       written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-Finds the ``pkg-config`` executable and adds the :command:`pkg_get_variable`,
-:command:`pkg_check_modules` and :command:`pkg_search_module` commands. The
-following variables will also be set:
-
-``PKG_CONFIG_FOUND``
-  if pkg-config executable was found
-``PKG_CONFIG_EXECUTABLE``
-  pathname of the pkg-config program
-``PKG_CONFIG_VERSION_STRING``
-  version of pkg-config (since CMake 2.8.8)
-
-#]========================================]

 ### Common stuff ####
 set(PKG_CONFIG_VERSION 1)
+set(PKG_CONFIG_FOUND   0)

-# find pkg-config, use PKG_CONFIG if set
-if((NOT PKG_CONFIG_EXECUTABLE) AND (NOT "$ENV{PKG_CONFIG}" STREQUAL ""))
-  set(PKG_CONFIG_EXECUTABLE "$ENV{PKG_CONFIG}" CACHE FILEPATH "pkg-config executable")
-endif()
 find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
 mark_as_advanced(PKG_CONFIG_EXECUTABLE)

-if (PKG_CONFIG_EXECUTABLE)
-  execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --version
-    OUTPUT_VARIABLE PKG_CONFIG_VERSION_STRING
-    ERROR_QUIET
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif ()
+if(PKG_CONFIG_EXECUTABLE)
+  set(PKG_CONFIG_FOUND 1)
+endif(PKG_CONFIG_EXECUTABLE)

-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-find_package_handle_standard_args(PkgConfig
-                                  REQUIRED_VARS PKG_CONFIG_EXECUTABLE
-                                  VERSION_VAR PKG_CONFIG_VERSION_STRING)
-
-# This is needed because the module name is "PkgConfig" but the name of
-# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
-# handled by FPHSA.
-set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")

 # Unsets the given variables
 macro(_pkgconfig_unset var)
  set(${var} "" CACHE INTERNAL "")
-endmacro()
+endmacro(_pkgconfig_unset)

 macro(_pkgconfig_set var value)
  set(${var} ${value} CACHE INTERNAL "")
-endmacro()
+endmacro(_pkgconfig_set)

 # Invokes pkgconfig, cleans up the result and sets variables
 macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
@@ -63,311 +120,55 @@ macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
  execute_process(
    COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist}
    OUTPUT_VARIABLE _pkgconfig_invoke_result
-    RESULT_VARIABLE _pkgconfig_failed
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    RESULT_VARIABLE _pkgconfig_failed)

  if (_pkgconfig_failed)
    set(_pkgconfig_${_varname} "")
    _pkgconfig_unset(${_prefix}_${_varname})
-  else()
-    string(REGEX REPLACE "[\r\n]"       " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+  else(_pkgconfig_failed)
+    string(REGEX REPLACE "[\r\n]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+    string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")

    if (NOT ${_regexp} STREQUAL "")
      string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-    endif()
+    endif(NOT ${_regexp} STREQUAL "")

    separate_arguments(_pkgconfig_invoke_result)

    #message(STATUS "  ${_varname} ... ${_pkgconfig_invoke_result}")
    set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result})
    _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}")
-  endif()
-endmacro()
-
-# Internal version of pkg_get_variable; expects PKG_CONFIG_PATH to already be set
-function (_pkg_get_variable result pkg variable)
-  _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
-  set("${result}"
-    "${prefix_result}"
-    PARENT_SCOPE)
-endfunction ()
+  endif(_pkgconfig_failed)
+endmacro(_pkgconfig_invoke)

 # Invokes pkgconfig two times; once without '--static' and once with
 # '--static'
 macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp)
  _pkgconfig_invoke("${_pkglist}" ${_prefix}        ${_varname} "${cleanup_regexp}" ${ARGN})
  _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static  ${ARGN})
-endmacro()
+endmacro(_pkgconfig_invoke_dyn)

 # Splits given arguments into options and a package list
-macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global)
+macro(_pkgconfig_parse_options _result _is_req)
  set(${_is_req} 0)
-  set(${_is_silent} 0)
-  set(${_no_cmake_path} 0)
-  set(${_no_cmake_environment_path} 0)
-  set(${_imp_target} 0)
-  set(${_imp_target_global} 0)
-  if(DEFINED PKG_CONFIG_USE_CMAKE_PREFIX_PATH)
-    if(NOT PKG_CONFIG_USE_CMAKE_PREFIX_PATH)
-      set(${_no_cmake_path} 1)
-      set(${_no_cmake_environment_path} 1)
-    endif()
-  elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
-    set(${_no_cmake_path} 1)
-    set(${_no_cmake_environment_path} 1)
-  endif()

  foreach(_pkg ${ARGN})
    if (_pkg STREQUAL "REQUIRED")
      set(${_is_req} 1)
-    endif ()
-    if (_pkg STREQUAL "QUIET")
-      set(${_is_silent} 1)
-    endif ()
-    if (_pkg STREQUAL "NO_CMAKE_PATH")
-      set(${_no_cmake_path} 1)
-    endif()
-    if (_pkg STREQUAL "NO_CMAKE_ENVIRONMENT_PATH")
-      set(${_no_cmake_environment_path} 1)
-    endif()
-    if (_pkg STREQUAL "IMPORTED_TARGET")
-      set(${_imp_target} 1)
-    endif()
-    if (_pkg STREQUAL "GLOBAL")
-      set(${_imp_target_global} 1)
-    endif()
-  endforeach()
-
-  if (${_imp_target_global} AND NOT ${_imp_target})
-    message(SEND_ERROR "the argument GLOBAL may only be used together with IMPORTED_TARGET")
-  endif()
+    endif (_pkg STREQUAL "REQUIRED")
+  endforeach(_pkg ${ARGN})

  set(${_result} ${ARGN})
  list(REMOVE_ITEM ${_result} "REQUIRED")
-  list(REMOVE_ITEM ${_result} "QUIET")
-  list(REMOVE_ITEM ${_result} "NO_CMAKE_PATH")
-  list(REMOVE_ITEM ${_result} "NO_CMAKE_ENVIRONMENT_PATH")
-  list(REMOVE_ITEM ${_result} "IMPORTED_TARGET")
-  list(REMOVE_ITEM ${_result} "GLOBAL")
-endmacro()
-
-# Add the content of a variable or an environment variable to a list of
-# paths
-# Usage:
-#  - _pkgconfig_add_extra_path(_extra_paths VAR)
-#  - _pkgconfig_add_extra_path(_extra_paths ENV VAR)
-function(_pkgconfig_add_extra_path _extra_paths_var _var)
-  set(_is_env 0)
-  if(ARGC GREATER 2 AND _var STREQUAL "ENV")
-    set(_var ${ARGV2})
-    set(_is_env 1)
-  endif()
-  if(NOT _is_env)
-    if(NOT "${${_var}}" STREQUAL "")
-      list(APPEND ${_extra_paths_var} ${${_var}})
-    endif()
-  else()
-    if(NOT "$ENV{${_var}}" STREQUAL "")
-      file(TO_CMAKE_PATH "$ENV{${_var}}" _path)
-      list(APPEND ${_extra_paths_var} ${_path})
-      unset(_path)
-    endif()
-  endif()
-  set(${_extra_paths_var} ${${_extra_paths_var}} PARENT_SCOPE)
-endfunction()
-
-# scan the LDFLAGS returned by pkg-config for library directories and
-# libraries, figure out the absolute paths of that libraries in the
-# given directories
-function(_pkg_find_libs _prefix _no_cmake_path _no_cmake_environment_path)
-  unset(_libs)
-  unset(_find_opts)
-
-  # set the options that are used as long as the .pc file does not provide a library
-  # path to look into
-  if(_no_cmake_path)
-    list(APPEND _find_opts "NO_CMAKE_PATH")
-  endif()
-  if(_no_cmake_environment_path)
-    list(APPEND _find_opts "NO_CMAKE_ENVIRONMENT_PATH")
-  endif()
-
-  unset(_search_paths)
-  foreach (flag IN LISTS ${_prefix}_LDFLAGS)
-    if (flag MATCHES "^-L(.*)")
-      list(APPEND _search_paths ${CMAKE_MATCH_1})
-      continue()
-    endif()
-    if (flag MATCHES "^-l(.*)")
-      set(_pkg_search "${CMAKE_MATCH_1}")
-    else()
-      continue()
-    endif()
-
-    if(_search_paths)
-        # Firstly search in -L paths
-        find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
-                     NAMES ${_pkg_search}
-                     HINTS ${_search_paths} NO_DEFAULT_PATH)
-    endif()
-    find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
-                 NAMES ${_pkg_search}
-                 ${_find_opts})
-    mark_as_advanced(pkgcfg_lib_${_prefix}_${_pkg_search})
-    if(pkgcfg_lib_${_prefix}_${_pkg_search})
-      list(APPEND _libs "${pkgcfg_lib_${_prefix}_${_pkg_search}}")
-    else()
-      list(APPEND _libs ${_pkg_search})
-    endif()
-  endforeach()
-
-  set(${_prefix}_LINK_LIBRARIES "${_libs}" PARENT_SCOPE)
-endfunction()
-
-# create an imported target from all the information returned by pkg-config
-function(_pkg_create_imp_target _prefix _imp_target_global)
-  # only create the target if it is linkable, i.e. no executables
-  if (NOT TARGET PkgConfig::${_prefix}
-      AND ( ${_prefix}_INCLUDE_DIRS OR ${_prefix}_LINK_LIBRARIES OR ${_prefix}_LDFLAGS_OTHER OR ${_prefix}_CFLAGS_OTHER ))
-    if(${_imp_target_global})
-      set(_global_opt "GLOBAL")
-    else()
-      unset(_global_opt)
-    endif()
-    add_library(PkgConfig::${_prefix} INTERFACE IMPORTED ${_global_opt})
-
-    if(${_prefix}_INCLUDE_DIRS)
-      set_property(TARGET PkgConfig::${_prefix} PROPERTY
-                   INTERFACE_INCLUDE_DIRECTORIES "${${_prefix}_INCLUDE_DIRS}")
-    endif()
-    if(${_prefix}_LINK_LIBRARIES)
-      set_property(TARGET PkgConfig::${_prefix} PROPERTY
-                   INTERFACE_LINK_LIBRARIES "${${_prefix}_LINK_LIBRARIES}")
-    endif()
-    if(${_prefix}_LDFLAGS_OTHER)
-      set_property(TARGET PkgConfig::${_prefix} PROPERTY
-                   INTERFACE_LINK_OPTIONS "${${_prefix}_LDFLAGS_OTHER}")
-    endif()
-    if(${_prefix}_CFLAGS_OTHER)
-      set_property(TARGET PkgConfig::${_prefix} PROPERTY
-                   INTERFACE_COMPILE_OPTIONS "${${_prefix}_CFLAGS_OTHER}")
-    endif()
-  endif()
-endfunction()
-
-# recalculate the dynamic output
-# this is a macro and not a function so the result of _pkg_find_libs is automatically propagated
-macro(_pkg_recalculate _prefix _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global)
-  _pkg_find_libs(${_prefix} ${_no_cmake_path} ${_no_cmake_environment_path})
-  if(${_imp_target})
-    _pkg_create_imp_target(${_prefix} ${_imp_target_global})
-  endif()
-endmacro()
+endmacro(_pkgconfig_parse_options)

 ###
-macro(_pkg_set_path_internal)
-  set(_extra_paths)
-
-  if(NOT _no_cmake_path)
-    _pkgconfig_add_extra_path(_extra_paths CMAKE_PREFIX_PATH)
-    _pkgconfig_add_extra_path(_extra_paths CMAKE_FRAMEWORK_PATH)
-    _pkgconfig_add_extra_path(_extra_paths CMAKE_APPBUNDLE_PATH)
-  endif()
-
-  if(NOT _no_cmake_environment_path)
-    _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_PREFIX_PATH)
-    _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_FRAMEWORK_PATH)
-    _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_APPBUNDLE_PATH)
-  endif()
-
-  if(NOT _extra_paths STREQUAL "")
-    # Save the PKG_CONFIG_PATH environment variable, and add paths
-    # from the CMAKE_PREFIX_PATH variables
-    set(_pkgconfig_path_old "$ENV{PKG_CONFIG_PATH}")
-    set(_pkgconfig_path "${_pkgconfig_path_old}")
-    if(NOT _pkgconfig_path STREQUAL "")
-      file(TO_CMAKE_PATH "${_pkgconfig_path}" _pkgconfig_path)
-    endif()
-
-    # Create a list of the possible pkgconfig subfolder (depending on
-    # the system
-    set(_lib_dirs)
-    if(NOT DEFINED CMAKE_SYSTEM_NAME
-        OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
-            AND NOT CMAKE_CROSSCOMPILING))
-      if(EXISTS "/etc/debian_version") # is this a debian system ?
-        if(CMAKE_LIBRARY_ARCHITECTURE)
-          list(APPEND _lib_dirs "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig")
-        endif()
-      else()
-        # not debian, check the FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS properties
-        get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS)
-        if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-          list(APPEND _lib_dirs "lib32/pkgconfig")
-        endif()
-        get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-        if(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-          list(APPEND _lib_dirs "lib64/pkgconfig")
-        endif()
-        get_property(uselibx32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS)
-        if(uselibx32 AND CMAKE_INTERNAL_PLATFORM_ABI STREQUAL "ELF X32")
-          list(APPEND _lib_dirs "libx32/pkgconfig")
-        endif()
-      endif()
-    endif()
-    if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_CROSSCOMPILING)
-      list(APPEND _lib_dirs "libdata/pkgconfig")
-    endif()
-    list(APPEND _lib_dirs "lib/pkgconfig")
-    list(APPEND _lib_dirs "share/pkgconfig")
-
-    # Check if directories exist and eventually append them to the
-    # pkgconfig path list
-    foreach(_prefix_dir ${_extra_paths})
-      foreach(_lib_dir ${_lib_dirs})
-        if(EXISTS "${_prefix_dir}/${_lib_dir}")
-          list(APPEND _pkgconfig_path "${_prefix_dir}/${_lib_dir}")
-          list(REMOVE_DUPLICATES _pkgconfig_path)
-        endif()
-      endforeach()
-    endforeach()
-
-    # Prepare and set the environment variable
-    if(NOT _pkgconfig_path STREQUAL "")
-      # remove empty values from the list
-      list(REMOVE_ITEM _pkgconfig_path "")
-      file(TO_NATIVE_PATH "${_pkgconfig_path}" _pkgconfig_path)
-      if(UNIX)
-        string(REPLACE ";" ":" _pkgconfig_path "${_pkgconfig_path}")
-        string(REPLACE "\\ " " " _pkgconfig_path "${_pkgconfig_path}")
-      endif()
-      set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path}")
-    endif()
-
-    # Unset variables
-    unset(_lib_dirs)
-    unset(_pkgconfig_path)
-  endif()
-endmacro()
-
-macro(_pkg_restore_path_internal)
-  if(NOT _extra_paths STREQUAL "")
-    # Restore the environment variable
-    set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path_old}")
-  endif()
-
-  unset(_extra_paths)
-  unset(_pkgconfig_path_old)
-endmacro()
-
-###
-macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global _prefix)
+macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
  _pkgconfig_unset(${_prefix}_FOUND)
  _pkgconfig_unset(${_prefix}_VERSION)
  _pkgconfig_unset(${_prefix}_PREFIX)
  _pkgconfig_unset(${_prefix}_INCLUDEDIR)
  _pkgconfig_unset(${_prefix}_LIBDIR)
-  _pkgconfig_unset(${_prefix}_MODULE_NAME)
  _pkgconfig_unset(${_prefix}_LIBS)
  _pkgconfig_unset(${_prefix}_LIBS_L)
  _pkgconfig_unset(${_prefix}_LIBS_PATHS)
@@ -392,77 +193,83 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
    # give out status message telling checked module
    if (NOT ${_is_silent})
      if (_pkg_check_modules_cnt EQUAL 1)
-        message(STATUS "Checking for module '${_pkg_check_modules_list}'")
-      else()
-        message(STATUS "Checking for modules '${_pkg_check_modules_list}'")
-      endif()
-    endif()
+        message(STATUS "checking for module '${_pkg_check_modules_list}'")
+      else(_pkg_check_modules_cnt EQUAL 1)
+        message(STATUS "checking for modules '${_pkg_check_modules_list}'")
+      endif(_pkg_check_modules_cnt EQUAL 1)
+    endif(NOT ${_is_silent})

    set(_pkg_check_modules_packages)
    set(_pkg_check_modules_failed)

-    _pkg_set_path_internal()
-
    # iterate through module list and check whether they exist and match the required version
    foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
      set(_pkg_check_modules_exist_query)

      # check whether version is given
-      if (_pkg_check_modules_pkg MATCHES "(.*[^><])(=|[><]=?)(.*)")
-        set(_pkg_check_modules_pkg_name "${CMAKE_MATCH_1}")
-        set(_pkg_check_modules_pkg_op "${CMAKE_MATCH_2}")
-        set(_pkg_check_modules_pkg_ver "${CMAKE_MATCH_3}")
-      else()
+      if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
+        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
+        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op   "${_pkg_check_modules_pkg}")
+        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver  "${_pkg_check_modules_pkg}")
+      else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
        set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
        set(_pkg_check_modules_pkg_op)
        set(_pkg_check_modules_pkg_ver)
-      endif()
+      endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
+
+      # handle the operands
+      if (_pkg_check_modules_pkg_op STREQUAL ">=")
+        list(APPEND _pkg_check_modules_exist_query --atleast-version)
+      endif(_pkg_check_modules_pkg_op STREQUAL ">=")
+
+      if (_pkg_check_modules_pkg_op STREQUAL "=")
+        list(APPEND _pkg_check_modules_exist_query --exact-version)
+      endif(_pkg_check_modules_pkg_op STREQUAL "=")
+
+      if (_pkg_check_modules_pkg_op STREQUAL "<=")
+        list(APPEND _pkg_check_modules_exist_query --max-version)
+      endif(_pkg_check_modules_pkg_op STREQUAL "<=")
+
+      # create the final query which is of the format:
+      # * --atleast-version <version> <pkg-name>
+      # * --exact-version <version> <pkg-name>
+      # * --max-version <version> <pkg-name>
+      # * --exists <pkg-name>
+      if (_pkg_check_modules_pkg_op)
+        list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}")
+      else(_pkg_check_modules_pkg_op)
+        list(APPEND _pkg_check_modules_exist_query --exists)
+      endif(_pkg_check_modules_pkg_op)

      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION)
      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX)
      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR)
      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR)

+      list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}")
      list(APPEND _pkg_check_modules_packages    "${_pkg_check_modules_pkg_name}")

-      # create the final query which is of the format:
-      # * <pkg-name> > <version>
-      # * <pkg-name> >= <version>
-      # * <pkg-name> = <version>
-      # * <pkg-name> <= <version>
-      # * <pkg-name> < <version>
-      # * --exists <pkg-name>
-      list(APPEND _pkg_check_modules_exist_query --print-errors --short-errors)
-      if (_pkg_check_modules_pkg_op)
-        list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name} ${_pkg_check_modules_pkg_op} ${_pkg_check_modules_pkg_ver}")
-      else()
-        list(APPEND _pkg_check_modules_exist_query --exists)
-        list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}")
-      endif()
-
      # execute the query
      execute_process(
        COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query}
-        RESULT_VARIABLE _pkgconfig_retval
-        ERROR_VARIABLE _pkgconfig_error
-        ERROR_STRIP_TRAILING_WHITESPACE)
+        RESULT_VARIABLE _pkgconfig_retval)

      # evaluate result and tell failures
      if (_pkgconfig_retval)
        if(NOT ${_is_silent})
-          message(STATUS "  ${_pkgconfig_error}")
-        endif()
+          message(STATUS "  package '${_pkg_check_modules_pkg}' not found")
+        endif(NOT ${_is_silent})

        set(_pkg_check_modules_failed 1)
-      endif()
-    endforeach()
+      endif(_pkgconfig_retval)
+    endforeach(_pkg_check_modules_pkg)

    if(_pkg_check_modules_failed)
      # fail when requested
      if (${_is_required})
-        message(FATAL_ERROR "A required package was not found")
-      endif ()
-    else()
+        message(SEND_ERROR "A required package was not found")
+      endif (${_is_required})
+    else(_pkg_check_modules_failed)
      # when we are here, we checked whether requested modules
      # exist. Now, go through them and set variables

@@ -474,23 +281,17 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
        # handle case when there is only one package required
        if (pkg_count EQUAL 1)
          set(_pkg_check_prefix "${_prefix}")
-        else()
+        else(pkg_count EQUAL 1)
          set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}")
-        endif()
+        endif(pkg_count EQUAL 1)

        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION    ""   --modversion )
-        pkg_get_variable("${_pkg_check_prefix}_PREFIX" ${_pkg_check_modules_pkg} "prefix")
-        pkg_get_variable("${_pkg_check_prefix}_INCLUDEDIR" ${_pkg_check_modules_pkg} "includedir")
-        pkg_get_variable("${_pkg_check_prefix}_LIBDIR" ${_pkg_check_modules_pkg} "libdir")
-        foreach (variable IN ITEMS PREFIX INCLUDEDIR LIBDIR)
-          _pkgconfig_set("${_pkg_check_prefix}_${variable}" "${${_pkg_check_prefix}_${variable}}")
-        endforeach ()
-          _pkgconfig_set("${_pkg_check_prefix}_MODULE_NAME" "${_pkg_check_modules_pkg}")
+        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX     ""   --variable=prefix )
+        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR ""   --variable=includedir )
+        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR     ""   --variable=libdir )

-        if (NOT ${_is_silent})
-          message(STATUS "  Found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}")
-        endif ()
-      endforeach()
+        message(STATUS "  found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}")
+      endforeach(_pkg_check_modules_pkg)

      # set variables which are combined for multiple modules
      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES           "(^| )-l" --libs-only-l )
@@ -501,271 +302,58 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS        "(^| )-I" --cflags-only-I )
      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS              ""        --cflags )
      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER        ""        --cflags-only-other )
-
-      _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
-    endif()
-
-    _pkg_restore_path_internal()
-  else()
+    endif(_pkg_check_modules_failed)
+  else(PKG_CONFIG_EXECUTABLE)
    if (${_is_required})
      message(SEND_ERROR "pkg-config tool not found")
-    endif ()
-  endif()
-endmacro()
+    endif (${_is_required})
+  endif(PKG_CONFIG_EXECUTABLE)
+endmacro(_pkg_check_modules_internal)

+###
+### User visible macros start here
+###

-#[========================================[.rst:
-.. command:: pkg_check_modules
-
-  Checks for all the given modules, setting a variety of result variables in
-  the calling scope.
-
-  .. code-block:: cmake
-
-    pkg_check_modules(<prefix>
-                      [REQUIRED] [QUIET]
-                      [NO_CMAKE_PATH]
-                      [NO_CMAKE_ENVIRONMENT_PATH]
-                      [IMPORTED_TARGET [GLOBAL]]
-                      <moduleSpec> [<moduleSpec>...])
-
-  When the ``REQUIRED`` argument is given, the command will fail with an error
-  if module(s) could not be found.
-
-  When the ``QUIET`` argument is given, no status messages will be printed.
-
-  By default, if :variable:`CMAKE_MINIMUM_REQUIRED_VERSION` is 3.1 or
-  later, or if :variable:`PKG_CONFIG_USE_CMAKE_PREFIX_PATH` is set to a
-  boolean ``True`` value, then the :variable:`CMAKE_PREFIX_PATH`,
-  :variable:`CMAKE_FRAMEWORK_PATH`, and :variable:`CMAKE_APPBUNDLE_PATH` cache
-  and environment variables will be added to the ``pkg-config`` search path.
-  The ``NO_CMAKE_PATH`` and ``NO_CMAKE_ENVIRONMENT_PATH`` arguments
-  disable this behavior for the cache variables and environment variables
-  respectively.
-
-  The ``IMPORTED_TARGET`` argument will create an imported target named
-  ``PkgConfig::<prefix>`` that can be passed directly as an argument to
-  :command:`target_link_libraries`. The ``GLOBAL`` argument will make the
-  imported target available in global scope.
-
-  Each ``<moduleSpec>`` can be either a bare module name or it can be a
-  module name with a version constraint (operators ``=``, ``<``, ``>``,
-  ``<=`` and ``>=`` are supported).  The following are examples for a module
-  named ``foo`` with various constraints:
-
-  - ``foo`` matches any version.
-  - ``foo<2`` only matches versions before 2.
-  - ``foo>=3.1`` matches any version from 3.1 or later.
-  - ``foo=1.2.3`` requires that foo must be exactly version 1.2.3.
-
-  The following variables may be set upon return.  Two sets of values exist:
-  One for the common case (``<XXX> = <prefix>``) and another for the
-  information ``pkg-config`` provides when called with the ``--static``
-  option (``<XXX> = <prefix>_STATIC``).
-
-  ``<XXX>_FOUND``
-    set to 1 if module(s) exist
-  ``<XXX>_LIBRARIES``
-    only the libraries (without the '-l')
-  ``<XXX>_LINK_LIBRARIES``
-    the libraries and their absolute paths
-  ``<XXX>_LIBRARY_DIRS``
-    the paths of the libraries (without the '-L')
-  ``<XXX>_LDFLAGS``
-    all required linker flags
-  ``<XXX>_LDFLAGS_OTHER``
-    all other linker flags
-  ``<XXX>_INCLUDE_DIRS``
-    the '-I' preprocessor flags (without the '-I')
-  ``<XXX>_CFLAGS``
-    all required cflags
-  ``<XXX>_CFLAGS_OTHER``
-    the other compiler flags
-
-  All but ``<XXX>_FOUND`` may be a :ref:`;-list <CMake Language Lists>` if the
-  associated variable returned from ``pkg-config`` has multiple values.
-
-  There are some special variables whose prefix depends on the number of
-  ``<moduleSpec>`` given.  When there is only one ``<moduleSpec>``,
-  ``<YYY>`` will simply be ``<prefix>``, but if two or more ``<moduleSpec>``
-  items are given, ``<YYY>`` will be ``<prefix>_<moduleName>``.
-
-  ``<YYY>_VERSION``
-    version of the module
-  ``<YYY>_PREFIX``
-    prefix directory of the module
-  ``<YYY>_INCLUDEDIR``
-    include directory of the module
-  ``<YYY>_LIBDIR``
-    lib directory of the module
-
-  Examples:
-
-  .. code-block:: cmake
-
-    pkg_check_modules (GLIB2 glib-2.0)
-
-  Looks for any version of glib2.  If found, the output variable
-  ``GLIB2_VERSION`` will hold the actual version found.
-
-  .. code-block:: cmake
-
-    pkg_check_modules (GLIB2 glib-2.0>=2.10)
-
-  Looks for at least version 2.10 of glib2.  If found, the output variable
-  ``GLIB2_VERSION`` will hold the actual version found.
-
-  .. code-block:: cmake
-
-    pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0)
-
-  Looks for both glib2-2.0 (at least version 2.10) and any version of
-  gtk2+-2.0.  Only if both are found will ``FOO`` be considered found.
-  The ``FOO_glib-2.0_VERSION`` and ``FOO_gtk+-2.0_VERSION`` variables will be
-  set to their respective found module versions.
-
-  .. code-block:: cmake
-
-    pkg_check_modules (XRENDER REQUIRED xrender)
-
-  Requires any version of ``xrender``.  Example output variables set by a
-  successful call::
-
-    XRENDER_LIBRARIES=Xrender;X11
-    XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
-#]========================================]
+###
 macro(pkg_check_modules _prefix _module0)
-  _pkgconfig_parse_options(_pkg_modules _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global "${_module0}" ${ARGN})
  # check cached value
-  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND OR
-      (NOT "${ARGN}" STREQUAL "" AND NOT "${__pkg_config_arguments_${_prefix}}" STREQUAL "${_module0};${ARGN}") OR
-      (    "${ARGN}" STREQUAL "" AND NOT "${__pkg_config_arguments_${_prefix}}" STREQUAL "${_module0}"))
-    _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global} "${_prefix}" ${_pkg_modules})
+  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
+    _pkgconfig_parse_options   (_pkg_modules _pkg_is_required "${_module0}" ${ARGN})
+    _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules})

    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-    if (${_prefix}_FOUND)
-      _pkgconfig_set(__pkg_config_arguments_${_prefix} "${_module0};${ARGN}")
-    endif()
-  else()
-    if (${_prefix}_FOUND)
-      _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
-    endif()
-  endif()
-endmacro()
+  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
+endmacro(pkg_check_modules)

-
-#[========================================[.rst:
-.. command:: pkg_search_module
-
-  The behavior of this command is the same as :command:`pkg_check_modules`,
-  except that rather than checking for all the specified modules, it searches
-  for just the first successful match.
-
-  .. code-block:: cmake
-
-    pkg_search_module(<prefix>
-                      [REQUIRED] [QUIET]
-                      [NO_CMAKE_PATH]
-                      [NO_CMAKE_ENVIRONMENT_PATH]
-                      [IMPORTED_TARGET [GLOBAL]]
-                      <moduleSpec> [<moduleSpec>...])
-
-  If a module is found, the ``<prefix>_MODULE_NAME`` variable will contain the
-  name of the matching module. This variable can be used if you need to run
-  :command:`pkg_get_variable`.
-
-  Example:
-
-  .. code-block:: cmake
-
-    pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2)
-#]========================================]
+###
 macro(pkg_search_module _prefix _module0)
-  _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global "${_module0}" ${ARGN})
  # check cached value
  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
    set(_pkg_modules_found 0)
+    _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN})

-    if (NOT ${_pkg_is_silent})
-      message(STATUS "Checking for one of the modules '${_pkg_modules_alt}'")
-    endif ()
+    message(STATUS "checking for one of the modules '${_pkg_modules_alt}'")

    # iterate through all modules and stop at the first working one.
    foreach(_pkg_alt ${_pkg_modules_alt})
      if(NOT _pkg_modules_found)
-        _pkg_check_modules_internal(0 1 ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global} "${_prefix}" "${_pkg_alt}")
-      endif()
+        _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}")
+      endif(NOT _pkg_modules_found)

      if (${_prefix}_FOUND)
        set(_pkg_modules_found 1)
-        break()
-      endif()
-    endforeach()
+      endif(${_prefix}_FOUND)
+    endforeach(_pkg_alt)

    if (NOT ${_prefix}_FOUND)
      if(${_pkg_is_required})
        message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found")
-      endif()
-    endif()
+      endif(${_pkg_is_required})
+    endif(NOT ${_prefix}_FOUND)

    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-  elseif (${_prefix}_FOUND)
-    _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
-  endif()
-endmacro()
-
-#[========================================[.rst:
-.. command:: pkg_get_variable
-
-  Retrieves the value of a pkg-config variable ``varName`` and stores it in the
-  result variable ``resultVar`` in the calling scope.
-
-  .. code-block:: cmake
-
-    pkg_get_variable(<resultVar> <moduleName> <varName>)
-
-  If ``pkg-config`` returns multiple values for the specified variable,
-  ``resultVar`` will contain a :ref:`;-list <CMake Language Lists>`.
-
-  For example:
-
-  .. code-block:: cmake
-
-    pkg_get_variable(GI_GIRDIR gobject-introspection-1.0 girdir)
-#]========================================]
-function (pkg_get_variable result pkg variable)
-  _pkg_set_path_internal()
-  _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
-  set("${result}"
-    "${prefix_result}"
-    PARENT_SCOPE)
-  _pkg_restore_path_internal()
-endfunction ()
-
-
-#[========================================[.rst:
-Variables Affecting Behavior
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. variable:: PKG_CONFIG_EXECUTABLE
-
-  This can be set to the path of the pkg-config executable.  If not provided,
-  it will be set by the module as a result of calling :command:`find_program`
-  internally.  The ``PKG_CONFIG`` environment variable can be used as a hint.
-
-.. variable:: PKG_CONFIG_USE_CMAKE_PREFIX_PATH
-
-  Specifies whether :command:`pkg_check_modules` and
-  :command:`pkg_search_module` should add the paths in the
-  :variable:`CMAKE_PREFIX_PATH`, :variable:`CMAKE_FRAMEWORK_PATH` and
-  :variable:`CMAKE_APPBUNDLE_PATH` cache and environment variables to the
-  ``pkg-config`` search path.
-
-  If this variable is not set, this behavior is enabled by default if
-  :variable:`CMAKE_MINIMUM_REQUIRED_VERSION` is 3.1 or later, disabled
-  otherwise.
-#]========================================]
-
+  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
+endmacro(pkg_search_module)

 ### Local Variables:
 ### mode: cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -15,7 +15,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Python
@@ -24,17 +24,80 @@
 # code sets the following variables:
 #
 #  PYTHON_EXECUTABLE   = full path to the python binary
-#  PYTHON_INCLUDE_DIRS = path to where python.h can be found
-#  PYTHON_LIBRARIES = path to where libpython.so* can be found
-#  PYTHON_LDFLAGS = python compiler options for linking
+#  PYTHON_INCLUDE_PATH = path to where python.h can be found
+#  PYTHON_LIBRARY = path to where libpython.so* can be found
+#  PYTHON_LFLAGS = python compiler options for linking
+
+if(PYTHON_FOUND)
+   # Already in cache, be silent
+   set(PYTHON_FIND_QUIETLY TRUE)
+endif()
+
+if(ENABLE_PYTHON3)
+  find_program(PYTHON_EXECUTABLE
+    NAMES python3.6 python3.5 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()
+  find_program(PYTHON_EXECUTABLE
+    NAMES python2.7 python2.6 python2.5 python
+    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+    )
+endif()
+
+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(
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBPL'))"
+    OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH
+    )
+
+  execute_process(
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBS') + ' ' + get_config_var('LINKFORSHARED'))"
+    OUTPUT_VARIABLE PYTHON_LFLAGS
+    )
+
+  find_path(PYTHON_INCLUDE_PATH
+    NAMES Python.h
+    HINTS ${PYTHON_INC_DIR}
+    )
+  if(ENABLE_PYTHON3)
+    find_library(PYTHON_LIBRARY
+      NAMES python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
+      )
+  else()
+    find_library(PYTHON_LIBRARY
+      NAMES python2.7 python2.6 python2.5 python
+      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
+      )
+  endif()
+
+  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(
+      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()
+  endif()
+
+  mark_as_advanced(
+    PYTHON_EXECUTABLE
+    PYTHON_INCLUDE_PATH
+    PYTHON_LIBRARY
+    PYTHON_LFLAGS
+    )

-include(FindPkgConfig)
-
-if(ENABLE_PYTHON2)
-  pkg_check_modules(PYTHON python2 IMPORTED_TARGET GLOBAL)
-else()
-  pkg_check_modules(PYTHON python3-embed IMPORTED_TARGET GLOBAL)
-  if(NOT PYTHON_FOUND)
-    pkg_check_modules(PYTHON python3 IMPORTED_TARGET GLOBAL)
-  endif()
 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find Ruby
@@ -27,13 +27,13 @@
 #  RUBY_LIB          = ruby library (found without pkg-config)

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

 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(RUBY ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9)
+  pkg_search_module(RUBY ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
 endif()

 if(RUBY_FOUND)
@@ -41,35 +41,35 @@ if(RUBY_FOUND)
  mark_as_advanced(RUBY_LIB)
 else()
  find_program(RUBY_EXECUTABLE
-    NAMES ruby2.6.0 ruby260 ruby2.6 ruby2.5.0 ruby250 ruby2.5 ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby
+    NAMES ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 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
-  )
+    )
  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 ruby
+      NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
      PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
-    )
+      )
    if(RUBY_LIB AND RUBY_INCLUDE_DIRS)
      set(RUBY_FOUND TRUE)
    endif()
@@ -78,6 +78,6 @@ else()
      RUBY_INCLUDE_DIRS
      RUBY_LIBRARY_DIRS
      RUBY_LIB
-    )
+      )
  endif()
 endif()
@@ -0,0 +1,162 @@
+#
+# Copyright (C) 2008 Julien Louis <ptitlouis@sysif.net>
+# Copyright (C) 2008-2017 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 Tcl includes and libraries.
+# This module finds if Tcl 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:
+#  TCL_FOUND              = Tcl was found
+#  TK_FOUND               = Tk was found
+#  TCLTK_FOUND            = Tcl and Tk were found
+#  TCL_LIBRARY            = path to Tcl library (tcl tcl80)
+#  TCL_INCLUDE_PATH       = path to where tcl.h can be found
+#  TCL_TCLSH              = path to tclsh binary (tcl tcl80)
+#  TK_LIBRARY             = path to Tk library (tk tk80 etc)
+#  TK_INCLUDE_PATH        = path to where tk.h can be found
+#  TK_WISH                = full path to the wish executable
+#
+# In an effort to remove some clutter and clear up some issues for people
+# who are not necessarily Tcl/Tk gurus/developpers, some variables were
+# moved or removed. Changes compared to CMake 2.4 are:
+# - The stub libraries are now found in FindTclStub.cmake
+#   => they were only useful for people writing Tcl/Tk extensions.
+# - TCL_LIBRARY_DEBUG and TK_LIBRARY_DEBUG were removed.
+#   => these libs are not packaged by default with Tcl/Tk distributions.
+#      Even when Tcl/Tk is built from source, several flavors of debug libs
+#      are created and there is no real reason to pick a single one
+#      specifically (say, amongst tcl84g, tcl84gs, or tcl84sgx).
+#      Let's leave that choice to the user by allowing him to assign
+#      TCL_LIBRARY to any Tcl library, debug or not.
+# - TK_INTERNAL_PATH was removed.
+#   => this ended up being only a Win32 variable, and there is a lot of
+#      confusion regarding the location of this file in an installed Tcl/Tk
+#      tree anyway (see 8.5 for example). If you need the internal path at
+#      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()
+
+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
+  "^.*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_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
+  "${TCL_INCLUDE_PATH_PARENT}/lib"
+  "${TCL_INCLUDE_PATH_PARENT}/lib64"
+  "${TCL_LIBRARY_PATH}"
+  "${TCL_TCLSH_PATH_PARENT}/lib"
+  "${TCL_TCLSH_PATH_PARENT}/lib64"
+  /usr/lib
+  /usr/lib64
+  /usr/local/lib
+  /usr/local/lib64
+  )
+
+if(WIN32)
+  get_filename_component(
+    ActiveTcl_CurrentVersion
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
+    NAME)
+  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"
+    "$ENV{ProgramFiles}/Tcl/Lib"
+    "C:/Program Files/Tcl/lib"
+    "C:/Tcl/lib"
+    )
+endif()
+
+find_library(TCL_LIBRARY
+  NAMES
+  tcl86 tcl8.6
+  tcl85 tcl8.5
+  tcl
+  tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION}
+  PATHS ${TCL_POSSIBLE_LIB_PATHS}
+  )
+
+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()
+endif()
+
+set(TCL_POSSIBLE_INCLUDE_PATHS
+  "${TCL_LIBRARY_PATH_PARENT}/include"
+  "${TCL_INCLUDE_PATH}"
+  ${TCL_FRAMEWORK_INCLUDES}
+  "${TCL_TCLSH_PATH_PARENT}/include"
+  /usr/include/tcl8.6
+  /usr/include/tcl8.5
+  /usr/include
+  /usr/local/include
+  /usr/include/tcl${TCL_VERSION}
+  /usr/local/include/tcl${TCL_VERSION}
+  /usr/local/include/tcl8.6
+  /usr/local/include/tcl8.5
+  )
+
+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"
+    "$ENV{ProgramFiles}/Tcl/include"
+    "C:/Program Files/Tcl/include"
+    "C:/Tcl/include"
+    )
+endif()
+
+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()
+
+mark_as_advanced(
+  TCL_INCLUDE_PATH
+  TCL_LIBRARY
+  TCL_VERSION
+  )
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2015-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2015-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 # - Find V8 (Google's JavaScript engine)
@@ -41,7 +41,7 @@ find_library(ZLIB_LIBRARY
  ${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")
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
@@ -37,4 +37,4 @@ foreach(file ${files})
  else()
    message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
  endif()
-endforeach()
+endforeach(file)
@@ -13,7 +13,7 @@
 #define PACKAGE "@PROJECT_NAME@"
 #define PACKAGE_NAME "@PROJECT_NAME@"
 #define PACKAGE_STRING "@PKG_STRING@"
-#define WEECHAT_LIBDIR "@WEECHAT_LIBDIR@"
+#define WEECHAT_LIBDIR "@LIBDIR@"
 #define WEECHAT_SHAREDIR "@SHAREDIR@"
 #define LOCALEDIR "@LOCALEDIR@"
 #define WEECHAT_HOME "@WEECHAT_HOME@"
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Benoit Papillault <benoit.papillault@free.fr>
 # Copyright (C) 2005-2006 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2009 Emmanuel Bouthenot <kolter@openics.org>
@@ -17,7 +17,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 #                                               -*- Autoconf -*-
@@ -37,7 +37,6 @@ AC_PROG_MAKE_SET
 AC_GNU_SOURCE
 AC_PROG_LN_S
 AM_PROG_LIBTOOL
-PKG_PROG_PKG_CONFIG

 # Files to generate
 AC_CONFIG_FILES([weechat.pc])
@@ -109,6 +108,7 @@ 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_BUFLIST], [#undef PLUGIN_BUFLIST])
 AH_VERBATIM([PLUGIN_CHARSET], [#undef PLUGIN_CHARSET])
 AH_VERBATIM([PLUGIN_EXEC], [#undef PLUGIN_EXEC])
@@ -126,7 +126,6 @@ AH_VERBATIM([PLUGIN_PHP], [#undef PLUGIN_PHP])
 AH_VERBATIM([PLUGIN_TCL], [#undef PLUGIN_TCL])
 AH_VERBATIM([PLUGIN_GUILE], [#undef PLUGIN_GUILE])
 AH_VERBATIM([PLUGIN_JAVASCRIPT], [#undef PLUGIN_JAVASCRIPT])
-AH_VERBATIM([PLUGIN_SPELL], [#undef PLUGIN_SPELL])
 AH_VERBATIM([PLUGIN_TRIGGER], [#undef PLUGIN_TRIGGER])
 AH_VERBATIM([PLUGIN_XFER], [#undef PLUGIN_XFER])
 AH_VERBATIM([TESTS], [#undef TESTS])
@@ -138,10 +137,11 @@ AH_VERBATIM([CA_FILE], [#define CA_FILE "/etc/ssl/certs/ca-certificates.crt"])
 # Arguments for ./configure

 AC_ARG_ENABLE(ncurses,      [  --disable-ncurses       turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes)
-AC_ARG_ENABLE(headless,     [  --disable-headless      turn off headless binary (default=compiled), this is required for tests],enable_headless=$enableval,enable_headless=yes)
 AC_ARG_ENABLE(gnutls,       [  --disable-gnutls        turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes)
 AC_ARG_ENABLE(largefile,    [  --disable-largefile     turn off Large File Support (default=on)],enable_largefile=$enableval,enable_largefile=yes)
 AC_ARG_ENABLE(alias,        [  --disable-alias         turn off Alias plugin (default=compiled)],enable_alias=$enableval,enable_alias=yes)
+AC_ARG_ENABLE(aspell,       [  --disable-aspell        turn off Aspell plugin (default=compiled)],enable_aspell=$enableval,enable_aspell=yes)
+AC_ARG_ENABLE(enchant,      [  --enable-enchant        turn on Enchant lib for Aspell plugin (default=off)],enable_enchant=$enableval,enable_enchant=no)
 AC_ARG_ENABLE(buflist,      [  --disable-buflist       turn off Buflist plugin (default=compiled)],enable_buflist=$enableval,enable_buflist=yes)
 AC_ARG_ENABLE(charset,      [  --disable-charset       turn off Charset plugin (default=compiled)],enable_charset=$enableval,enable_charset=yes)
 AC_ARG_ENABLE(exec,         [  --disable-exec          turn off Exec plugin (default=compiled)],enable_exec=$enableval,enable_exec=yes)
@@ -154,15 +154,13 @@ AC_ARG_ENABLE(script,       [  --disable-script        turn off Script plugin (d
 AC_ARG_ENABLE(scripts,      [  --disable-scripts       turn off script plugins (perl, python, ...) (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes)
 AC_ARG_ENABLE(perl,         [  --disable-perl          turn off Perl script plugin (default=compiled if found)],enable_perl=$enableval,enable_perl=yes)
 AC_ARG_ENABLE(python,       [  --disable-python        turn off Python script plugin (default=compiled if found)],enable_python=$enableval,enable_python=yes)
-AC_ARG_ENABLE(python2,      [  --enable-python2        use Python 2 instead of Python 3 (default=off)],enable_python2=$enableval,enable_python2=no)
+AC_ARG_ENABLE(python3,      [  --enable-python3        use Python 3.x if found (NOT recommended because many "official" scripts won't work) (default=off)],enable_python3=$enableval,enable_python3=no)
 AC_ARG_ENABLE(ruby,         [  --disable-ruby          turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes)
 AC_ARG_ENABLE(lua,          [  --disable-lua           turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes)
 AC_ARG_ENABLE(tcl,          [  --disable-tcl           turn off Tcl script plugin (default=compiled if found)],enable_tcl=$enableval,enable_tcl=yes)
 AC_ARG_ENABLE(guile,        [  --disable-guile         turn off Guile (scheme) script plugin (default=compiled if found)],enable_guile=$enableval,enable_guile=yes)
 AC_ARG_ENABLE(javascript,   [  --disable-javascript    turn off JavaScript script plugin (default=compiled if found)],enable_javascript=$enableval,enable_javascript=yes)
 AC_ARG_ENABLE(php,          [  --disable-php           turn off PHP script plugin (default=compiled if found)],enable_php=$enableval,enable_php=yes)
-AC_ARG_ENABLE(spell,        [  --disable-spell         turn off Spell checker plugin (default=compiled)],enable_spell=$enableval,enable_spell=yes)
-AC_ARG_ENABLE(enchant,      [  --enable-enchant        turn on Enchant lib for Spell checker plugin (default=off)],enable_enchant=$enableval,enable_enchant=no)
 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)],enable_xfer=$enableval,enable_xfer=yes)
 AC_ARG_WITH(tclconfig,      [  --with-tclconfig=DIR    directory containing tcl configuration (tclConfig.sh)],tclconfig=$withval,tclconfig='')
@@ -187,10 +185,6 @@ AC_DEFINE_UNQUOTED(CA_FILE, "$CA_FILE")
 not_asked=""
 not_found=""

-if test "x$enable_headless" != "xyes" && test "x$enable_tests" = "xyes"; then
-    AC_MSG_ERROR([*** Headless mode is required for tests.])
-fi
-
 # ------------------------------------------------------------------------------
 #                                  pkg-config
 # ------------------------------------------------------------------------------
@@ -247,14 +241,6 @@ else
    not_asked="$not_asked ncurses"
 fi

-# ------------------------------------------------------------------------------
-#                                   headless
-# ------------------------------------------------------------------------------
-
-if test "x$enable_headless" != "xyes" ; then
-    not_asked="$not_asked headless"
-fi
-
 # ------------------------------------------------------------------------------
 #                                    iconv
 # ------------------------------------------------------------------------------
@@ -323,6 +309,79 @@ else
    not_asked="$not_asked alias"
 fi

+# ---------------------------------- aspell ------------------------------------
+
+if test "x$enable_aspell" = "xyes" ; then
+    ac_found_enchant_lib="no"
+    if test "x$enable_enchant" = "xyes" ; then
+        PKG_CHECK_MODULES(ENCHANT, [enchant], ac_found_enchant_lib="yes", ac_found_enchant_lib="no")
+    fi
+    if test "x$ac_found_enchant_lib" = "xyes" ; then
+        CFLAGS="$CFLAGS -DUSE_ENCHANT"
+        ASPELL_LIB_USED="enchant"
+
+        # 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=""
+
+        AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
+        AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
+
+        AC_MSG_CHECKING(for aspell headers and libraries)
+        if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
+            AC_MSG_RESULT(no)
+            AC_MSG_WARN([
+*** Aspell headers and/or libraries couldn't be found on your system.
+*** Try to install them with your software package manager.
+*** WeeChat will be built without Aspell support.])
+            enable_aspell="no"
+            not_found="$not_found aspell"
+        else
+            AC_MSG_RESULT(yes)
+            ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
+            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, [
+            AC_LINK_IFELSE([AC_LANG_PROGRAM(
+                [[ #include <aspell.h>]],
+                [[ const char *version = aspell_version_string(); ]])],
+                [ ac_have_aspell_version_string="yes" ],
+                [ ac_have_aspell_version_string="no" ])])
+            LDFLAGS="$ac_save_LDFLAGS"
+            if test "x$ac_have_aspell_version_string" = "xyes"; then
+                AC_DEFINE(HAVE_ASPELL_VERSION_STRING)
+            fi
+        fi
+    fi
+else
+    not_asked="$not_asked aspell"
+fi
+
+if test "x$enable_aspell" = "xyes" ; then
+    AC_SUBST(ASPELL_CFLAGS)
+    AC_SUBST(ASPELL_LFLAGS)
+    AC_DEFINE(PLUGIN_ASPELL)
+fi
+
 # --------------------------------- buflist ------------------------------------

 if test "x$enable_buflist" = "xyes" ; then
@@ -474,21 +533,66 @@ fi
 PYTHON_VERSION=

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

 if test "x$enable_python" = "xyes" ; then
    AC_SUBST(PYTHON_CFLAGS)
-    AC_SUBST(PYTHON_LIBS)
-    AC_SUBST(PYTHON_VERSION)
+    AC_SUBST(PYTHON_LFLAGS)
    AC_DEFINE(PLUGIN_PYTHON)
 fi

@@ -508,7 +611,7 @@ RUBY_VERSION=
 if test "x$enable_ruby" = "xyes" ; then
    RUBY_CFLAGS=""
    RUBY_LFLAGS=""
-    for v in "2.6" "2.5" "2.4" "2.3" "2.2" "2.1" "2.0" "1.9" "1.8" ; do
+    for v in "2.3" "2.2" "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`
@@ -518,9 +621,8 @@ if test "x$enable_ruby" = "xyes" ; then
        fi
    done

-    # detect old Ruby versions
    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 ruby)
+        AC_PATH_PROGS(RUBY, ruby1.9.3 ruby1.9.2 ruby1.9.1 ruby1.9 ruby1.8 ruby)
        if test -z $RUBY ; then
            AC_MSG_WARN([
 *** Ruby must be installed on your system but ruby interpreter couldn't be found in path.
@@ -580,7 +682,7 @@ if test "x$enable_lua" = "xyes" ; then
    if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
        AC_MSG_CHECKING(for Lua headers and libraries with pkg-config)
        echo
-        for l in "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" "$lua_suffix" "" ; do
+        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`
@@ -599,7 +701,7 @@ if test "x$enable_lua" = "xyes" ; then

    if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
        LUACONFIG=""
-        AC_CHECK_PROGS(LUACONFIG, lua-config53 lua-config5.3 lua-config52 lua-config5.2 lua-config51 lua-config5.1 lua-config50 lua-config5.0 lua-config)
+        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 libraries with lua-config)
            echo
@@ -617,7 +719,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 "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" "$lua_suffix" "" ; 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"
@@ -730,7 +832,7 @@ if test "x$enable_guile" = "xyes" ; then
    guile_found="no"
    AC_MSG_CHECKING(for Guile headers and libraries)
    echo
-    for v in "2.2" "2.0" ; do
+    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`
@@ -787,7 +889,7 @@ if test "x$enable_javascript" = "xyes" ; then
    if test "x$ac_found_v8_header" = "xyes" ; then
        #AC_CHECK_LIB(v8,v8,ac_found_v8_lib="yes",ac_found_v8_lib="no")
        ac_save_LIBS="$LIBS"
-        LIBS="$LIBS -lv8 -lpthread"
+        LIBS="$LIBS -lv8"
        AC_MSG_CHECKING(for v8 usability in programs)
        AC_TRY_RUN([
            #include <v8.h>
@@ -801,7 +903,7 @@ if test "x$enable_javascript" = "xyes" ; then
            AC_MSG_RESULT(yes)
            v8_found="yes"
            V8_CFLAGS=""
-            V8_LFLAGS="-lv8 -lpthread"
+            V8_LFLAGS="-lv8"
        else
            AC_MSG_RESULT(no)
            AC_MSG_WARN([
@@ -852,7 +954,7 @@ if test "x$enable_php" = "xyes" ; then
    if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then
        AC_MSG_CHECKING(for PHP headers and libraries with pkg-config)
        echo
-        for l in "7.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
+        for l in "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
            pkgconfig_php_found=`$PKGCONFIG --exists php$l 2>/dev/null`
            if test "x$?" = "x0" ; then
                pkgconfig_php_found=`$PKGCONFIG --atleast-version=7 php$l 2>/dev/null`
@@ -869,7 +971,7 @@ if test "x$enable_php" = "xyes" ; then
    if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then
        PHPCONFIG=""
        AC_MSG_CHECKING(for PHP headers and libraries with php-config)
-        for l in "7.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
+        for l in "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
            AC_CHECK_PROG(PHPCONFIG, "php-config$l", "php-config$l")
            if test "x$PHPCONFIG" != "x" ; then
                php_config_version=`$PHPCONFIG --version`
@@ -890,7 +992,7 @@ if test "x$enable_php" = "xyes" ; then
        if test "x$ac_found_php_header" = "xyes" ; then
            PHP_CFLAGS="$CFLAGS"
        fi
-        for l in "7.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
+        for l in "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
            AC_CHECK_LIB(php$l,php_execute_script,ac_found_php_lib="yes",ac_found_php_lib="no")
            if test "x$ac_found_php_lib" = "xyes" ; then
                PHP_VERSION=">=7.0.0"
@@ -937,79 +1039,6 @@ if test "x$enable_php" = "xyes" ; then
    AC_DEFINE(PLUGIN_PHP)
 fi

-# ----------------------------------- spell ------------------------------------
-
-if test "x$enable_spell" = "xyes" ; then
-    ac_found_enchant_lib="no"
-    if test "x$enable_enchant" = "xyes" ; then
-        PKG_CHECK_MODULES(ENCHANT, [enchant], ac_found_enchant_lib="yes", ac_found_enchant_lib="no")
-    fi
-    if test "x$ac_found_enchant_lib" = "xyes" ; then
-        CFLAGS="$CFLAGS -DUSE_ENCHANT"
-        SPELL_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=""
-
-        AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
-        AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
-
-        AC_MSG_CHECKING(for aspell headers and libraries)
-        if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
-            AC_MSG_RESULT(no)
-            AC_MSG_WARN([
-*** Aspell headers and/or libraries couldn't be found on your system.
-*** Try to install them with your software package manager.
-*** WeeChat will be built without Aspell support.])
-            enable_spell="no"
-            not_found="$not_found spell"
-        else
-            AC_MSG_RESULT(yes)
-            ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
-            SPELL_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, [
-            AC_LINK_IFELSE([AC_LANG_PROGRAM(
-                [[ #include <aspell.h>]],
-                [[ const char *version = aspell_version_string(); ]])],
-                [ ac_have_aspell_version_string="yes" ],
-                [ ac_have_aspell_version_string="no" ])])
-            LDFLAGS="$ac_save_LDFLAGS"
-            if test "x$ac_have_aspell_version_string" = "xyes"; then
-                AC_DEFINE(HAVE_ASPELL_VERSION_STRING)
-            fi
-        fi
-    fi
-else
-    not_asked="$not_asked spell"
-fi
-
-if test "x$enable_spell" = "xyes" ; then
-    AC_SUBST(ASPELL_CFLAGS)
-    AC_SUBST(ASPELL_LFLAGS)
-    AC_DEFINE(PLUGIN_SPELL)
-fi
-
 # --------------------------------- trigger ------------------------------------

 if test "x$enable_trigger" = "xyes" ; then
@@ -1163,7 +1192,7 @@ AC_MSG_CHECKING(for zlib headers and libraries)
 if test "x$ac_found_zlib_header" = "xno" -o "x$ac_found_zlib_lib" = "xno" ; then
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([
-*** zlib was not found. You may want to get it from https://zlib.net/
+*** zlib was not found. You may want to get it from http://zlib.net/
 *** or try to install zlib1g-dev with your software package manager.])
 else
    AC_MSG_RESULT(yes)
@@ -1287,7 +1316,7 @@ AC_DEFINE_UNQUOTED(WEECHAT_SHAREDIR, "$WEECHAT_SHAREDIR")
 weechat_libdir=${libdir}/weechat
 AC_SUBST(weechat_libdir)

-COMMON_CFLAGS="-fsigned-char -Wall -Wextra -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
@@ -1330,9 +1359,6 @@ netbsd*)
 gnu*)
        LDFLAGS="$LDFLAGS -lpthread"
        ;;
-haiku*)
-        LDFLAGS="$LDFLAGS -lnetwork"
-        ;;
 *)
        ;;
 esac
@@ -1348,8 +1374,8 @@ AM_CONDITIONAL(HAVE_GNUTLS,             test "$enable_gnutls" = "yes")
 AM_CONDITIONAL(HAVE_FLOCK,              test "$enable_flock" = "yes")
 AM_CONDITIONAL(HAVE_EAT_NEWLINE_GLITCH, test "$enable_eatnewlineglitch" = "yes")
 AM_CONDITIONAL(GUI_NCURSES,             test "$enable_ncurses" = "yes")
-AM_CONDITIONAL(HEADLESS,                test "$enable_headless" = "yes")
 AM_CONDITIONAL(PLUGIN_ALIAS,            test "$enable_alias" = "yes")
+AM_CONDITIONAL(PLUGIN_ASPELL,           test "$enable_aspell" = "yes")
 AM_CONDITIONAL(PLUGIN_BUFLIST,          test "$enable_buflist" = "yes")
 AM_CONDITIONAL(PLUGIN_CHARSET,          test "$enable_charset" = "yes")
 AM_CONDITIONAL(PLUGIN_EXEC,             test "$enable_exec" = "yes")
@@ -1367,7 +1393,6 @@ AM_CONDITIONAL(PLUGIN_TCL,              test "$enable_tcl" = "yes")
 AM_CONDITIONAL(PLUGIN_GUILE,            test "$enable_guile" = "yes")
 AM_CONDITIONAL(PLUGIN_JAVASCRIPT,       test "$enable_javascript" = "yes")
 AM_CONDITIONAL(PLUGIN_PHP,              test "$enable_php" = "yes")
-AM_CONDITIONAL(PLUGIN_SPELL,            test "$enable_spell" = "yes")
 AM_CONDITIONAL(PLUGIN_TRIGGER,          test "$enable_trigger" = "yes")
 AM_CONDITIONAL(PLUGIN_XFER,             test "$enable_xfer" = "yes")
 AM_CONDITIONAL(TESTS,                   test "$enable_tests" = "yes")
@@ -1375,7 +1400,6 @@ AM_CONDITIONAL(MAN,                     test "$enable_man" = "yes")
 AM_CONDITIONAL(DOC,                     test "$enable_doc" = "yes")

 AC_OUTPUT([Makefile
-           icons/Makefile
           doc/Makefile
           doc/en/Makefile
           doc/fr/Makefile
@@ -1390,6 +1414,7 @@ AC_OUTPUT([Makefile
           src/core/Makefile
           src/plugins/Makefile
           src/plugins/alias/Makefile
+           src/plugins/aspell/Makefile
           src/plugins/buflist/Makefile
           src/plugins/charset/Makefile
           src/plugins/exec/Makefile
@@ -1407,13 +1432,10 @@ AC_OUTPUT([Makefile
           src/plugins/guile/Makefile
           src/plugins/javascript/Makefile
           src/plugins/php/Makefile
-           src/plugins/spell/Makefile
           src/plugins/trigger/Makefile
           src/plugins/xfer/Makefile
           src/gui/Makefile
           src/gui/curses/Makefile
-           src/gui/curses/normal/Makefile
-           src/gui/curses/headless/Makefile
           tests/Makefile
           intl/Makefile
           po/Makefile.in])
@@ -1426,20 +1448,20 @@ listgui=""
 if test "x$enable_ncurses" = "xyes" ; then
    listgui="$listgui ncurses"
 fi
-if test "x$enable_headless" = "xyes" ; then
-    listgui="$listgui headless"
-fi

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

 listplugins=""
 if test "x$enable_alias" = "xyes"; then
    listplugins="$listplugins alias"
 fi
+if test "x$enable_aspell" = "xyes"; then
+    listplugins="$listplugins aspell($ASPELL_LIB_USED)"
+fi
 if test "x$enable_buflist" = "xyes"; then
    listplugins="$listplugins buflist"
 fi
@@ -1491,9 +1513,6 @@ fi
 if test "x$enable_php" = "xyes"; then
    listplugins="$listplugins php($PHP_VERSION)"
 fi
-if test "x$enable_spell" = "xyes"; then
-    listplugins="$listplugins spell($SPELL_LIB_USED)"
-fi
 if test "x$enable_trigger" = "xyes"; then
    listplugins="$listplugins trigger"
 fi
@@ -1 +1 @@
-12
+9
@@ -4,33 +4,31 @@ Priority: optional
 Maintainer: Sébastien Helleu <flashcode@flashtux.org>
 Build-Depends:
    asciidoctor (>= 1.5.4),
-    debhelper (>= 12),
+    debhelper (>= 9),
+    dh-exec,
    cmake, pkg-config,
    libncursesw5-dev,
    gem2deb,
    libperl-dev,
-    python3-dev,
+    python-dev,
    libaspell-dev,
-    liblua5.3-dev,
+    liblua5.1-0-dev,
    tcl8.6-dev,
-    guile-2.2-dev,
-    libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
-    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
-    libxml2-dev,
+    guile-2.0-dev,
+    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
+    php7.1-dev, libphp7.1-embed, libxml2-dev,
    libcurl4-gnutls-dev,
    libgcrypt20-dev,
    libgnutls28-dev,
    zlib1g-dev
-Standards-Version: 4.4.0
+Standards-Version: 3.9.8
 Homepage: https://weechat.org/
-Vcs-Git: https://salsa.debian.org/kolter/weechat.git
-Vcs-Browser: https://salsa.debian.org/kolter/weechat
+Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git

 Package: weechat-devel
 Architecture: all
-Depends:
-    ${misc:Depends},
-    weechat-devel-curses (>= ${source:Version}) | weechat-devel-headless (>= ${source:Version})
+Depends: ${misc:Depends}, weechat-devel-curses (>= ${source:Version})
 Suggests: weechat-devel-doc (= ${source:Version})
 Conflicts: weechat
 Description: Fast, light and extensible chat client (metapackage)
@@ -48,21 +46,17 @@ Description: Fast, light and extensible chat client (metapackage)
  - incremental text search
  - dynamic filtering of buffer content
  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-  - script manager
+  - scripts manager
  - spell checking
  - highly customizable and extensible
  - and much more!

 Package: weechat-devel-curses
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-devel-core (= ${binary:Version})
-Recommends:
-    weechat-devel-plugins (= ${binary:Version})
-Suggests: weechat-devel-doc (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-core (= ${binary:Version})
 Conflicts: weechat-curses
+Recommends: weechat-devel-plugins (= ${binary:Version})
+Suggests: weechat-devel-doc (= ${source:Version})
 Description: Fast, light and extensible chat client - console client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
@@ -78,70 +72,29 @@ Description: Fast, light and extensible chat client - console client
  - incremental text search
  - dynamic filtering of buffer content
  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-  - script manager
+  - scripts manager
  - spell checking
  - highly customizable and extensible
  - and much more!
 .
 This package provides the console client (ncurses).

-Package: weechat-devel-headless
-Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-devel-core (= ${binary:Version})
-Recommends: weechat-devel-plugins (= ${binary:Version})
-Suggests: weechat-devel-doc (= ${source:Version})
-Conflicts: weechat-headless
-Description: Fast, light and extensible chat client - headless client
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- It is customizable and extensible with plugins/scripts, and includes:
-  - support of IRC protocol (native)
-  - support of XMPP/Jabber protocol (with additional script)
-  - nicklist
-  - smart hotlist
-  - horizontal and vertical split
-  - double charset support (decode/encode)
-  - FIFO pipe for remote control
-  - 256 colors support
-  - incremental text search
-  - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-  - script manager
-  - spell checking
-  - highly customizable and extensible
-  - and much more!
- .
- This package provides the headless client.
-
 Package: weechat-devel-core
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends}
-Suggests: weechat-devel-doc (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: weechat-core
+Suggests: weechat-devel-doc (= ${source:Version})
 Description: Fast, light and extensible chat client - core files
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package provides core plugins and locales files for WeeChat. It
 currently ships the following plugins: alias, buflist, charset, fset, irc,
- logger and xfer. It is useless without weechat-curses or weechat-headless.
+ logger and xfer. It is useless without weechat-curses.

 Package: weechat-devel-plugins
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
-Recommends:
-    weechat-devel-perl,
-    weechat-devel-python,
-    weechat-devel-ruby
-Suggests: weechat-scripts (>> 20090221-1)
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
 Conflicts: weechat-plugins
 Description: Fast, light and extensible chat client - plugins
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -149,7 +102,7 @@ Description: Fast, light and extensible chat client - plugins
 .
 This package provides some plugins to enhance WeeChat. It currently
 ships the following plugins:
-  - script manager
+  - scripts manager
  - Spell checking (thanks to aspell)
  - FIFO pipe for remote control
  - Relay (IRC proxy and WeeChat protocol)
@@ -157,25 +110,19 @@ Description: Fast, light and extensible chat client - plugins

 Package: weechat-devel-python
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
 Conflicts: weechat-python
-Description: Fast, light and extensible chat client - Python 3 plugin
+Description: Fast, light and extensible chat client - python plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
- This package provides the Python 3 scripting API plugin.
+ This package provides the Python scripting API plugin.

 Package: weechat-devel-perl
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
 Conflicts: weechat-perl
-Description: Fast, light and extensible chat client - Perl plugin
+Description: Fast, light and extensible chat client - perl plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -183,12 +130,9 @@ Description: Fast, light and extensible chat client - Perl plugin

 Package: weechat-devel-ruby
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
 Conflicts: weechat-ruby
-Description: Fast, light and extensible chat client - Ruby plugin
+Description: Fast, light and extensible chat client - ruby plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -196,12 +140,9 @@ Description: Fast, light and extensible chat client - Ruby plugin

 Package: weechat-devel-lua
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
 Conflicts: weechat-lua
-Description: Fast, light and extensible chat client - Lua plugin
+Description: Fast, light and extensible chat client - lua plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -209,38 +150,29 @@ Description: Fast, light and extensible chat client - Lua plugin

 Package: weechat-devel-tcl
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
 Conflicts: weechat-tcl
-Description: Fast, light and extensible chat client - Tcl plugin
+Description: Fast, light and extensible chat client - tcl plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
- This package provides the Tcl scripting API plugin.
+ This package provides the TCL scripting API plugin.

 Package: weechat-devel-guile
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
 Conflicts: weechat-guile
-Description: Fast, light and extensible chat client - Guile plugin
+Description: Fast, light and extensible chat client - guile plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package provides the Guile scripting API plugin.

 Package: weechat-devel-javascript
-Architecture: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
 Conflicts: weechat-javascript
-Description: Fast, light and extensible chat client - JavaScript plugin
+Description: Fast, light and extensible chat client - javascript plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -248,13 +180,10 @@ Description: Fast, light and extensible chat client - JavaScript plugin

 Package: weechat-devel-php
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version}),
-    libphp-embed
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}),
+ libphp7.1-embed
 Conflicts: weechat-php
-Description: Fast, light and extensible chat client - PHP plugin
+Description: Fast, light and extensible chat client - php plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -273,7 +202,7 @@ Description: Fast, light and extensible chat client - documentation

 Package: weechat-devel-dev
 Section: devel
-Architecture: any
+Architecture: all
 Depends: ${misc:Depends}
 Conflicts: weechat-dev
 Description: Fast, light and extensible chat client - development headers
@@ -281,3 +210,16 @@ Description: Fast, light and extensible chat client - development headers
 for many operating systems. Everything can be done with a keyboard.
 .
 This package contains the headers needed to build plugins.
+
+Package: weechat-devel-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, weechat-devel-curses (= ${binary:Version}) |
+ weechat-devel-core (= ${binary:Version}), weechat-devel-plugins (= ${binary:Version})
+Conflicts: weechat-dbg
+Description: Fast, light and extensible chat client - debugging symbols
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
+ for many operating systems. Everything can be done with a keyboard.
+ .
+ This package contains gdb debugging symbols for the WeeChat packages.
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f

-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
 BUILDDIR = builddir

 $(BUILDDIR)/Makefile:
@@ -9,7 +7,6 @@ $(BUILDDIR)/Makefile:
 	cd $(BUILDDIR) && \
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-		-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
 		-DENABLE_DOC:BOOL=ON \
 		-DENABLE_MAN:BOOL=ON \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
@@ -18,16 +15,19 @@ $(BUILDDIR)/Makefile:
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON

+override_dh_auto_build: $(BUILDDIR)/Makefile
+	dh_auto_build
+
 override_dh_auto_configure:
 	# the package also has autotools buildsys and
 	# debhelper try to use it but that's not needed
 	echo

-override_dh_auto_build: $(BUILDDIR)/Makefile
-	dh_auto_build
-
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog.adoc

+override_dh_strip:
+	dh_strip --dbg-package=weechat-devel-dbg
+
 %:
-	dh $@ --builddirectory=$(BUILDDIR) --without autoreconf
+	dh $@ --parallel --builddirectory=$(BUILDDIR)
@@ -1 +0,0 @@
-../debian-stable/weechat-headless.dirs
@@ -1 +0,0 @@
-../debian-stable/weechat-headless.install
@@ -1,22 +1,9 @@
-weechat (2.1-1) unstable; urgency=medium
-
-  This release introduces a new headless client and a new PHP plugin for
-  scripting (respectively weechat-headless and weechat-php binary
-  packages).
-  To avoid at least unnecessary dependencies, each plugin has its own
-  separate binary package:
-    weechat-{perl,python,ruby,lua,guile,javascript,php}
-  Depending on your needs about scripting with weechat you should consider
-  to install the missing packages.
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 21 Mar 2018 07:53:40 +0100
-
 weechat (1.1.1-1) unstable; urgency=medium

  Since version 1.1, there is a new format for regexp replacement in
  triggers. This format is incompatible with version 1.0. The existing
  triggers will not be automatically updated.
-  See https://weechat.org/files/releasenotes/ReleaseNotes-1.1.html
+  See http://www.weechat.org/files/releasenotes/ReleaseNotes-1.1.html

 -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 25 Jan 2015 20:41:50 +0100

@@ -26,7 +13,7 @@ weechat (0.3.1-1) unstable; urgency=low
  are stronger checks while connecting with SSL. By default, if a connection
  is not fully trusted it will fail.
  You can find more information on how to handle this new behaviour here:
-    https://blog.weechat.org/post/2009/12/01/SSL-certificates
+    https://weechat.org/blog/post/2009/12/01/SSL-certificates

 -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 25 Jan 2010 12:35:11 +0100

@@ -1,123 +1,3 @@
-weechat (2.6-2) unstable; urgency=medium
-
-  * Add a patch from upstream to support Guile 2.2 (Closes: #885235)
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 11 Oct 2019 15:07:22 +0000
-
-weechat (2.6-1) unstable; urgency=medium
-
-  * New upstream release
-  * Build only with Python3 (Closes: #938817)
-  * Bump Standards-Version to 4.4.0
-  * Build Lua plugin against Lua 5.3
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 17 Sep 2019 13:30:32 +0000
-
-weechat (2.4-1) unstable; urgency=medium
-
-  * New upstream release
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 03 Mar 2019 19:29:13 +0000
-
-weechat (2.3-1) unstable; urgency=medium
-
-  * New upstream release
-  * Bump Standards-Version to 4.3.0
-  * Switch debhelper compatibility to 12
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 04 Jan 2019 16:06:44 +0000
-
-weechat (2.2-1) unstable; urgency=medium
-
-  * New upstream release
-  * Remove upstream patch about localized manpages for weechat-headless
-  * Bump Standards-Version to 4.1.5
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 19 Sep 2018 09:41:45 +0000
-
-weechat (2.1-2) unstable; urgency=medium
-
-  * Disable build of javascript plugin to fix weechat autoremoval from
-    testing (RC bugs in libv8) (Closes: #894680)
-  * Add missing localized manpages for weechat-headless
-  * Fix debian/copyright Format URI
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 03 Apr 2018 10:48:35 +0200
-
-weechat (2.1-1) unstable; urgency=medium
-
-  * New upstream release (Closes: #887114)
-    - Enable build against Ruby 2.5 (Closes: #892072)
-    - New PHP plugin (update build dependencies accordingly)
-  * Split up the package so that plugins are now separated in multiple
-    binary packages to avoid unnecessary dependencies (Closes: #745266)
-  * Switch debhelper compatibility to 11
-  * Bump Standards-Version to 4.1.3
-  * Add debian/upstream/metadata (DEP 12)
-  * Rewrite debian/copyright to be more accurate
-  * Update Vcs-Git and Vcs-Browser with new repository on salsa.debian.org
-  * Update debian/NEWS to introduces weechat-headless and the package split
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 21 Mar 2018 07:46:21 +0100
-
-weechat (1.9.1-1) unstable; urgency=medium
-
-  * New upstream release
-    - CVE-2017-14727 - Include a patch which fix a possible crash in logger
-      plugin (Closes: #876553)
-  * Disable build of javascript plugin to fix weechat autoremoval from
-    testing (RC bugs in libv8)
-  * Bump Standards-Version to 4.1.0
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 23 Sep 2017 21:47:32 +0200
-
-weechat (1.9-1) unstable; urgency=medium
-
-  * New upstream release
-  * Remove useless weechat-dbg binary package
-  * Bump Standards-Version to 4.0.0
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 04 Jul 2017 13:29:55 +0200
-
-weechat (1.8-1) unstable; urgency=medium
-
-  * New upstream release
-  * Remove usless patches (backports from upstream)
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 16 May 2017 14:53:07 +0200
-
-weechat (1.7-3) unstable; urgency=medium
-
-  * Add a patch to fix CVE-2017-8073 which allows a remote crash by
-    sending a filename via DCC to the IRC plugin (Closes: #861121)
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 25 Apr 2017 10:46:10 +0200
-
-weechat (1.7-2) unstable; urgency=medium
-
-  * Add a patch to fix slowness after terminal resize (Closes: #855079)
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 24 Feb 2017 16:43:09 +0100
-
-weechat (1.7-1) unstable; urgency=medium
-
-  * New upstream release
-  * Remove lintian-override for weechat-curses manpage
-  * Add a lintian-override about no hardening flags on fifo.so plugin
-    (false positive)
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Thu, 09 Feb 2017 20:15:48 +0100
-
-weechat (1.6-1) unstable; urgency=medium
-
-  * New upstream release
-  * Add a patch to build html documentation without requiring data
-    (javascript, fonts) on external websites (potential privacy breach)
-  * Documentation is now built with asciidoctor (adjust dependencies
-    accordingly)
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Thu, 06 Oct 2016 13:55:35 +0200
-
 weechat (1.5-1) unstable; urgency=medium

  * New upstream release
@@ -1 +1 @@
-12
+9
@@ -4,33 +4,31 @@ Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@debian.org>
 Build-Depends:
    asciidoctor (>= 1.5.4),
-    debhelper (>= 12),
+    debhelper (>= 9),
+    dh-exec,
    cmake, pkg-config,
    libncursesw5-dev,
    gem2deb,
    libperl-dev,
-    python3-dev,
+    python-dev,
    libaspell-dev,
-    liblua5.3-dev,
+    liblua5.1-0-dev,
    tcl8.6-dev,
-    guile-2.2-dev,
-    libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
-    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
-    libxml2-dev,
+    guile-2.0-dev,
+    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
+    php7.1-dev, libphp7.1-embed, libxml2-dev,
    libcurl4-gnutls-dev,
    libgcrypt20-dev,
    libgnutls28-dev,
    zlib1g-dev
-Standards-Version: 4.4.0
+Standards-Version: 3.9.8
 Homepage: https://weechat.org/
-Vcs-Git: https://salsa.debian.org/kolter/weechat.git
-Vcs-Browser: https://salsa.debian.org/kolter/weechat
+Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git

 Package: weechat
 Architecture: all
-Depends:
-    ${misc:Depends},
-    weechat-curses (>= ${source:Version}) | weechat-headless (>= ${source:Version})
+Depends: ${misc:Depends}, weechat-curses (>= ${source:Version})
 Suggests: weechat-doc (= ${source:Version})
 Description: Fast, light and extensible chat client (metapackage)
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -47,19 +45,17 @@ Description: Fast, light and extensible chat client (metapackage)
  - incremental text search
  - dynamic filtering of buffer content
  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-  - script manager
+  - scripts manager
  - spell checking
  - highly customizable and extensible
  - and much more!

 Package: weechat-curses
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-core (= ${binary:Version})
-Recommends:
-    weechat-plugins (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version})
+Conflicts: weechat-common
+Breaks: weechat-scripts (<= 20090221-1)
+Recommends: weechat-plugins (= ${binary:Version})
 Suggests: weechat-doc (= ${source:Version})
 Description: Fast, light and extensible chat client - console client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -76,48 +72,17 @@ Description: Fast, light and extensible chat client - console client
  - incremental text search
  - dynamic filtering of buffer content
  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-  - script manager
+  - scripts manager
  - spell checking
  - highly customizable and extensible
  - and much more!
 .
 This package provides the console client (ncurses).

-Package: weechat-headless
-Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-core (= ${binary:Version})
-Recommends: weechat-plugins (= ${binary:Version})
-Suggests: weechat-doc (= ${source:Version})
-Description: Fast, light and extensible chat client - headless client
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- It is customizable and extensible with plugins/scripts, and includes:
-  - support of IRC protocol (native)
-  - support of XMPP/Jabber protocol (with additional script)
-  - nicklist
-  - smart hotlist
-  - horizontal and vertical split
-  - double charset support (decode/encode)
-  - FIFO pipe for remote control
-  - 256 colors support
-  - incremental text search
-  - dynamic filtering of buffer content
-  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-  - script manager
-  - spell checking
-  - highly customizable and extensible
-  - and much more!
- .
- This package provides the headless client.
-
 Package: weechat-core
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: weechat-common, weechat-plugins (<< 0.3.0)
 Suggests: weechat-doc (= ${source:Version})
 Description: Fast, light and extensible chat client - core files
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -125,18 +90,11 @@ Description: Fast, light and extensible chat client - core files
 .
 This package provides core plugins and locales files for WeeChat. It
 currently ships the following plugins: alias, buflist, charset, fset, irc,
- logger and xfer. It is useless without weechat-curses or weechat-headless.
+ logger and xfer. It is useless without weechat-curses.

 Package: weechat-plugins
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
-Recommends:
-    weechat-perl,
-    weechat-python,
-    weechat-ruby
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
 Suggests: weechat-scripts (>> 20090221-1)
 Description: Fast, light and extensible chat client - plugins
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -144,7 +102,7 @@ Description: Fast, light and extensible chat client - plugins
 .
 This package provides some plugins to enhance WeeChat. It currently
 ships the following plugins:
-  - script manager
+  - scripts manager
  - Spell checking (thanks to aspell)
  - FIFO pipe for remote control
  - Relay (IRC proxy and WeeChat protocol)
@@ -152,23 +110,17 @@ Description: Fast, light and extensible chat client - plugins

 Package: weechat-python
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
-Description: Fast, light and extensible chat client - Python 3 plugin
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Description: Fast, light and extensible chat client - python plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
- This package provides the Python 3 scripting API plugin.
+ This package provides the Python scripting API plugin.

 Package: weechat-perl
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
-Description: Fast, light and extensible chat client - Perl plugin
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Description: Fast, light and extensible chat client - perl plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -176,11 +128,8 @@ Description: Fast, light and extensible chat client - Perl plugin

 Package: weechat-ruby
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
-Description: Fast, light and extensible chat client - Ruby plugin
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Description: Fast, light and extensible chat client - ruby plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -188,11 +137,8 @@ Description: Fast, light and extensible chat client - Ruby plugin

 Package: weechat-lua
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
-Description: Fast, light and extensible chat client - Lua plugin
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Description: Fast, light and extensible chat client - lua plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -200,35 +146,26 @@ Description: Fast, light and extensible chat client - Lua plugin

 Package: weechat-tcl
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
-Description: Fast, light and extensible chat client - Tcl plugin
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Description: Fast, light and extensible chat client - tcl plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
- This package provides the Tcl scripting API plugin.
+ This package provides the TCL scripting API plugin.

 Package: weechat-guile
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
-Description: Fast, light and extensible chat client - Guile plugin
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Description: Fast, light and extensible chat client - guile plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package provides the Guile scripting API plugin.

 Package: weechat-javascript
-Architecture: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
-Description: Fast, light and extensible chat client - JavaScript plugin
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Description: Fast, light and extensible chat client - javascript plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -236,12 +173,9 @@ Description: Fast, light and extensible chat client - JavaScript plugin

 Package: weechat-php
 Architecture: any
-Depends:
-    ${misc:Depends},
-    ${shlibs:Depends},
-    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}),
-    libphp-embed
-Description: Fast, light and extensible chat client - PHP plugin
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}),
+ libphp7.1-embed
+Description: Fast, light and extensible chat client - php plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -259,10 +193,22 @@ Description: Fast, light and extensible chat client - documentation

 Package: weechat-dev
 Section: devel
-Architecture: any
+Architecture: all
 Depends: ${misc:Depends}
 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.
 .
 This package contains the headers needed to build plugins.
+
+Package: weechat-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, weechat-curses (= ${binary:Version}) |
+ weechat-core (= ${binary:Version}), weechat-plugins (= ${binary:Version})
+Description: Fast, light and extensible chat client - debugging symbols
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
+ for many operating systems. Everything can be done with a keyboard.
+ .
+ This package contains gdb debugging symbols for the WeeChat packages.
@@ -1,156 +1,17 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+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: https://weechat.org/

 Files: *
-Copyright: 2003-2019, Sébastien Helleu <flashcode@flashtux.org>
-License: GPL-3+
-
-Files: src/core/wee-command.c
-       src/core/wee-command.h
-Copyright: 2005-2006, Emmanuel Bouthenot <kolter@openics.org>
-License: GPL-3+
-
-Files: src/core/wee-config-file.c
-       src/core/wee-config-file.h
-       src/core/wee-config.c
-       src/core/wee-config.h
-Copyright: 2005-2006, Emmanuel Bouthenot <kolter@openics.org>
-License: GPL-3+
-
-Files: src/core/hook/wee-hook-connect.c
-Copyright: 2012, Simon Arlott
-License: GPL-3+
-
-Files: src/core/hook/wee-hook-connect.h
-Copyright: 2012, Simon Arlott
-License: GPL-3+
-
-Files: src/gui/gui-history.c
-Copyright: 2005, Emmanuel Bouthenot <kolter@openics.org>
-License: GPL-3+
-
-Files: src/core/wee-completion.c
-       src/core/wee-log.c
-       src/core/wee-utf8.c
-       src/core/weechat.h
-       src/plugins/spell/spell-config.c
-       src/plugins/spell/spell-config.h
-       src/plugins/spell/spell-speller.c
-       src/plugins/spell/spell-speller.h
-       src/plugins/spell/spell.h
-       src/plugins/irc/irc-command.c
-       src/plugins/irc/irc.h
-Copyright: 2006, Emmanuel Bouthenot <kolter@openics.org>
-License: GPL-3+
-
-Files: src/core/wee-network.c
-Copyright: 2005-2010, Emmanuel Bouthenot <kolter@openics.org>
-           2010, Gu1ll4um3r0m41n <aeroxteam@gmail.com>
-           2012, Simon Arlott
-License: GPL-3+
-
-Files: src/plugins/spell/spell-bar-item.c
-       src/plugins/spell/spell-bar-item.h
-Copyright: 2012, Nils Görs <weechatter@arcor.de>
-License: GPL-3+
-
-Files: src/plugins/spell/spell.c
-Copyright: 2006, Emmanuel Bouthenot <kolter@openics.org>
-           2012, Nils Görs <weechatter@arcor.de>
-License: GPL-3+
-
-Files: src/plugins/guile/weechat-guile-api.c
-       src/plugins/irc/irc-server.h
-       src/plugins/plugin-script-api.c
-       src/plugins/plugin-script-api.h
-Copyright: 2012, Simon Arlott
-License: GPL-3+
-
-Files: src/plugins/irc/irc-protocol.c
-Copyright: 2006, Emmanuel Bouthenot <kolter@openics.org>
-           2014, Shawn Smith <ShawnSmith0828@gmail.com>
-License: GPL-3+
-
-Files: src/plugins/irc/irc-server.c
-Copyright: 2005-2010, Emmanuel Bouthenot <kolter@openics.org>
-           2012, Simon Arlott
-License: GPL-3+
-
-Files: src/plugins/javascript/weechat-js-api.cpp
-       src/plugins/javascript/weechat-js-api.h
-       src/plugins/javascript/weechat-js-v8.cpp
-       src/plugins/javascript/weechat-js-v8.h
-       src/plugins/javascript/weechat-js.cpp
-       src/plugins/javascript/weechat-js.h
-Copyright: 2013, Koka El Kiwi <kokakiwi@kokakiwi.net>
-License: GPL-3+
-
-Files: src/plugins/lua/weechat-lua-api.c
-Copyright: 2006-2007, Emmanuel Bouthenot <kolter@openics.org>
-           2012, Simon Arlott
-License: GPL-3+
-
-Files: src/plugins/lua/weechat-lua-api.h
-       src/plugins/lua/weechat-lua.c
-       src/plugins/lua/weechat-lua.h
-Copyright: 2006-2007, Emmanuel Bouthenot <kolter@openics.org>
-License: GPL-3+
-
-Files: src/plugins/perl/weechat-perl-api.c
-Copyright: 2005-2008, Emmanuel Bouthenot <kolter@openics.org>
-           2012, Simon Arlott
-License: GPL-3+
-
-Files: src/plugins/perl/weechat-perl.c
-Copyright: 2005-2008, Emmanuel Bouthenot <kolter@openics.org>
-License: GPL-3+
-
-Files: src/plugins/php/weechat-php-api.c
-       src/plugins/php/weechat-php-api.h
-       src/plugins/php/weechat-php.c
-       src/plugins/php/weechat-php.h
-Copyright: 2006-2017, Adam Saponara <as@php.net>
-License: GPL-3-with-openssl-exception
-
-Files: src/plugins/python/weechat-python-api.c
-Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org>
-           2012, Simon Arlott
-License: GPL-3+
-
-Files: src/plugins/python/weechat-python-api.h
-       src/plugins/ruby/weechat-ruby-api.h
-       src/plugins/ruby/weechat-ruby.c
-       src/plugins/ruby/weechat-ruby.h
-Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org>
-License: GPL-3+
-
-Files: src/plugins/python/weechat-python.c
-       src/plugins/ruby/weechat-ruby-api.c
-Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org>
-           2012, Simon Arlott
-License: GPL-3+
-
-Files: src/plugins/python/weechat-python.h
-Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org>
-License: GPL-3+
-
-Files: src/plugins/tcl/weechat-tcl-api.c
-Copyright: 2008-2010, Dmitry Kobylin <fnfal@academ.tsc.ru>
-           2008, Julien Louis <ptitlouis@sysif.net>
-           2012, Simon Arlott
-License: GPL-3+
-
-Files: src/plugins/tcl/weechat-tcl-api.h
-       src/plugins/tcl/weechat-tcl.c
-       src/plugins/tcl/weechat-tcl.h
-Copyright: 2008-2010, Dmitry Kobylin <fnfal@academ.tsc.ru>
+Copyright: 2003-2017, Sébastien Helleu <flashcode@flashtux.org>
+           2005-2009, Emmanuel Bouthenot <kolter@openics.org>
+           2008-2009, Dmitry Kobylin <fnfal@academ.tsc.ru>
 License: GPL-3+

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

 License: GPL-3+
@@ -165,35 +26,7 @@ License: GPL-3+
 General Public License for more details.
 .
 You should have received a copy of the GNU General Public License along
- with this program.  If not, see <https://www.gnu.org/licenses/>.
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
 .
 On Debian systems, the complete text of the GNU General Public License,
 Version 3 can be found in the file /usr/share/common-licenses/GPL-3
-
-License: GPL-3-with-openssl-exception
- 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License,
- Version 3 can be found in the file /usr/share/common-licenses/GPL-3
- .
- Additional permission under GNU GPL version 3 section 7:
- .
- If you modify the Program, or any covered work, by linking or
- combining it with the OpenSSL project's OpenSSL library (or a
- modified version of that library), containing parts covered by the
- terms of the OpenSSL or SSLeay licenses, the licensors of the Program
- grant you additional permission to convey the resulting work.
- Corresponding Source for a non-source form of such a combination
- shall include the source code for the parts of OpenSSL used as well
- as that of the covered work.
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f

-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
 BUILDDIR = builddir

 $(BUILDDIR)/Makefile:
@@ -9,7 +7,6 @@ $(BUILDDIR)/Makefile:
 	cd $(BUILDDIR) && \
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-		-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
 		-DENABLE_DOC:BOOL=ON \
 		-DENABLE_MAN:BOOL=ON \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
@@ -18,16 +15,19 @@ $(BUILDDIR)/Makefile:
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON

+override_dh_auto_build: $(BUILDDIR)/Makefile
+	dh_auto_build
+
 override_dh_auto_configure:
 	# the package also has autotools buildsys and
 	# debhelper try to use it but that's not needed
 	echo

-override_dh_auto_build: $(BUILDDIR)/Makefile
-	dh_auto_build
-
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog.adoc

+override_dh_strip:
+	dh_strip --dbg-package=weechat-dbg
+
 %:
-	dh $@ --builddirectory=$(BUILDDIR) --without autoreconf
+	dh $@ --parallel --builddirectory=$(BUILDDIR)
@@ -1,8 +1,8 @@
 usr/share/locale/
-usr/lib/*/weechat/plugins/alias.so
-usr/lib/*/weechat/plugins/buflist.so
-usr/lib/*/weechat/plugins/charset.so
-usr/lib/*/weechat/plugins/fset.so
-usr/lib/*/weechat/plugins/irc.so
-usr/lib/*/weechat/plugins/logger.so
-usr/lib/*/weechat/plugins/xfer.so
+usr/lib/weechat/plugins/alias.so
+usr/lib/weechat/plugins/buflist.so
+usr/lib/weechat/plugins/charset.so
+usr/lib/weechat/plugins/fset.so
+usr/lib/weechat/plugins/irc.so
+usr/lib/weechat/plugins/logger.so
+usr/lib/weechat/plugins/xfer.so
@@ -1,6 +1,5 @@
 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/cs/man1/weechat.1.gz usr/share/man/cs/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/fr/man1/weechat.1.gz usr/share/man/fr/man1/weechat-curses.1.gz
 usr/share/man/it/man1/weechat.1.gz usr/share/man/it/man1/weechat-curses.1.gz
@@ -1,2 +1,2 @@
 usr/include/weechat/*
-usr/lib/*/pkgconfig/*
+usr/lib/pkgconfig/*
@@ -1 +1 @@
-usr/lib/*/weechat/plugins/guile.so
+usr/lib/weechat/plugins/guile.so
@@ -1 +0,0 @@
-usr/bin
@@ -1,3 +0,0 @@
-usr/bin/weechat-headless
-usr/share/man/man1/weechat-headless.1
-usr/share/man/*/man1/weechat-headless.1
@@ -1 +1,3 @@
-usr/lib/*/weechat/plugins/javascript.so
+#!/usr/bin/dh-exec
+
+[amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel] usr/lib/weechat/plugins/javascript.so
@@ -1 +1 @@
-usr/lib/*/weechat/plugins/lua.so
+usr/lib/weechat/plugins/lua.so
@@ -1 +1 @@
-usr/lib/*/weechat/plugins/perl.so
+usr/lib/weechat/plugins/perl.so
@@ -1 +1 @@
-usr/lib/*/weechat/plugins/php.so
+usr/lib/weechat/plugins/php.so
@@ -1,6 +1,6 @@
-usr/lib/*/weechat/plugins/exec.so
-usr/lib/*/weechat/plugins/fifo.so
-usr/lib/*/weechat/plugins/relay.so
-usr/lib/*/weechat/plugins/script.so
-usr/lib/*/weechat/plugins/spell.so
-usr/lib/*/weechat/plugins/trigger.so
+usr/lib/weechat/plugins/aspell.so
+usr/lib/weechat/plugins/exec.so
+usr/lib/weechat/plugins/fifo.so
+usr/lib/weechat/plugins/relay.so
+usr/lib/weechat/plugins/script.so
+usr/lib/weechat/plugins/trigger.so
@@ -1 +1 @@
-usr/lib/*/weechat/plugins/python.so
+usr/lib/weechat/plugins/python.so
@@ -1 +1 @@
-usr/lib/*/weechat/plugins/ruby.so
+usr/lib/weechat/plugins/ruby.so
@@ -1 +1 @@
-usr/lib/*/weechat/plugins/tcl.so
+usr/lib/weechat/plugins/tcl.so
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -15,13 +15,17 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 if(ENABLE_MAN OR ENABLE_DOC)
+
  find_package(Asciidoctor)
+
  if(ASCIIDOCTOR_FOUND)
+
    set(ASCIIDOCTOR_ARGS -a experimental -a icons=font -a revnumber="${VERSION}" -a sectanchors -a source-highlighter=prettify)
+
    add_subdirectory(cs)
    add_subdirectory(de)
    add_subdirectory(en)
@@ -31,7 +35,7 @@ if(ENABLE_MAN OR ENABLE_DOC)
    add_subdirectory(ja)
    add_subdirectory(pl)
    add_subdirectory(ru)
-  else()
-    message(SEND_ERROR "Asciidoctor not found")
+
  endif()
+
 endif()
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -15,7 +15,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 SUBDIRS = . cs de en es fr it ja pl ru
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,43 +14,22 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 if(ENABLE_MAN)
-  # man page: weechat
+  # man page
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
    DEPENDS
    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options_debug.cs.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.cs.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man_files.cs.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.cs.adoc
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    COMMENT "Building weechat.1 (cs)"
  )
-  add_custom_target(doc-man-weechat-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
+  add_custom_target(doc-man-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/cs/man1)
-
-  # man page: weechat-headless
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc
-    DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options_debug.cs.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.cs.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man_files.cs.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.cs.adoc
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Building weechat-headless.1 (cs)"
-  )
-  add_custom_target(doc-man-weechat-headless-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/cs/man1)
 endif()

 if(ENABLE_DOC)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,7 +14,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 docdir = $(datadir)/doc/$(PACKAGE)
@@ -22,16 +22,13 @@ docdir = $(datadir)/doc/$(PACKAGE)
 EXTRA_DIST = CMakeLists.txt \
             docinfo.html \
             weechat.1.cs.adoc \
-             weechat-headless.1.cs.adoc \
             cmdline_options.cs.adoc \
-             cmdline_options_debug.cs.adoc \
             weechat_quickstart.cs.adoc \
             $(wildcard autogen/user/*.adoc) \
             $(wildcard autogen/plugin_api/*.adoc)

 if MAN
-  man_targets = weechat.1 \
-                weechat-headless.1
+  man_targets = weechat.1
  man_install = install-man
  man_uninstall = uninstall-man
 endif
@@ -42,11 +39,9 @@ if DOC
 endif
 all-local: $(man_targets) $(doc_targets)

-# man pages
-weechat.1: weechat.1.cs.adoc cmdline_options.cs.adoc cmdline_options_debug.cs.adoc
+# man page
+weechat.1: weechat.1.cs.adoc cmdline_options.cs.adoc
 	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/cs/weechat.1.cs.adoc
-weechat-headless.1: weechat-headless.1.cs.adoc cmdline_options.cs.adoc cmdline_options_debug.cs.adoc
-	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/cs/weechat-headless.1.cs.adoc

 # quickstart
 weechat_quickstart.cs.html: weechat_quickstart.cs.adoc $(abs_top_srcdir)/doc/docinfo.html
@@ -70,7 +65,6 @@ uninstall-hook: $(man_uninstall) $(doc_uninstall)

 uninstall-man:
 	$(RM) $(DESTDIR)$(mandir)/cs/man1/weechat.1
-	$(RM) $(DESTDIR)$(mandir)/cs/man1/weechat-headless.1
 	-rmdir $(DESTDIR)$(mandir)/cs/man1

 uninstall-doc:
@@ -80,4 +74,4 @@ uninstall-doc:
 # clean

 clean-local:
-	-$(RM) weechat.1 weechat-headless.1 weechat_*.html
+	-rm -f weechat.1 weechat_*.html
@@ -4,11 +4,6 @@
 *-c*, *--colors*::
    Zobraz defaultní barvy v terminálu.

-// TRANSLATION MISSING
-*--daemon*::
-    Run WeeChat in background, as a daemon (works only with the command
-    *weechat-headless*).
-
 *-d*, *--dir* _<path>_::
    Nastav cestu jako dovmský adresář pro WeeChat (použitou pro konfigurační
    soubory, logy, uživatelské pluginy a skripty), výchozí hodnota je
@@ -17,18 +12,6 @@
    Pokud tato volba není zadána, použije se promněná prostředí WEECHAT_HOME
    (pokud není prázdná)

-// TRANSLATION MISSING
-*-t*, *--temp-dir*::
-    Create a temporary WeeChat home directory and delete it on exit
-    (incompatible with option "-d"). +
-    The name of the directory is automatically built by WeeChat, with this
-    template: "weechat_temp_XXXXXX" (where "XXXXXX" is random). It it created
-    in the first available directory in this list: environment variable "TMPDIR",
-    "/tmp" (may be different according to the operating system), environment
-    variable "HOME", current directory. +
-    The temporary home directory has permissions 0700 (only owner can read,
-    write and execute).
-
 *-h*, *--help*::
    Zobrazí nápovědu.

@@ -38,15 +21,8 @@
 *-p*, *--no-plugin*::
    Vypne automatické nahrání pluginů.

-// TRANSLATION MISSING
-*-P*, *--plugins* _<plugins>_::
-    Load only these plugins at startup (see /help weechat.plugin.autoload).
-    If this option is given, the option weechat.plugin.autoload is not used.
-
-// TRANSLATION MISSING
 *-r*, *--run-command* _<command>_::
-    Run command(s) after startup; many commands can be separated by semicolons,
-    this option can be given multiple times.
+    Spustí příkaz(y) po startu (více přůkazů může být odděleno středníky).

 *-s*, *--no-script*::
    Vypni automatické nahrání scriptů.
@@ -1,16 +0,0 @@
-// TRANSLATION MISSING
-*--no-dlclose*::
-    Do not call the function dlclose after plugins are unloaded.
-    This is useful with tools like Valgrind to display stack for unloaded
-    plugins.
-
-// TRANSLATION MISSING
-*--no-gnutls*::
-    Do not call the init and deinit functions of GnuTLS library.
-    This is useful with tools like Valgrind and electric-fence, to prevent
-    GnuTLS memory errors.
-
-// TRANSLATION MISSING
-*--no-gcrypt*::
-    Do not call the init and deinit functions of Gcrypt library.
-    This is useful with tools like Valgrind, to prevent Gcrypt memory errors.
@@ -1,13 +0,0 @@
-WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v
-souboru AUTHORS.adoc).
-
-Copyright (C) 2003-2019 {author}
-
-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.
-
-Prosím přečtěte si soubor COPYING pro více informací.
-
-Web: https://weechat.org/
@@ -1,74 +0,0 @@
-$HOME/.weechat/weechat.conf::
-    hlavní konfigurační soubor WeeChatu
-
-$HOME/.weechat/plugins.conf::
-    soubor konfigurace pluginů
-
-$HOME/.weechat/sec.conf::
-    konfigurační soubor s chráněnými daty
-
-$HOME/.weechat/alias.conf::
-    configurační soubor pro _alias_ plugin
-
-$HOME/.weechat/buflist.conf::
-    konfigurační soubor pro _buflist_ plugin
-
-$HOME/.weechat/charset.conf::
-    konfigurační soubor pro _charset_ plugin
-
-$HOME/.weechat/exec.conf::
-    konfigurační soubor pro _exec_ plugin
-
-$HOME/.weechat/fifo.conf::
-    konfigurační soubor pro _fifo_ plugin
-
-$HOME/.weechat/fset.conf::
-    konfigurační soubor pro _fset_ plugin
-
-$HOME/.weechat/guile.conf::
-    konfigurační soubor pro _guile_ plugin
-
-$HOME/.weechat/irc.conf::
-    konfigurační soubor pro _irc_ plugin
-
-$HOME/.weechat/javascript.conf::
-    konfigurační soubor pro _javascript_ plugin
-
-$HOME/.weechat/logger.conf::
-    konfigurační soubor pro _logger_ plugin
-
-$HOME/.weechat/lua.conf::
-    konfigurační soubor pro _lua_ plugin
-
-$HOME/.weechat/perl.conf::
-    konfigurační soubor pro _perl_ plugin
-
-$HOME/.weechat/php.conf::
-    konfigurační soubor pro _php_ plugin
-
-$HOME/.weechat/python.conf::
-    konfigurační soubor pro _python_ plugin
-
-$HOME/.weechat/relay.conf::
-    konfigurační soubor pro _relay_ plugin
-
-$HOME/.weechat/ruby.conf::
-    konfigurační soubor pro _ruby_ plugin
-
-$HOME/.weechat/script.conf::
-    konfigurační soubor pro _script_ plugin
-
-$HOME/.weechat/spell.conf::
-    konfigurační soubor pro _spell_ plugin
-
-$HOME/.weechat/tcl.conf::
-    konfigurační soubor pro _tcl_ plugin
-
-$HOME/.weechat/trigger.conf::
-    konfigurační soubor pro _trigger_ plugin
-
-$HOME/.weechat/xfer.conf::
-    konfigurační soubor pro _xfer_ plugin
-
-$HOME/.weechat/weechat.log::
-    soubor záznamů WeeChatu
@@ -1,14 +0,0 @@
-Pro kompletní dokumentaci nastavení pluginů a jejich volby podívejte se na
-https://weechat.org/doc[WeeChat user's guide].
-
-S irc pluginem se můžete doččasně připojit na server s URL jako:
-
-    irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]]
-
-K připojení na IRC kanál Weechatu pro podporu s přezdívkou "mynick":
-
-    irc://mynick@chat.freenode.net/#weechat
-
-IPv6 adresa může být uzavřena do hranatých závorek k přidání portu, například:
-
-    irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test
@@ -1,70 +0,0 @@
-// TRANSLATION MISSING
-= weechat-headless(1)
-:doctype: manpage
-:author: Sébastien Helleu
-:email: flashcode@flashtux.org
-:lang: cs
-// TRANSLATION MISSING
-:man manual: WeeChat Manual
-:man source: WeeChat {revnumber}
-
-== JMÉNO
-
-weechat-headless - the extensible chat client (headless version)
-
-== PŘEHLED
-
-// TRANSLATION MISSING
-[verse]
-*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir <path>] [-t|--temp-dir] [-p|--no-plugin] [-P|--plugins <plugins>] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...]
-*weechat-headless* [-c|--colors]
-*weechat-headless* [-h|--help]
-*weechat-headless* [-l|--license]
-*weechat-headless* [-v|--version]
-
-== POPIS
-
-WeeChat (Wee Enhanced Environment for Chat) je svobodný chatovací klient.
-Je lehký, plně konfigurovatelný a lehce rozšiřitelný pomocí pluginů a scriptů
-v obvyklých sciptovacích jazycích.
-
-// TRANSLATION MISSING
-The command *weechat-headless* runs WeeChat in a headless mode (no interface).
-It can be used for tests or to daemonize WeeChat with the option "--daemon".
-
-== VOLBY
-
-include::cmdline_options.cs.adoc[]
-
-// TRANSLATION MISSING
-== DEBUG OPTIONS
-
-*WARNING:* these options are for debug purposes only, *DO NOT USE IN PRODUCTION!*
-
-include::cmdline_options_debug.cs.adoc[]
-
-== VOLBY PLUGINŮ
-
-include::man_plugin_options.cs.adoc[]
-
-== SOUBORY
-
-include::man_files.cs.adoc[]
-
-// TRANSLATION MISSING
-== SEE ALSO
-
-*weechat*(1)
-
-== AUTOŘI
-
-Tato manuálová stránka byla napsána {author}.
-Tato manuálová stránka byla přeložena Ondřejem Súkupem.
-
-== COPYRIGHT
-
-include::man_copyright.cs.adoc[]
-
-== PODPORA / HLÁŠENÍ CHYB
-
-Pro pomoc nebo hlášení chyb https://weechat.org/about/support
@@ -13,9 +13,8 @@ weechat - the extensible chat client

 == PŘEHLED

-// TRANSLATION MISSING
 [verse]
-*weechat* [-a|--no-connect] [-d|--dir <path>] [-t|--temp-dir]  [-p|--no-plugin] [-P|--plugins <plugins>] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [debug-option...] [plugin:option...]
+*weechat* [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
 *weechat* [-c|--colors]
 *weechat* [-h|--help]
 *weechat* [-l|--license]
@@ -27,29 +26,82 @@ WeeChat (Wee Enhanced Environment for Chat) je svobodný chatovací klient.
 Je lehký, plně konfigurovatelný a lehce rozšiřitelný pomocí pluginů a scriptů
 v obvyklých sciptovacích jazycích.

+
 == VOLBY

 include::cmdline_options.cs.adoc[]

-// TRANSLATION MISSING
-== DEBUG OPTIONS
-
-*WARNING:* these options are for debug purposes only, *DO NOT USE IN PRODUCTION!*
-
-include::cmdline_options_debug.cs.adoc[]
-
 == VOLBY PLUGINŮ

-include::man_plugin_options.cs.adoc[]
+Pro kompletní dokumentaci nastavení pluginů a jejich volby podívejte se na
+https://weechat.org/doc[WeeChat user's guide].
+
+S irc pluginem se můžete doččasně připojit na server s URL jako:
+
+    irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]]
+
+K připojení na IRC kanál Weechatu pro podporu s přezdívkou "mynick":
+
+    irc://mynick@chat.freenode.net/#weechat
+
+IPv6 adresa může být uzavřena do hranatých závorek k přidání portu, například:
+
+    irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test

 == SOUBORY

-include::man_files.cs.adoc[]
+$HOME/.weechat/weechat.conf::
+    hlavní konfigurační soubor WeeChatu
+
+$HOME/.weechat/plugins.conf::
+    soubor konfigurace pluginů
+
+$HOME/.weechat/sec.conf::
+    konfigurační soubor s chráněnými daty
+
+$HOME/.weechat/alias.conf::
+    configurační soubor pro _alias_ plugin
+
+$HOME/.weechat/aspell.conf::
+    konfigurační soubor pro _aspell_ plugin
+
+$HOME/.weechat/buflist.conf::
+    konfigurační soubor pro _buflist_ plugin
+
+$HOME/.weechat/charset.conf::
+    konfigurační soubor pro _charset_ plugin
+
+$HOME/.weechat/exec.conf::
+    konfigurační soubor pro _exec_ plugin

 // TRANSLATION MISSING
-== SEE ALSO
+$HOME/.weechat/fifo.conf::
+    configuration file for _fifo_ plugin

-*weechat-headless*(1)
+// TRANSLATION MISSING
+$HOME/.weechat/fset.conf::
+    configuration file for _fset_ plugin
+
+$HOME/.weechat/irc.conf::
+    konfigurační soubor pro _irc_ plugin
+
+$HOME/.weechat/logger.conf::
+    konfigurační soubor pro _logger_ plugin
+
+$HOME/.weechat/relay.conf::
+    konfigurační soubor pro _relay_ plugin
+
+$HOME/.weechat/script.conf::
+    konfigurační soubor pro _script_ plugin
+
+$HOME/.weechat/trigger.conf::
+    konfigurační soubor pro _trigger_ plugin
+
+$HOME/.weechat/xfer.conf::
+    konfigurační soubor pro _xfer_ plugin
+
+$HOME/.weechat/weechat.log::
+    soubor záznamů WeeChatu

 == AUTOŘI

@@ -58,8 +110,20 @@ Tato manuálová stránka byla přeložena Ondřejem Súkupem.

 == COPYRIGHT

-include::man_copyright.cs.adoc[]
+WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v
+souboru AUTHORS.adoc).
+
+Copyright (C) 2003-2017 {author}
+
+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.
+
+Prosím přečtěte si soubor COPYING pro více informací.
+
+Web: https://weechat.org/

 == PODPORA / HLÁŠENÍ CHYB

-Pro pomoc nebo hlášení chyb https://weechat.org/about/support
+Pro pomoc nebo hlášení chyb https://weechat.org/dev/support
@@ -20,8 +20,8 @@ Spustění z Vašeho shellu:
 $ weechat
 ----

-[[help]]
-== On-line nápověda
+[[help_options]]
+== On-line nápověda/ volby

 WeeChat má nápovědů pro všechny příkazy, postě vložte:

@@ -35,29 +35,46 @@ K získání nápovědy pro specifický příkaz napište:
 /help příkaz
 ----

-// TRANSLATION MISSING
-Help is available for options as well:
-
----
-/help config.section.option
----
-
-(kde `config` je jméno konfigurace (`weechat` pro jádro, nebo jméno pluginu),
-`section` sekce této konfigurace a `option` jméno volby).
-
-// TRANSLATION MISSING
-[[options]]
-== Set options
-
 K nastavení voleb napište:

 ----
 /set config.section.option value
 ----

+(kde `config` je jméno konfigurace (`weechat` pro jádro, nebo jméno pluginu),
+`section` sekce této konfigurace a `option` jméno volby).
+
 WeeChat okamžitě použije novou hodnotu (*nikdy* nebudete potřebovat restart
 WeeChatu po změně konfigurace).

+Můžete použít v příkazu `/set` volbu s částečným jménem a zástupným znakem "*"
+na konci nebo začátku k zobrazení všech voleb obsahující dané znaky.
+Například:
+
+* zobrazí všechny volby (WeeChatu a pluginů):
+
+----
+/set
+----
+
+* zobraz volby WeeChatu:
+
+----
+/set weechat.*
+----
+
+* zobraz volby IRC pluginu:
+
+----
+/set irc.*
+----
+
+Můžete zobrazit nápovědu pro voblby s `/help`, například:
+
+----
+/help weechat.look.highlight
+----
+
 Všechna nastavení jsou uložena při ukončení WeeChatu (nebo použitím příkazu
 `/save` k vynucení zapsaní voleb).

@@ -70,31 +87,6 @@ that were not yet saved with `/save`). +
 You can use the command `/set`, which checks the value and applies immediately
 the changes.

-// TRANSLATION MISSING
-The plugin _fset_ allows you to easily browse options and change them.
-
-// TRANSLATION MISSING
-For example to display WeeChat options:
-
----
-/fset weechat.*
----
-
-// TRANSLATION MISSING
-IRC options:
-
----
-/fset irc.*
----
-
-// TRANSLATION MISSING
-The `/fset` command has completion on part of option names, so for example if
-you type `/fset hot` and press kbd:[Tab] this is completed as `/fset hotlist`.
-If you press kbd:[Enter], options about the hotlist are displayed.
-
-// TRANSLATION MISSING
-For more information about `/fset` command and keys, see `/help fset`.
-
 [[core_vs_plugins]]
 == Jádro versus pluginy

@@ -116,11 +108,6 @@ Můžete přidat irc server příkazem `/server`, například:
 /server add freenode chat.freenode.net
 ----

-// TRANSLATION MISSING
-In this command, `freenode` is the internal server name used by WeeChat:
-you'll be able to connect with `/connect freenode` and the server options
-are _irc.server.freenode.xxx_.
-
 Jako obvykle je poskytována nápověda pokud se ztratíte:

 ----
@@ -224,7 +211,7 @@ K smazání hodnoty serverové volby a k použití výchozí hodnoty místo ní,
 například k požití výchozích přezdívek (irc.server_default.nicks):

 ----
-/unset irc.server.freenode.nicks
+/set irc.server.freenode.nicks null
 ----

 Ostatní volby: můžete nastavit ostatní volby s následujícím příkazem ("xxx" je
@@ -235,22 +222,18 @@ název volby):
 ----

 [[connect_to_irc_server]]
-== Připojení k IRC serveru
+== Připojení k IRC serveru a automatické ořipojení kanálů

 ----
 /connect freenode
 ----

-// TRANSLATION MISSING
-With this command, WeeChat connects to the freenode server and auto-joins the
-channels configured in the "autojoin" server option.
-
-// TRANSLATION MISSING
 [NOTE]
 Tento příkaz může být použit k vytvoření nového připojení k serveru bez
-použití příkazu `/server` (see `/help connect`).
+použití příkazu `/server` (mohu zopakovat že můžete zobrazit nápovědu
+pro tento příkaz s `/help connect` ?).

-Ve výchozím nastavení jsou serverové bufery spojen s WeeChat _core_ buferem.
+Ve výchozím nastavení jsou serverové bufery spojen s Weechat _core_ buferem.
 K přepnutí mezi _core_ a server bufery můžete použít klávesu kbd:[Ctrl+x].

 Je možné vypnout automatické sloučení serverových buferů a mít nezávislé
@@ -326,6 +309,8 @@ Příkazy k spravování buferů a oken:
 /window
 ----

+(nebudu se zde opakovat, můžete k těmto příkazům získat nápovědu pomocí /help)
+
 Například, k svislému rozdělení obrazovky na malé okno (1/3 šířky), a velké
 okno (2/3), použijte příkaz:

@@ -343,12 +328,10 @@ To remove the split:
 [[key_bindings]]
 == Předvoblby klávesových zkratek

-WeeChat používá ve výchozím nastavení mnoho klávesových zkratek, Všechny
+Weechat používá ve výchozím nastavení mnoho klávesových zkratek, Všechny
 najdete v dokumentaci, ale je dobré znát alespoň pár těchto důležitých:

 - kbd:[Alt+←] / kbd:[Alt+→] nebo kbd:[F5] / kbd:[F6]: přepnout na předchozí/další bufer
-// TRANSLATION MISSING
- kbd:[F1] / kbd:[F2]: scroll bar with list of buffers ("buflist")
 - kbd:[F7] / kbd:[F8]: přepnout na předchozí/další okno (pokud je obrazovka rozdělena)
 - kbd:[F9] / kbd:[F10]: posunoutí titulku
 - kbd:[F11] / kbd:[F12]: posunutí seznamu přezdívek
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -14,49 +14,26 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 if(ENABLE_MAN)
-  # man page: weechat
+  # man page
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.adoc
    DEPENDS
    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options_debug.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man_files.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.de.adoc
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    COMMENT "Building weechat.1 (de)"
  )
-  add_custom_target(doc-man-weechat-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
+  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)
-
-  # man page: weechat-headless
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.de.adoc
-    DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options_debug.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man_files.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.de.adoc
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Building weechat-headless.1 (de)"
-  )
-  add_custom_target(doc-man-weechat-headless-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/de/man1)
 endif()

 if(ENABLE_DOC)

-  file(GLOB AUTOGEN_USER "${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc")
-
  # user's guide
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
@@ -65,8 +42,7 @@ if(ENABLE_DOC)
    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options_debug.de.adoc
-    ${AUTOGEN_USER}
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    COMMENT "Building weechat_user.de.html"
  )
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2019 Sébastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2017 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -15,7 +15,7 @@
 # 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 <https://www.gnu.org/licenses/>.
+# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

 docdir = $(datadir)/doc/$(PACKAGE)
@@ -23,9 +23,7 @@ docdir = $(datadir)/doc/$(PACKAGE)
 EXTRA_DIST = CMakeLists.txt \
             docinfo.html \
             weechat.1.de.adoc \
-             weechat-headless.1.de.adoc \
             cmdline_options.de.adoc \
-             cmdline_options_debug.de.adoc \
             weechat_user.de.adoc \
             weechat_scripting.de.adoc \
             weechat_faq.de.adoc \
@@ -34,8 +32,7 @@ EXTRA_DIST = CMakeLists.txt \
             $(wildcard autogen/user/*.adoc)

 if MAN
-  man_targets = weechat.1 \
-                weechat-headless.1
+  man_targets = weechat.1
  man_install = install-man
  man_uninstall = uninstall-man
 endif
@@ -50,14 +47,12 @@ if DOC
 endif
 all-local: $(man_targets) $(doc_targets)

-# man pages
-weechat.1: weechat.1.de.adoc cmdline_options.de.adoc cmdline_options_debug.de.adoc
+# man page
+weechat.1: weechat.1.de.adoc cmdline_options.de.adoc
 	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/de/weechat.1.de.adoc
-weechat-headless.1: weechat-headless.1.de.adoc cmdline_options.de.adoc cmdline_options_debug.de.adoc
-	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/de/weechat-headless.1.de.adoc

 # user's guide
-weechat_user.de.html: weechat_user.de.adoc cmdline_options.de.adoc cmdline_options_debug.de.adoc $(wildcard autogen/user/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+weechat_user.de.html: weechat_user.de.adoc cmdline_options.de.adoc $(wildcard autogen/user/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
 	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.adoc

 # scripting guide
@@ -94,7 +89,6 @@ uninstall-hook: $(man_uninstall) $(doc_uninstall)

 uninstall-man:
 	$(RM) $(DESTDIR)$(mandir)/de/man1/weechat.1
-	$(RM) $(DESTDIR)$(mandir)/de/man1/weechat-headless.1
 	-rmdir $(DESTDIR)$(mandir)/de/man1

 uninstall-doc:
@@ -104,4 +98,4 @@ uninstall-doc:
 # clean

 clean-local:
-	-$(RM) weechat.1 weechat-headless.1 weechat_*.html
+	-rm -f weechat.1 weechat_*.html
@@ -10,6 +10,10 @@

 | alias | alias_value | Wert von Alias

+| aspell | aspell_dicts | Auflistung der installierten Wörterbücher
+
+| aspell | aspell_langs | Liste aller Sprachen die durch Aspell unterstützt werden
+
 | exec | exec_commands_ids | IDs (Nummern und Namen) von ausgeführten Befehlen

 | fset | fset_options | Konfigurationsdateien, Sektionen, Optionen und Worte von Optionen
@@ -26,10 +30,6 @@

 | irc | irc_ignores_numbers | Anzahl für festgelegte Ignorierungen

-| irc | irc_modelist_masks | Modelist Maske für aktuellen IRC Channel; benötigtes Argument: modelist mode
-
-| irc | irc_modelist_numbers | Modelist Nummern für aktuellen IRC Channel; benötigtes Argument: modelist mode
-
 | irc | irc_msg_kick | Standardmitteilung wenn man jemanden aus einem Channel wirft

 | irc | irc_msg_part | Standardmitteilung beim Verlassen (/part) eines IRC-Channels
@@ -38,8 +38,6 @@

 | irc | irc_privates | Private auf allen IRC Servern

-| irc | irc_raw_filters | Filter für IRC Rohbuffer
-
 | irc | irc_server | aktueller IRC-Server

 | irc | irc_server_channels | Channels des derzeitigen IRC-Server
@@ -84,10 +82,6 @@

 | script | script_tags | Schlagwortliste für Skripten im Repositorium

-| spell | spell_dicts | Auflistung der installierten Wörterbücher
-
-| spell | spell_langs | Liste aller Sprachen die unterstützt werden
-
 | tcl | tcl_script | Liste der Skripten

 | trigger | trigger_hook_arguments | Standardargumente für einen Hook
@@ -144,7 +138,7 @@

 | weechat | env_vars | Umgebungsvariablen

-| weechat | filename | Dateiname; optionales Argument: default path (Hinweis: Inhalt wird evaluiert, siehe /help eval)
+| weechat | filename | Dateinamen

 | weechat | filters_names | Liste der Filter

@@ -74,8 +74,6 @@ _last_nick_   (pointer, hdata: "irc_nick") +
 _nicks_speaking_   (pointer) +
 _nicks_speaking_time_   (pointer, hdata: "irc_channel_speaking") +
 _last_nick_speaking_time_   (pointer, hdata: "irc_channel_speaking") +
-_modelists_   (pointer, hdata: "irc_modelist") +
-_last_modelist_   (pointer, hdata: "irc_modelist") +
 _join_smart_filtered_   (hashtable) +
 _buffer_   (pointer, hdata: "buffer") +
 _buffer_as_string_   (string) +
@@ -108,30 +106,6 @@ _prev_ignore_   (pointer, hdata: "irc_ignore") +
 _next_ignore_   (pointer, hdata: "irc_ignore") +


-| irc
-| [[hdata_irc_modelist]]<<hdata_irc_modelist,irc_modelist>>
-| IRC Modelist
-| -
-| _type_   (char) +
-_state_   (integer) +
-_items_   (pointer, hdata: "irc_modelist_item") +
-_last_item_   (pointer, hdata: "irc_modelist_item") +
-_prev_modelist_   (pointer, hdata: "irc_modelist") +
-_next_modelist_   (pointer, hdata: "irc_modelist") +
-
-
-| irc
-| [[hdata_irc_modelist_item]]<<hdata_irc_modelist_item,irc_modelist_item>>
-| IRC Modelist-Item
-| -
-| _number_   (integer) +
-_mask_   (string) +
-_setter_   (string) +
-_datetime_   (time) +
-_prev_item_   (pointer, hdata: "irc_modelist_item") +
-_next_item_   (pointer, hdata: "irc_modelist_item") +
-
-
 | irc
 | [[hdata_irc_nick]]<<hdata_irc_nick,irc_nick>>
 | IRC-Nick
@@ -243,17 +217,13 @@ _nick_first_tried_   (integer) +
 _nick_alternate_number_   (integer) +
 _nick_   (string) +
 _nick_modes_   (string) +
-_host_   (string) +
-_checking_cap_ls_   (integer) +
-_cap_ls_   (hashtable) +
-_checking_cap_list_   (integer) +
-_cap_list_   (hashtable) +
+_cap_away_notify_   (integer) +
+_cap_account_notify_   (integer) +
+_cap_extended_join_   (integer) +
 _isupport_   (string) +
 _prefix_modes_   (string) +
 _prefix_chars_   (string) +
 _nick_max_length_   (integer) +
-_user_max_length_   (integer) +
-_host_max_length_   (integer) +
 _casemapping_   (integer) +
 _chantypes_   (string) +
 _chanmodes_   (string) +
@@ -432,7 +402,7 @@ _tags_   (string) +
 _requirements_   (string) +
 _min_weechat_   (string) +
 _max_weechat_   (string) +
-_sha512sum_   (string) +
+_md5sum_   (string) +
 _url_   (string) +
 _popularity_   (integer) +
 _date_added_   (time) +
@@ -653,7 +623,6 @@ _args_   (string) +
 _direction_   (integer) +
 _add_space_   (integer) +
 _force_partial_completion_   (integer) +
-_reverse_partial_completion_   (integer) +
 _list_   (pointer) +
 _word_found_   (string) +
 _word_found_is_nick_   (integer) +
@@ -894,7 +863,6 @@ _str_time_   (string) +
 _tags_count_   (integer) +
 _tags_array_   (shared_string, array_size: "tags_count") +
 _displayed_   (char) +
-_notify_level_   (char) +
 _highlight_   (char) +
 _refresh_needed_   (char) +
 _prefix_   (shared_string) +
@@ -972,8 +940,6 @@ _charset_   (string) +
 _priority_   (integer) +
 _initialized_   (integer) +
 _debug_   (integer) +
-_upgrading_   (integer) +
-_variables_   (hashtable) +
 _prev_plugin_   (pointer, hdata: "plugin") +
 _next_plugin_   (pointer, hdata: "plugin") +

@@ -10,8 +10,6 @@

 | alias | alias_default | Liste der standardmäßigen Aliase | - | -

-| buflist | buflist | Liste der Buffer in buflist Bar-Item | - | buflist Bar-Item Name (optional)
-
 | fset | fset_option | Auflistung der fset Optionen | fset Option-Pointer (optional) | Name einer Einstellung (Platzhalter "*" kann verwendet werden) (optional)

 | guile | guile_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (Platzhalter "*" kann verwendet werden) (optional)
@@ -22,10 +20,6 @@

 | irc | irc_ignore | Liste von ignorierten IRCs | Ignore Pointer (optional) | -

-| irc | irc_modelist | Liste der Channel-Mode-Liste für einen IRC-Channel | Modelist Pointer (optional) | Server,Channel,Type (Type ist optional)
-
-| irc | irc_modelist_item | Liste der Items in der Channel-Modeliste | Modelist Item Pointer (optional) | Server,Channel,Type,Nummer (Nummer ist 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 (Platzhalter "*" kann verwendet werden) (optional)
@@ -6,14 +6,10 @@
 |===
 | Erweiterung | Name | Beschreibung | Argumente

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

-| guile | guile_eval | Evaluierung des Quelltextes | Quelltext welcher ausgeführt werden soll
-
-| guile | guile_interpreter | Name des verwendeten Interpreters | -
-
-| guile | guile_version | Version des verwendeten Interpreters | -
-
 | irc | irc_buffer | holt Buffer Pointer für einen IRC Server/Channel/Nick | server,channel,nick (Channel und Nicks sind optional)

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

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

-| javascript | javascript_eval | Evaluierung des Quelltextes | Quelltext welcher ausgeführt werden soll
-
-| javascript | javascript_interpreter | Name des verwendeten Interpreters | -
-
-| javascript | javascript_version | Version des verwendeten Interpreters | -
-
-| lua | lua_eval | Evaluierung des Quelltextes | Quelltext welcher ausgeführt werden soll
-
-| lua | lua_interpreter | Name des verwendeten Interpreters | -
-
-| lua | lua_version | Version des verwendeten Interpreters | -
-
-| perl | perl_eval | Evaluierung des Quelltextes | Quelltext welcher ausgeführt werden soll
-
-| perl | perl_interpreter | Name des verwendeten Interpreters | -
-
-| perl | perl_version | Version des verwendeten Interpreters | -
-
-| php | php_eval | Evaluierung des Quelltextes | Quelltext welcher ausgeführt werden soll
-
-| php | php_interpreter | Name des verwendeten Interpreters | -
-
-| php | php_version | Version des verwendeten Interpreters | -
-
 | python | python2_bin | Pfad für Python 2.x Interpreter | -

-| python | python_eval | Evaluierung des Quelltextes | Quelltext welcher ausgeführt werden soll
-
-| python | python_interpreter | Name des verwendeten Interpreters | -
-
-| python | python_version | Version des verwendeten Interpreters | -
-
-| relay | relay_client_count | Anzahl an Clients für Relay | Protokoll,Status (beide sind Optional, bei beiden Argumenten bedeutet "*", alle; Protokolle: irc, weechat; Status: connecting, waiting_auth, connected, auth_failed, disconnected)
-
-| ruby | ruby_eval | Evaluierung des Quelltextes | Quelltext welcher ausgeführt werden soll
-
-| ruby | ruby_interpreter | Name des verwendeten Interpreters | -
-
-| ruby | ruby_version | Version des verwendeten Interpreters | -
-
-| spell | spell_dict | durch Kommata getrennte Liste von Wörterbüchern, die in diesem Buffer genutzt werden sollen | Buffer-Pointer ("0x12345678") oder der vollständige Buffername ("irc.freenode.#weechat")
-
-| tcl | tcl_eval | Evaluierung des Quelltextes | Quelltext welcher ausgeführt werden soll
-
-| tcl | tcl_interpreter | Name des verwendeten Interpreters | -
-
-| tcl | tcl_version | Version des verwendeten Interpreters | -
+| 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 | -

@@ -92,7 +44,7 @@

 | weechat | cursor_mode | 1, falls Cursor-Modus aktiviert ist | -

-| weechat | date | Datum/Zeit der WeeChat Kompilierung | -
+| weechat | date | Datum der WeeChat Kompilierung | -

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

@@ -100,7 +52,7 @@

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

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

 | weechat | nick_color | zeigt Farbecode des Nick | Nickname

@@ -108,19 +60,11 @@

 | weechat | pid | WeeChat PID (Prozess-ID) | -

-| weechat | term_color_pairs | Anzahl der Farbpaare die durch das Terminal unterstützt werden | -
-
-| weechat | term_colors | Anzahl der Farben die durch das Terminal unterstützt werden | -
-
 | weechat | term_height | Höhe des Terminals | -

 | weechat | term_width | Breite des Terminals | -

-| weechat | totp_generate | generiert ein Time-based One-Time Passwort (TOTP) | geheime Zeichenkette (in base32), Zeitstempel (optional, standardmäßig aktuelle Zeit), Anzahl an Zeichen (optional, zwischen 4 und 10, standardmäßig 6)
-
-| weechat | totp_validate | validiert ein Time-based One-Time Passwort (TOTP): 1 falls TOTP korrekt ist, ansonsten 0 | geheim (in base32), einmaliges Passwort, Zeitstempel (optional, standardmäßig aktuelle Zeit), Anzahl der zu testenden Passwörtern vorher/nachher (optional, standardmäßig 0)
-
-| weechat | uptime | Laufzeit von WeeChat (Format: "days:hh:mm:ss") | "days" (Anzahl der Tage) oder "seconds" (Anzahl der Sekunden) (optional)
+| weechat | uptime | Laufzeit von Weechat (Format: "days:hh:mm:ss") | "days" (Anzahl der Tage) oder "seconds" (Anzahl der Sekunden) (optional)

 | weechat | version | WeeChat-Version | -

@@ -6,8 +6,8 @@
 |===
 | Erweiterung | Name | Beschreibung | Hashtable (Eingabe) | Hashtable (Ausgabe)

-| irc | irc_message_parse | Parse eine IRC Nachricht | "message": IRC Nachricht, "server": Servername (optional) | "tags": Tags, "message_without_tags": Nachrichten ohne Tags, "nick": Nick, "user": Benutzername, "host": Host, "command": Befehl, "channel": Channel, "arguments": Argumente (schließt Channel ein), "text": Text (zum Beispiel eine Nachricht von einem User), "pos_command": Index der "command" Nachricht ("-1" falls "command" nicht gefunden wird), "pos_arguments": Index der "arguments" Nachricht ("-1" falls "arguments" nicht gefunden wird), "pos_channel": Index der "channel" Nachricht ("-1" falls "channel" nicht gefunden wird),"pos_text": Index für "text" Nachricht ("-1" falls "text" nicht gefunden wird)
+| irc | irc_message_parse | Parse eine IRC Nachricht | "message": IRC Nachricht, "server": Servername (optional) | "tags": Tags, "message_without_tags": Nachrichten ohne Tags, "nick": Nick, "host": Host, "command": Befehl, "channel": Channel, "arguments": Argumente (schließt Channel ein), "text": Text (zum Beispiel eine Nachricht von einem User), "pos_command": Index der "command" Nachricht ("-1" falls "command" nicht gefunden wird), "pos_arguments": Index der "arguments" Nachricht ("-1" falls "arguments" nicht gefunden wird), "pos_channel": Index der "channel" Nachricht ("-1" falls "channel" nicht gefunden wird),"pos_text": Index für "text" Nachricht ("-1" falls "text" nicht gefunden wird)

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

 |===
@@ -6,7 +6,7 @@
 . logger (14000)
 . exec (13000)
 . trigger (12000)
-. spell (11000)
+. aspell (11000)
 . alias (10000)
 . buflist (9000)
 . fifo (8000)
@@ -4,7 +4,7 @@
 //
 [width="100%",cols="2,^1,7",options="header"]
 |===
-| Einstellung | Type ^(1)^ | Konstanten ^(2)^
+| Einstellung | Type | Konstanten ^(1)^

 | verbose | long |

@@ -62,8 +62,6 @@

 | unix_socket_path | string |

-| abstract_unix_socket | string |
-
 | path_as_is | long |

 | proxy_service_name | string |
@@ -74,21 +72,15 @@

 | tcp_fastopen | long |

-| socks5_auth | long |
-
-| haproxyprotocol | long |
-
-| doh_url | string |
-
 | netrc | long | ignored, optional, required

 | userpwd | string |

 | proxyuserpwd | string |

-| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

-| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate, gssapi, bearer
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate

 | netrc_file | string |

@@ -112,8 +104,6 @@

 | login_options | string |

-| disallow_username_in_url | long |
-
 | autoreferer | long |

 | followlocation | long |
@@ -128,8 +118,6 @@

 | useragent | string |

-| httpheader | list |
-
 | cookie | string |

 | cookiefile | string |
@@ -146,8 +134,6 @@

 | cookiesession | long |

-| http200aliases | list |
-
 | unrestricted_auth | long |

 | postfieldsize_large | long long |
@@ -172,18 +158,12 @@

 | headeropt | mask | unified, separate

-| proxyheader | list |
-
 | pipewait | long |

 | stream_weight | long |

-| request_target | string |
-
 | mail_from | string |

-| mail_rcpt | list |
-
 | mail_auth | string |

 | tftp_blksize | long |
@@ -192,14 +172,8 @@

 | ftpport | string |

-| quote | list |
-
-| postquote | list |
-
 | ftp_use_epsv | long |

-| prequote | list |
-
 | ftp_use_eprt | long |

 | ftp_create_missing_dirs | long |
@@ -268,10 +242,6 @@

 | maxfilesize_large | long long |

-| timevalue_large | long long |
-
-| upload_buffersize | long |
-
 | timeout | long |

 | low_speed_limit | long |
@@ -300,8 +270,6 @@

 | use_ssl | long | none, try, control, all

-| resolve | list |
-
 | dns_servers | string |

 | accepttimeout_ms | long |
@@ -312,17 +280,9 @@

 | dns_local_ip6 | string |

-| connect_to | list |
-
-| happy_eyeballs_timeout_ms | long |
-
-| dns_shuffle_addresses | long |
-
-| upkeep_interval_ms | long |
-
 | sslcert | string |

-| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3, max_default, max_none, max_tlsv1_0, max_tlsv1_1, max_tlsv1_2, max_tlsv1_3
+| sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3

 | ssl_verifypeer | long |

@@ -362,7 +322,7 @@

 | gssapi_delegation | long | none, policy_flag, flag

-| ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| ssl_options | long | allow_beast, no_revoke

 | ssl_enable_alpn | long |

@@ -392,11 +352,9 @@

 | proxy_sslkeytype | string |

-| proxy_sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3, max_default, max_none, max_tlsv1_0, max_tlsv1_1, max_tlsv1_2, max_tlsv1_3
+| proxy_sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3

-| proxy_ssl_cipher_list | list |
-
-| proxy_ssl_options | long | allow_beast, no_revoke, no_backends, ok, too_late, unknown_backend
+| proxy_ssl_options | long | allow_beast, no_revoke

 | proxy_ssl_verifyhost | long |

@@ -408,10 +366,6 @@

 | proxy_tlsauth_username | string |

-| tls13_ciphers | list |
-
-| proxy_tls13_ciphers | list |
-
 | ssh_auth_types | mask | none, policy_flag, flag

 | ssh_public_keyfile | string |
@@ -422,12 +376,8 @@

 | ssh_knownhosts | string |

-| ssh_compression | long |
-
 | new_file_perms | long |

 | new_directory_perms | long |

-| telnetoptions | list |
-
 |===
@@ -7,6 +7,8 @@
 | Alias | Befehl | Vervollständigung

 | /AAWAY | /allserv /away | -
+| /AME | /allchan /me | -
+| /AMSG | /allchan /msg * | -
 | /ANICK | /allserv /nick | -
 | /BEEP | /print -beep | -
 | /BYE | /quit | -
@@ -33,9 +35,8 @@
 | /UMODE | /mode $nick | -
 | /V | /command core version | -
 | /W | /who | -
-| /WC | /window close | -
+| /WC | /window merge | -
 | /WI | /whois | -
 | /WII | /whois $1 $1 | -
-| /WM | /window merge | -
 | /WW | /whowas | -
 |===
@@ -0,0 +1,32 @@
+//
+// This file is auto-generated by script docgen.py.
+// DO NOT EDIT BY HAND!
+//
+[[command_aspell_aspell]]
+* `+aspell+`: Konfiguration für Aspell-Erweiterung
+
+----
+/aspell  enable|disable|toggle
+         listdict
+         setdict <dict>[,<dict>...]
+         deldict
+         addword [<dict>] <word>
+
+  enable: Aspell wird aktiviert
+ disable: Aspell wird deaktiviert
+  toggle: Aspell Funktionalität umschalten
+listdict: die, auf dem System, installierten Wörterbücher werden aufgelistet
+ setdict: Wörterbuch für den aktuellen Buffer einstellen (mehrere Wörterbücher müssen durch Kommata getrennt werden)
+ deldict: Wörterbuch für den aktuellen Buffer entfernen
+ addword: fügt ein Wort in das persönliche Wörterbuch von Aspell hinzu
+
+Eingaben die mit '/' beginnen werden nicht überprüft, davon ausgenommen sind einige Befehle (siehe /set aspell.check.commands).
+
+Um sich eine Liste von Vorschlägen in einer Bar anzeigen zu lassen nutzt man das Item "aspell_suggest".
+
+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
+
+Die Standardtastaturbelegung zum Umschalten der Aspell Funktionalität lautet alt-s.
+----
@@ -2,80 +2,80 @@
 // This file is auto-generated by script docgen.py.
 // DO NOT EDIT BY HAND!
 //
-* [[option_spell.check.commands]] *spell.check.commands*
+* [[option_aspell.check.commands]] *aspell.check.commands*
 ** Beschreibung: pass:none[durch Kommata getrennte Liste der Befehle, für die eine Rechtschreibprüfung gelten soll (Rechtschreibprüfung ist für andere Befehle deaktiviert)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
-** Standardwert: `+"away,command,cycle,kick,kickban,me,msg,notice,part,query,quit,topic"+`
+** Standardwert: `+"ame,amsg,away,command,cycle,kick,kickban,me,msg,notice,part,query,quit,topic"+`

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

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

-* [[option_spell.check.enabled]] *spell.check.enabled*
-** Beschreibung: pass:none[Rechtschreibprüfung wird für die Eingabezeile aktiviert]
+* [[option_aspell.check.enabled]] *aspell.check.enabled*
+** Beschreibung: pass:none[Aspell wird für die Eingabezeile aktiviert]
 ** Typ: boolesch
 ** Werte: on, off
 ** Standardwert: `+off+`

-* [[option_spell.check.real_time]] *spell.check.real_time*
+* [[option_aspell.check.real_time]] *aspell.check.real_time*
 ** Beschreibung: pass:none[Eine Korrektur findet während der Texteingabe statt (da dies langsamer ist, ist diese Funktion standardmäßig deaktiviert. Wörter werden erst überprüft sobald ein Leerzeichen dem vorangegangenen Wort folgt)]
 ** Typ: boolesch
 ** Werte: on, off
 ** Standardwert: `+off+`

-* [[option_spell.check.suggestions]] *spell.check.suggestions*
-** Beschreibung: pass:none[legt die Anzahl an Vorschlägen, für ein falsch geschriebenes Wort, fest. Die Vorschläge werden mittels der Bar-Item "spell_suggest", für die jeweilige(n) Sprache(n), die für den Buffer augewählt wurden, angezeigt (-1 = deaktiviert die Funktion, 0 = zeigt alle verfügbaren Vorschläge, für alle ausgewählten Sprachen, an)]
+* [[option_aspell.check.suggestions]] *aspell.check.suggestions*
+** Beschreibung: pass:none[legt die Anzahl an Vorschlägen, für ein falsch geschriebenes Wort, fest. Die Vorschläge werden mittels der Bar-Item "aspell_suggest", für die jeweilige(n) Sprache(n), die für den Buffer augewählt wurden, angezeigt (-1 = deaktiviert die Funktion, 0 = zeigt alle verfügbaren Vorschläge, für alle ausgewählten Sprachen, an)]
 ** Typ: integer
 ** Werte: -1 .. 2147483647
 ** Standardwert: `+-1+`

-* [[option_spell.check.word_min_length]] *spell.check.word_min_length*
+* [[option_aspell.check.word_min_length]] *aspell.check.word_min_length*
 ** Beschreibung: pass:none[Mindestlänge für ein Wort, welches auf Rechtschreibung überprüft werden soll (bei 0 werden alle Wörter überprüft)]
 ** Typ: integer
 ** Werte: 0 .. 2147483647
 ** Standardwert: `+2+`

-* [[option_spell.color.misspelled]] *spell.color.misspelled*
+* [[option_aspell.color.misspelled]] *aspell.color.misspelled*
 ** Beschreibung: pass:none[Farbe in der ein Wort mit einem Rechtschreibfehler hervorgehoben werden soll (Eingabezeile)]
 ** Typ: Farbe
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute 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_spell.color.suggestion]] *spell.color.suggestion*
-** Beschreibung: pass:none[Textfarbe für die Vorschläge der Rechtsschreibkorrektur in der Bar-Item "spell_suggest"]
+* [[option_aspell.color.suggestion]] *aspell.color.suggestion*
+** Beschreibung: pass:none[Textfarbe für die Vorschläge der Rechtsschreibkorrektur in der Bar-Item "aspell_suggest"]
 ** 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: `+default+`

-* [[option_spell.color.suggestion_delimiter_dict]] *spell.color.suggestion_delimiter_dict*
-** Beschreibung: pass:none[Textfarbe für das Trennzeichen welches zwischen zwei Wörterbüchern dargestellt wird, im Bar-Item "spell_suggest"]
+* [[option_aspell.color.suggestion_delimiter_dict]] *aspell.color.suggestion_delimiter_dict*
+** Beschreibung: pass:none[Textfarbe für das Trennzeichen, im Bar-Item "aspell_suggest", welches zwischen zwei Wörterbücher dargestellt wird]
 ** 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: `+cyan+`

-* [[option_spell.color.suggestion_delimiter_word]] *spell.color.suggestion_delimiter_word*
-** Beschreibung: pass:none[Textfarbe für das Trennzeichen zwischen zwei Wörtern in der Bar-Item "spell_suggest"]
+* [[option_aspell.color.suggestion_delimiter_word]] *aspell.color.suggestion_delimiter_word*
+** Beschreibung: pass:none[Textfarbe für das Trennzeichen zwischen zwei Wörtern in der Bar-Item "aspell_suggest"]
 ** 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: `+cyan+`

-* [[option_spell.look.suggestion_delimiter_dict]] *spell.look.suggestion_delimiter_dict*
-** Beschreibung: pass:none[Trennzeichen, im Bar-Item "spell_suggest", welches zwischen zwei Wörterbücher dargestellt wird]
+* [[option_aspell.look.suggestion_delimiter_dict]] *aspell.look.suggestion_delimiter_dict*
+** Beschreibung: pass:none[Trennzeichen, im Bar-Item "aspell_suggest", welches zwischen zwei Wörterbücher dargestellt wird]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+" / "+`

-* [[option_spell.look.suggestion_delimiter_word]] *spell.look.suggestion_delimiter_word*
-** Beschreibung: pass:none[Trennzeichen, im Bar-Item "spell_suggest", welches zwischen zwei Wörtern dargestellt wird]
+* [[option_aspell.look.suggestion_delimiter_word]] *aspell.look.suggestion_delimiter_word*
+** Beschreibung: pass:none[Trennzeichen, im Bar-Item "aspell_suggest", welches zwischen zwei Wörtern dargestellt wird]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+","+`
@@ -10,7 +10,7 @@
          refresh

    bar: fügt eine "buflist" Bar hinzu
-refresh: erzwingt eine Aktualisierung der Bar-Item (buflist, buflist2 und buflist3)
+refresh: erzwingt eine Aktualisierung des "buflist" Bar-Item

 Jede Zeile die einen Buffer anzeigt wird mittels Zeichenketten-Evaluation dargestellt (siehe /help eval für das Format), dazu werden folgende Optionen genutzt:
  - buflist.look.display_conditions: Bedingungen um einen Buffer in der Liste darzustellen
@@ -32,16 +32,15 @@ Die folgenden Variablen können in den obigen Optionen genutzt werden:
    - ${format_buffer}: der evaluierte Wert der Option buflist.format.buffer; dies kann in der Option buflist.format.buffer_current genutzt werden um zum Beispiel die Hintergrundfarbe zu verändern
    - ${current_buffer}: ein Boolean ("0" oder "1"), "1" falls es sich um den aktuellen Buffer handelt; dies kann in einer Bedingung verwendet werden: ${if:${current_buffer}?...:...}
    - ${merged}: ein Boolean ("0" oder "1"), "1" wenn der Buffer mit einem anderen zusammengefügt ist; kann innerhalb einer Bedingung genutzt werden: ${if:${merged}?...:...}
-    - ${format_number}: eingerückte Nummer mit Trennzeichen (evaluiert aus Option buflist.format.number)
-    - ${number}: eingerückte Nummer, zum Beispiel " 1", falls die Anzahl der Buffer zwischen 10 und 99 liegt; bei zusammengefügten Buffern enthält die Variable für den ersten Buffer die entsprechende Nummer, die weiteren Buffer enthalten ein Leerzeichen anstelle der Nummer
-    - ${number2}: eingerückte Nummer, zum Beispiel " 1", falls die Anzahl der Buffer zwischen 10 und 99 liegt
+    - ${format_number}: eingerückte Numer mit Trennzeichen (evaluiert aus Option buflist.format.number)
+    - ${number}: eingerückte Nummer, zum Beispiel " 1", falls die Anzahl der Buffer zwischen 10 und 99 liegt
    - ${number_displayed}: "1" falls Nummer angezeigt wird, ansonsten "0"
    - ${indent}: Einrückung für Name (Channel und private Buffer werden eingerückt) (evaluiert aus Option buflist.format.indent)
    - ${format_nick_prefix}: Nick-Präfix mit entsprechender Farbe für einen Channel (evaluiert aus Option buflist.format.nick_prefix)
    - ${color_nick_prefix}: Farbe für den Nick-Präfix von einem Channel (wird nur genutzt wenn die Option buflist.look.nick_prefix aktiviert ist)
    - ${nick_prefix}: der Nick-Präfix für einen Channel (wird nur genutzt falls die Option buflist.look.nick_prefix aktiviert ist)
    - ${format_name}: der formatierte Name (evaluiert aus Option buflist.format.name)
-    - ${name}: der Kurzname (falls einer gesetzt ist), ersatzweise wird auf den Originalnamen zurückgegriffen
+    - ${name}: der Kurzname (falls einer gesetzt ist), Ersatzweise wird auf den Originalnamen zurückgegriffen
    - ${color_hotlist}: die Farbe mit der höchsten Priorität für den entsprechenden Buffer (evaluiert aus Option buflist.format.hotlist_xxx wobei xxx der entsprechende Level ist)
    - ${format_hotlist}: die formatierte Hotlist (evaluiert aus Option buflist.format.hotlist)
    - ${hotlist}: die Hotlist in der Rohform
@@ -3,7 +3,7 @@
 // DO NOT EDIT BY HAND!
 //
 * [[option_buflist.format.buffer]] *buflist.format.buffer*
-** Beschreibung: pass:none[Format für eine Zeile mit einem Buffer (Hinweis: Inhalt wird evaluiert, siehe /help buflist); Beispiel: Standardformat für Bar-Item "buflist" anwenden und nur die Buffernummer in eckigen Klammern für die anderen Bar-Items ("buflist2 und "buflist3") anzeigen:  "${if:${bar_item.name}==buflist?${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}:[${number}\]}"]
+** Beschreibung: pass:none[Format für eine Zeile mit einem Buffer (Hinweis: Inhalt wird evaluiert, siehe /help buflist)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}"+`
@@ -129,7 +129,7 @@
 ** Standardwert: `+on+`

 * [[option_buflist.look.nick_prefix]] *buflist.look.nick_prefix*
-** Beschreibung: pass:none[holt den Nick-Präfix und die dazugehörige Farbe aus der Nicklist um diese mit der Variable ${nick_prefix} zu nutzen; diese Option ist standardmäßig deaktiviert, da bei einer umfangreichen Nickliste es zu Verzögerungen kommen kann]
+** Beschreibung: pass:none[holt den Nick-Präfix und die dazugehörige Farbe aus der Nicklist  um diese mit der Variable ${nick_prefix} zu nutzen; diese Option ist standardmäßig deaktiviert, da bei einer umfangreichen Nickliste es zu Verzögerungen kommen kann]
 ** Typ: boolesch
 ** Werte: on, off
 ** Standardwert: `+off+`
@@ -17,9 +17,9 @@
       -del <id>|-all [<id>...]

   -list: zeigt laufende Befehle an
-     -sh: es wird die shell verwendet um Befehle auszuführen, mehrere Befehle können dabei gepiped werden (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)(Standardverhalten)
-     -bg: führt Prozess im Hintergrund aus: es wird weder eine Prozessausgabe noch ein Rückgabewert ausgegeben (nicht kompatibel mit Argumenten -o/-oc/-n/-nf/-pipe/-hsignal)
+     -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/-oc/-n/-nf/-pipe/-hsignal)
   -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)
@@ -28,7 +28,7 @@
      -o: gibt die Ausgabe des Befehls im Buffer aus (nicht kompatibel mit Argumenten -bg/-pipe/-hsignal)
     -oc: gibt die Ausgabe des Befehls im Buffer aus und führt diesen dann aus (betrifft Zeilen die mit "/" beginnen bzw. das benutzerdefinierte Befehlszeichen verwenden) (nicht kompatibel mit Argumenten -bg/-pipe/-hsignal)
      -n: gibt die Ausgabe des Befehls in einem neuen Buffer aus (nicht kompatibel mit Argumenten -bg/-pipe/-hsignal)
-     -nf: gibt die Ausgabe des Befehls in einem neuen Buffer, mit einem freien Inhalt, aus (kein Zeilenumbruch, keine Limitierung in der Anzahl der Zeilen), aus (nicht kompatibel mit Argument -bg/-pipe/-hsignal)
+     -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/-pipe/-hsignal)
     -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)
@@ -67,7 +67,7 @@ Standardoptionen können in der Einstellung exec.command.default_options bestimm
 Beispiele:
  /exec -n ls -l /tmp
  /exec -sh -n ps xu | grep weechat
-  /exec -n -norc url:https://pastebin.com/raw.php?i=xxxxxxxx
+  /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
@@ -25,9 +25,3 @@
 ** Typ: integer
 ** Werte: -1 .. 25920000
 ** Standardwert: `+0+`
-
-* [[option_exec.command.shell]] *exec.command.shell*
-** Beschreibung: pass:none[shell welche für den Befehl "/exec -sh" genutzt werden soll; hierbei kann es sich um den Namen der shell handeln der über PATH gefunden wird (zum Beispiel "bash") oder man nutzt eine absolute Pfadangabe zur Binärdatei (zum Beispiel "/bin/bash"); wenn kein Wert angegeben ist, wird "sh" genutzt (Hinweis: Inhalt ist evaluiert, siehe /help eval)]
-** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette
-** Standardwert: `+"${env:SHELL}"+`
@@ -51,8 +51,6 @@
               d:xxx   zeigt nur Optionen die verändert wurden und "xxx" im Namen haben
               d=xxx   zeigt nur veränderte Optionen, die "xxx" als Wert haben
               d==xxx  zeigt nur veränderte Optionen die exakt "xxx" als Wert haben
-               h=xxx   zeigt alle Optionen, die den Text "xxx" in der Beschreibung enthalten (in der Übersetzung)
-               he=xxx  zeigt alle Optionen, die den Text "xxx" in der Beschreibung enthalten (in der englischen Beschreibung)
               =xxx    zeigt nur Optionen mit "xxx" als Wert
               ==xxx   zeigt nur Optionen die exakt "xxx" als Wert haben
               c:xxx   zeigt nur Optionen auf die die evaluierte Bedingung "xxx" zutrifft, folgende Variable können verwendet werden: file, section, option, name, parent_name, type, type_en, type_short (bool/int/str/col), type_tiny (b/i/s/c), default_value, default_value_undef, value, quoted_value, value_undef, value_changed, parent_value, min, max, description, description2, description_en, description_en2, string_values
@@ -62,14 +60,14 @@ Zeilen werden mittels evaluierten Ausdrücken dargestellt (siehe /help eval für
  - fset.format.option2: zweites Format für eine Option

 Die nachfolgenden Variablen können in den Optionen genutzt werden:
-  - Optionsdaten, mit Farbe und durch Leerzeichen auf der rechten Seite aufgefüllt:
+  - Optionsdaten, mit Farbe und  durch Leerzeichen auf der rechten Seite aufgefüllt:
    - ${file}: Konfigurationsdatei (zum Beispiel "weechat" oder "irc")
    - ${section}: Sektion
    - ${option}: Name der Option
    - ${name}: vollständiger Name der Option (file.section.option)
    - ${parent_name}: übergeordneter Name der Option
    - ${type}: Optionstyp (übersetzt)
-    - ${type_en}: Optionstyp (auf englisch)
+    - ${type_en}: Optionstyp (auf  englisch)
    - ${type_short}: Optionstyp Kurzform (bool/int/str/col)
    - ${type_tiny}: Optionstyp klein (b/i/s/c)
    - ${default_value}: Standardwert einer Option
@@ -147,7 +145,7 @@ Mausaktionen im fset Buffer:
 Hinweis: Leerzeichen am Anfang der Eingabezeile werden ignoriert und der folgende Text wird als Filter verwendet. Ein Beispiel: "q" schließt den fset Buffer wobei hingegen " q" alle Optionen anzeigt die ein "q" im Namen beinhalten.

 Beispiele:
-  zeigt alle IRC Optionen an, die verändert wurden:
+  zeigt alle IRC Optionen an die verändert wurden:
    /fset d:irc.*
  zeigt alle Optionen die "nicklist" im Namen tragen:
    /fset nicklist
@@ -393,13 +393,13 @@
 ** Standardwert: `+"/unset ${name}"+`

 * [[option_fset.format.option1]] *fset.format.option1*
-** Beschreibung: pass:none[erstes Format um Optionen anzuzeigen die weder markiert noch ausgewählt sind (Hinweis: der Inhalt ist evaluiert, siehe /help fset); eine leere Zeichenkette nutzt die Standardeinstellung ("${marked} ${name} ${type}  ${value2}"), dies findet ohne eine Evaluierung statt, was wesentlich schneller ist; zwischen den Formaten kann mittels ctrl-X umgeschaltet werden]
+** Beschreibung: pass:none[erstes Format um Optionen anzuzeigen die weder markiert noch ausgewählt sind (Hinweis: der Inhalt ist evaluiert, siehe /help fset); eine leere Zeichenkette nutzt die Standardeinstellung ("${marked} ${name}  ${type}  ${value2}"), dies findet ohne eine Evaluierung statt, was wesentlich schneller ist; zwischen den Formaten kann mittels ctrl-X umgeschaltet werden]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`

 * [[option_fset.format.option2]] *fset.format.option2*
-** Beschreibung: pass:none[zweites Format um Optionen anzuzeigen die weder markiert noch ausgewählt sind (Hinweis: der Inhalt ist evaluiert, siehe /help fset); eine leere Zeichenkette nutzt die Standardeinstellung ("${marked} ${name} ${type}  ${value2}"), dies findet ohne eine Evaluierung statt, was wesentlich schneller ist; zwischen den Formaten kann mittels ctrl-X umgeschaltet werden]
+** Beschreibung: pass:none[zweites Format um Optionen anzuzeigen die weder markiert noch ausgewählt sind (Hinweis: der Inhalt ist evaluiert, siehe /help fset); eine leere Zeichenkette nutzt die Standardeinstellung ("${marked} ${name}  ${type}  ${value2}"), dies findet ohne eine Evaluierung statt, was wesentlich schneller ist; zwischen den Formaten kann mittels ctrl-X umgeschaltet werden]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"${marked} ${name}  ${type}  ${value2}${newline}  ${empty_name}  ${_default_value}${color:darkgray} -- ${min}..${max}${newline}  ${empty_name}  ${description}"+`
@@ -411,7 +411,7 @@
 ** Standardwert: `+off+`

 * [[option_fset.look.condition_catch_set]] *fset.look.condition_catch_set*
-** Beschreibung: pass:none[Bedingung um den /set Befehl abzufangen und die Ausgabe im fset Buffer darzustellen; folgende Variablen können verwendet werden: ${name} (Name der Option die dem /set Befehl übergeben wurde), ${count} (Anzahl der Optionen die mit /set gefunden wurden); eine leere Zeichenkette deaktiviert die Funktion; der Wert "1", nutzt immer den fset Buffer für die Ausgabe des /set Befehls]
+** Beschreibung: pass:none[Bedingung um den /set Befehl abzufangen und die Ausgabe im fset Buffer darzustellen; folgende Variablen können verwendet werden:  ${name} (Name der Option die dem /set Befehl übergeben wurde), ${count} (Anzahl der Optionen die mit /set gefunden wurden); eine leere Zeichenkette deaktiviert die Funktion; der Wert "1", nutzt immer den fset Buffer für die Ausgabe des /set Befehls]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"${count} >= 1"+`
@@ -447,7 +447,7 @@
 ** Standardwert: `+off+`

 * [[option_fset.look.sort]] *fset.look.sort*
-** Beschreibung: pass:none[durch Kommata getrennte Liste von Feldern um die Optionen zu sortieren (siehe /help fset um eine Auflistung der Felder zu erhalten); wird das "-" Zeichen vor einem Feld angewendet, wird die Ausgabe umgekehrt, um bei einem Vergleich nicht zwischen Groß- und Kleinschreibung zu unterscheiden wird das Zeichen "~" verwendet; Beispiel: "-~name" sortiert die Optionsnamen in umgekehrter Reihenfolge und es wird dabei nicht zwischen Groß-und Kleinschreibung unterschieden]
+** Beschreibung: pass:none[durch Kommata getrennte Liste von Feldern um die Optionen zu sortieren (siehe /help fset um eine Auflistung der Felder zu erhalten); wird das "-" Zeichen vor einem Feld angewendet, wird die Ausgabe umgekehrt, um bei einem Vergleich nicht zwischen Groß- und Kleinschreibung zu unterscheiden wird das Zeichen  "~" verwendet; Beispiel: "-~name" sortiert die Optionsnamen in umgekehrter Reihenfolge und es wird dabei nicht zwischen Groß-und Kleinschreibung unterschieden]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"~name"+`
@@ -10,8 +10,6 @@
        load [-q] <filename>
        autoload
        reload|unload [-q] [<name>]
-        eval [-o|-oc] <code>
-        version

    list: installierte Skripten werden aufgelistet
 listfull: detaillierte Auflistung aller installierten Skripten
@@ -20,13 +18,8 @@ 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
-      -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben
    name: Name eines Skriptes (der Name der in der "register" Funktion der Skript-API genutzt wird)
-    eval: evaluiert einen Quelltext und das Ergebnis wird im aktuellen Buffer ausgegeben
-      -o: evaluierter Ergebnis wird im Buffer ausgegeben ohne das Befehle ausgeführt werden
-     -oc: evaluierter Ergebnis wird im Buffer ausgegeben und Befehle werden ausgeführt
-    code: Quelltext welcher evaluiert werden soll
- version: zeigt die Version des verwendeten Interpreters an
+      -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben

 Ohne Angabe eines Argumentes listet dieser Befehl alle geladenen Skripten auf.
 ----
@@ -1,15 +0,0 @@
-//
-// This file is auto-generated by script docgen.py.
-// DO NOT EDIT BY HAND!
-//
-* [[option_guile.look.check_license]] *guile.look.check_license*
-** Beschreibung: pass:none[Überprüft die Lizenz von Skripten, wenn sie geladen werden: Sollte die Lizenz abweichend von der Erweiterungslizenz sein, wird eine Warnung ausgegeben]
-** Typ: boolesch
-** Werte: on, off
-** Standardwert: `+off+`
-
-* [[option_guile.look.eval_keep_context]] *guile.look.eval_keep_context*
-** Beschreibung: pass:none[behält den Inhalt zwischen zwei Aufrufen bei Quellcode Evaluierung (Option "eval" des Skript-Befehls oder Info "%s_eval"); ein Hintergrundskript wird für die Evaluierung verwendet; wird diese Option deaktiviert, dann wird das Hintergrundskript nach jeder Evaluierung entfernt: das bedeutet weniger Speicherbedarf, ist aber langsamer]
-** Typ: boolesch
-** Werte: on, off
-** Standardwert: `+on+`
@@ -111,9 +111,9 @@ Ohne Angabe von Argumenten wird die Ban-Liste für den aktuellen Channel angezei

 Ohne Angaben von Argumenten werden "ls" und "list" gesendet.

-Fähigkeiten die von WeeChat unterstützt werden: account-notify, away-notify, cap-notify, chghost, extended-join, invite-notify, multi-prefix, server-time, userhost-in-names.
+Fähigkeiten die von WeeChat unterstützt werden: account-notify, away-notify, cap-notify, extended-join, multi-prefix, server-time, userhost-in-names.

-Fähigkeiten die standardmäßig genutzt werden sollen, können mit der Option  irc.server_default.capabilities gesetzt werden (oder individuell für jeden Server mit der Option irc.server.xxx.capabilities).
+Fähigkeiten die standardmäßig genutzt werden sollen können mit der Option  irc.server_default.capabilities gesetzt werden (oder individuell für jeden Server mit der Option irc.server.xxx.capabilities).

 Beispiele:
   /cap
@@ -124,7 +124,7 @@ Beispiele:
 * `+connect+`: Mit IRC-Server(n) verbinden

 ----
-/connect  [<server> [<server>...]] [-<option>[=<value>]] [-no<option>] [-nojoin] [-switch]
+/connect  <server> [<server>...] [-<option>[=<value>]] [-no<option>] [-nojoin] [-switch]
          -all|-auto|-open [-nojoin] [-switch]

    server: Name des Servers, folgende Möglichkeiten bestehen:
@@ -160,7 +160,7 @@ Beispiele:

   server: an diesen Server senden (interner Servername)
   target: Nick- oder Channelname an welchen eine CTCP-Nachricht geschickt werden soll ('*' = aktuellen Channel)
-     type: CTCP-Nachricht (Beispiele: "version", "ping", usw.)
+     type: CTCP-Nachricht (Beispiele: "version", "ping", ..)
 arguments: Argumente für CTCP

 Beispiele:
@@ -373,12 +373,12 @@ reason: Grund der Abmeldung
 ----

 [[command_irc_links]]
-* `+links+`: alle Servernamen auflisten, die dem antwortenden Server bekannt sind
+* `+links+`: alle Servernamen auflisten die dem antwortenden Server bekannt sind

 ----
-/links  [[<target>] <server_mask>]
+/links  [[<server>] <server_mask>]

-     target: dieser Remote-Server soll die Anfrage beantworten
+     server: dieser Server soll die Anfrage beantworten
 server_mask: die aufzulistenden Server sollen diesem Muster entsprechen
 ----

@@ -386,12 +386,11 @@ server_mask: die aufzulistenden Server sollen diesem Muster entsprechen
 * `+list+`: Channels mit ihrem Thema auflisten

 ----
-/list  [-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]
+/list  [<channel>[,<channel>...]] [<server>] [-re <regex>]

- server: an diesen Server senden (interner Name)
- regexp: erweiterter regulärer POSIX Ausdruck, der auf die Ausgabe angewendet werden soll (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden)
 channel: aufzulistender Channel
- target: Servername
+ server: Servername
+ regexp: erweiterter regulärer POSIX Ausdruck, der auf die Ausgabe angewendet werden soll (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden)

 Beispiele:
  listet alle Channels des Servers auf (dies kann bei großen Netzwerken sehr lange dauern):
@@ -574,10 +573,10 @@ message: Abschiedsnachricht (wird anderen Usern angezeigt)
 * `+ping+`: sendet einen Ping an den Server

 ----
-/ping  <target1> [<target2>]
+/ping  <server1> [<server2>]

-target1: Server
-target2: Ping an diesen Server weiterleiten
+server1: Server
+server2: Ping an diesen Server weiterleiten
 ----

 [[command_irc_pong]]
@@ -720,39 +719,31 @@ reason: Grund der Abmeldung
 * `+server+`: auflisten, hinzufügen oder entfernen von IRC-Servern

 ----
-/server  list|listfull [<name>]
-         add <name> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
-         copy|rename <name> <new_name>
-         reorder <name> [<name>...]
-         open <name>|-all [<name>...]
-         del|keep <name>
-         deloutq|jump
-         raw [<filter>]
+/server  list|listfull [<server>]
+         add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
+         copy|rename <server> <new_name>
+         reorder <server> [<server>...]
+         open <server>|-all [<server>...]
+         del|keep <server>
+         deloutq|jump|raw

    list: listet Server auf (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
 listfull: listet alle Server auf, mit detaillierten Informationen zu jedem einzelnen Server
     add: erstellt einen neuen Server
-    name: Servername, dient der internen Nutzung und zur Darstellung; dieser Name wird genutzt um sich mit dem Server zu verbinden (/connect name) und um die entsprechenden Optionen anzupassen: irc.server.name.xxx
-hostname: Name oder IP-Adresse des Servers. Optional kann zusätzlich der Port festgelegt werden (Standard-Port: 6667). Mehrere Adressen können durch Kommata getrennt werden
+  server: Servername, dient der internen Nutzung und zur Darstellung
+hostname: Name oder IP-Adresse des Servers. Optional kann zusätzlich der Port festgelegt werden (Standard-Port: 6667). Verschiedene Ports können durch Kommata getrennt werden
   -temp: erstellt temporären Server (wird nicht gespeichert)
  option: legt die Optionen für den Server fest (die Boolean-Optionen können weggelassen werden)
 nooption: stellt die Boolean Einstellung auf 'off' (Beispiel: -nossl)
    copy: erstellt eine Kopie des Servers
  rename: benennt den Server um
 reorder: Anordnung der Server ändern
-    open: öffnet den Serverbuffer, ohne eine Verbindung herzustellen
+    open: öffnen den Serverbuffer, ohne eine Verbindung herzustellen
    keep: übernimmt den Server in die Konfigurationsdatei (nur sinnvoll bei temporär angelegten Servern)
     del: entfernt einen Server
 deloutq: löscht bei allen Servern alle ausgehende Nachrichten, die in der Warteschlange stehen (dies betrifft alle Nachrichten die WeeChat gerade sendet)
    jump: springt zum Server-Buffer
     raw: öffnet Buffer mit Roh-IRC-Daten
-  filter: setzt einen neuen Filter um übereinstimmende Nachrichten anzuzeigen (ein Filter kann auch in der Eingabezeile im IRC Datenbuffer angelegt werden); erlaubte Formattierungen:
-            *       zeigt alle Nachrichten an (keine Filterung von Nachrichten)
-            xxx     zeigt nur Nachrichten mit "xxx" an
-            s:xxx   zeigt nur Nachrichten von Server "xxx" an
-            f:xxx   zeigt nur Nachrichten mit dem entsprechenden Flag an: recv (erhaltene Nachricht), sent (gesendete Nachricht), modified (Nachricht welche modifiziert wurde), redirected (umgeleitete Nachricht)
-            m:xxx   zeigt nur IRC Befehl "xxx" an
-            c:xxx   zeigt nur Nachrichten an auf die die evaluierte Bedingung "xxx" zutrifft, folgende Variable können verwendet werden: Ausgabe der Funktion irc_message_parse (wie nick, command, channel, text, etc., siehe Funktion info_get_hashtable in der Anleitung für API Erweiterung für eine Liste aller möglichen Variablen), date (Format: "yyyy-mm-dd hh:mm:ss"), server, recv, sent, modified, redirected

 Beispiele:
  /server listfull
@@ -764,9 +755,6 @@ Beispiele:
  /server reorder freenode2 freenode
  /server del freenode
  /server deloutq
-  /server raw
-  /server raw s:freenode
-  /server raw c:${recv} && ${command}==PRIVMSG && ${nick}==foo
 ----

 [[command_irc_service]]
@@ -803,9 +791,9 @@ service: Name des Service
 * `+squit+`: Verbindung zum Server trennen

 ----
-/squit  <target> <comment>
+/squit  <server> <comment>

- target: Name des Servers
+ server: Name des Servers
 comment: Kommentar
 ----

@@ -813,10 +801,10 @@ comment: Kommentar
 * `+stats+`: Serverstatistik abfragen

 ----
-/stats  [<query> [<target>]]
+/stats  [<query> [<server>]]

 query: c/h/i/k/l/m/o/y/u (siehe RFC1459)
-target: Name des Servers
+server: Name des Servers
 ----

 [[command_irc_summon]]
@@ -863,22 +851,20 @@ target: Servername
 * `+unban+`: Bann von Nicks oder Hosts aufheben

 ----
-/unban  [<channel>] <nick>|<number> [<nick>|<number>...]
+/unban  [<channel>] <nick> [<nick>...]

 channel: Name des Channel
   nick: Nick oder Host
- number: ban Nummer (wird beim Befehl /ban angezeigt)
 ----

 [[command_irc_unquiet]]
 * `+unquiet+`: Nicks oder Hosts das Wort erteilen

 ----
-/unquiet  [<channel>] <nick>|<number> [<nick>|<number>...]
+/unquiet  [<channel>] <nick> [<nick>...]

 channel: Name des Channel
   nick: Nick oder Host
- number: Quiet-Nummer (wird beim Befehl /quiet angezeigt)
 ----

 [[command_irc_userhost]]
@@ -903,9 +889,9 @@ target: Servername
 * `+version+`: Versionsinformation des Nicknamen oder Servers ermitteln (des aktuellen oder angegebenen Nick/Server)

 ----
-/version  [<target>|<nick>]
+/version  [<server>|<nick>]

-target: Servername
+server: Servername
  nick: Nickname
 ----

@@ -952,12 +938,12 @@ mask: nur Information über betreffende Nicknamen abfragen
 * `+whois+`: Information über User abfragen

 ----
-/whois  [<target>] [<nick>[,<nick>...]]
+/whois  [<server>] [<nick>[,<nick>...]]

-target: Name des Servers (interner Servername)
+server: Name des Servers (interner Servername)
  nick: Nick, welcher abgefragt werden soll (es kann auch eine Maske genutzt werden)

-Ohne Angabe von Argumenten, nutzt /whois folgende Regel:
+Ohne Angabe von Argumenten, nutzt /whois folgende Nicks:
 - den eigenen Nick, falls es sich um einen Server/Channel Buffer handelt
 - den Nick des Gesprächspartners, falls es sich um einen privaten Buffer handelt.

@@ -32,24 +32,12 @@
 ** 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: `+default+`

-* [[option_irc.color.message_chghost]] *irc.color.message_chghost*
-** Beschreibung: pass:none[Textfarbe in der chghost Nachrichten dargestellt 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: `+brown+`
-
 * [[option_irc.color.message_join]] *irc.color.message_join*
 ** Beschreibung: pass:none[Textfarbe in der die Meldungen für das Betreten eines Channels angezeigt werden soll]
 ** 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: `+green+`

-* [[option_irc.color.message_kick]] *irc.color.message_kick*
-** Beschreibung: pass:none[Textfarbe in der die Meldungen für kick/kill Nachrichten angezeigt werden soll]
-** 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: `+red+`
-
 * [[option_irc.color.message_quit]] *irc.color.message_quit*
 ** Beschreibung: pass:none[Textfarbe in der die Meldungen für das Verlassen/Beenden eines Channels angezeigt werden soll]
 ** Typ: Farbe
@@ -57,7 +45,7 @@
 ** Standardwert: `+red+`

 * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap*
-** Beschreibung: pass:none[ersetzt mirc Farben in Nachrichten mittels einer Hashtabelle: Schlüssel sind "fg,bg" als Ganzzahl zwischen -1 (nicht näher bezeichnet) und 15. Als Wert ist der Farbname oder die Farbnummer von WeeChat möglich (Format: "1,-1:Farbe1;2,7:Farbe2"), Beispiel: "1,-1:darkgray;1,2:white,blue" ersetzt schwarz durch "darkgray" und schwarz auf blau durch "white,blue"; Tabelle der Standard-IRC-Farben von WeeChat (in Klammern der Farbname, wie er von WeeChat genutzt wird): 0=weiß (white), 1=schwarz (black), 2=blau (blue), 3=grün (green), 4=hellrot (lightred), 5=rot (red), 6=violett (magenta), 7=braun (brown), 8=gelb (yellow), 9= hell-grün (lightgreen), 10=türkis (cyan), 11=hell-türkis (lightcyan), 12=hellblau (lightblue), 13=hell-violett (lightmagenta), 14=dunkel-grau (darkgray), 15=grau (gray)]
+** Beschreibung: pass:none[ersetzt mirc Farben in Nachrichten mittels einer Hashtabelle: Schlüssel sind "fg,bg" als Ganzzahl zwischen -1 (nicht näher bezeichnet) und 15. Als Wert ist der Farbname oder die Farbnummer von WeeChat möglich (Format: "1,-1:Farbe1;2,7:Farbe2"), Beispiel: "1,-1:darkgray;1,2:white,blue" ersetzt schwarz durch "darkgray" und schwarz auf blau durch "white,blue"; Tabelle der Standard-IRC-Farben von WeeChat (in Klammern der Farbname, wie er von WeeChat genutzt wird): 0=weiß (white), 1=schwarz (black), 2=blau (blue), 3=grün (green), 4=hellrot (lightred), 5=rot (red), 6=violett (magenta), 7=braun (brown), 8=gelb (yellow), 9= hell-grün (lightgreen), 10=türkis (cyan), 11=hell-türkis (lightcyan), 12=hellblau (lightblue), 13=hell-violett (lightmagenta), 14=grau (gray), 15=weiß (white)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"1,-1:darkgray"+`
@@ -74,12 +62,6 @@
 ** 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: `+green+`

-* [[option_irc.color.reason_kick]] *irc.color.reason_kick*
-** Beschreibung: pass:none[Textfarbe in der die Begründung einer kick/kill Nachricht angezeigt werden soll]
-** 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: `+default+`
-
 * [[option_irc.color.reason_quit]] *irc.color.reason_quit*
 ** Beschreibung: pass:none[Textfarbe in der die Begründung einer part/quit Nachricht angezeigt werden soll]
 ** Typ: Farbe
@@ -224,12 +206,6 @@
 ** Werte: on, off
 ** Standardwert: `+on+`

-* [[option_irc.look.display_pv_warning_address]] *irc.look.display_pv_warning_address*
-** Beschreibung: pass:none[zeigt eine Warnung in einem privaten Buffer an, sobald sich die Adresse eines Remote-Nick geändert hat; diese Option ist standardmäßig ausgeschaltet, da Server wie bitlbee eine solche Warnung unvermittelt auslösen (die Adresse des Remote-Nick ändert sich während eines Login mehrfach)]
-** Typ: boolesch
-** Werte: on, off
-** Standardwert: `+off+`
-
 * [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
 ** Beschreibung: pass:none[durch Kommata getrennte Liste von Wörtern die in Channel-Buffern als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; des Weiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Wird ein Buffer geöffnet, dann werden die angegeben Wörter dem Buffer-Merkmal "highlight_words" hinzugefügt. Dies bedeutet, dass diese Einstellung keinen direkten Einfluss auf schon geöffnete Buffer hat. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"]
 ** Typ: Zeichenkette
@@ -381,19 +357,13 @@
 ** Standardwert: `+256+`

 * [[option_irc.look.server_buffer]] *irc.look.server_buffer*
-** Beschreibung: pass:none[fügt Serverbuffer zusammen; diese Option hat keine Auswirkung wenn ein Layout genutzt wird und mit dieser Option im Widerspruch steht (siehe /help layout)]
+** Beschreibung: pass:none[Server-Buffer zusammenfügen]
 ** Typ: integer
 ** Werte: merge_with_core, merge_without_core, independent
 ** Standardwert: `+merge_with_core+`

 * [[option_irc.look.smart_filter]] *irc.look.smart_filter*
-** Beschreibung: pass:none[filtert join/part/quit/nick Nachrichten für einen Nick der einige Minuten im Channel inaktiv gewesen ist (dazu muss ein Filter mit dem Schlagwort "irc_smart_filter" erstellt werden, siehe /help filter)]
-** Typ: boolesch
-** Werte: on, off
-** Standardwert: `+on+`
-
-* [[option_irc.look.smart_filter_chghost]] *irc.look.smart_filter_chghost*
-** Beschreibung: pass:none[aktiviert einen intelligenten Filter für "chghost" Nachrichten]
+** Beschreibung: pass:none[filtert join/part/quit/nick Nachrichten für einen Nick der einige Minuten im Channel inaktiv gewesen ist. Dazu muss ein Filter mit dem Schlagwort "irc_smart_filter" erstellt werden]
 ** Typ: boolesch
 ** Werte: on, off
 ** Standardwert: `+on+`
@@ -447,7 +417,7 @@
 ** Standardwert: `+off+`

 * [[option_irc.network.autoreconnect_delay_growing]] *irc.network.autoreconnect_delay_growing*
-** Beschreibung: pass:none[Multiplikator für die Verzögerung bei der automatischen Wiederverbindung zum Server (1 = immer die selbe Verzögerung nutzen, 2 = Verzögerung*2 für jeden weiteren Versuch, usw.)]
+** Beschreibung: pass:none[Multiplikator für die Verzögerung bei der automatischen Wiederverbindung zum Server (1 = immer die selbe Verzögerung nutzen, 2 = Verzögerung*2 für jeden weiteren Versuch, ..)]
 ** Typ: integer
 ** Werte: 1 .. 100
 ** Standardwert: `+2+`
@@ -464,6 +434,12 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"*!$ident@$host"+`

+* [[option_irc.network.channel_encode]] *irc.network.channel_encode*
+** Beschreibung: pass:none[dekodieren/kodieren von Channelnamen innerhalb einer Nachricht mittels Charset-Optionen; es wird empfohlen diese Option deaktiviert zu lassen sofern man ausschließlich UTF-8 in Channelnamen verwendet. Diese Option sollte nur dann verwendet werden, sofern man exotische Zeichensätze wie ISO für Channelnamen nutzt]
+** Typ: boolesch
+** Werte: on, off
+** Standardwert: `+off+`
+
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
 ** Beschreibung: pass:none[wenn deaktiviert, werden Farben-Codes von eingehenden Nachrichten ignoriert]
 ** Typ: boolesch
@@ -537,7 +513,7 @@
 ** Standardwert: `+off+`

 * [[option_irc.server_default.addresses]] *irc.server_default.addresses*
-** Beschreibung: pass:none[Liste von Hostname/Port oder IP/Port für Server (durch Komma getrennt) (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
+** Beschreibung: pass:none[Liste von Hostname/Port oder IP/Port für Server (durch Komma getrennt) (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
@@ -555,13 +531,13 @@
 ** Standardwert: `+2+`

 * [[option_irc.server_default.autoconnect]] *irc.server_default.autoconnect*
-** Beschreibung: pass:none[Beim Programmstart von WeeChat automatisch mit dem Server verbinden]
+** Beschreibung: pass:none[Beim Programmstart von Weechat automatisch mit dem Server verbinden]
 ** Typ: boolesch
 ** Werte: on, off
 ** Standardwert: `+off+`

 * [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** Beschreibung: pass:none[durch Kommata getrennte Liste von Channels, die beim Verbinden mit dem Server automatisch betreten werden (nachdem die Einstellungen command + delay ausgeführt wurden). Channels die einen Schlüssel benötigen müssen in der Auflistung als erstes aufgeführt werden. Die Schlüssel, zu den jeweiligen Channels, werden nach den Channels aufgeführt (eine Trennung von Channels und Schlüssel erfolgt mittels einem Leerzeichen. Schlüssel werden untereinander auch durch Kommata voneinander getrennt) (Beispiel: "#channel1,#channel2,#channnel3 key1,key2", #channel1 und #channel2 sind durch jeweils einen Schlüssel, key1 und key2, geschützt) (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
+** Beschreibung: pass:none[durch Kommata getrennte Liste von Channels, die beim Verbinden mit dem Server automatisch betreten werden (nachdem die Einstellungen command + delay ausgeführt wurden). Channels die einen Schlüssel benötigen müssen in der Auflistung als erstes aufgeführt werden. Die Schlüssel, zu den jeweiligen Channels, werden nach den Channels aufgeführt (eine Trennung von Channels und Schlüssel erfolgt mittels einem Leerzeichen. Schlüssel werden untereinander auch durch Kommata voneinander getrennt) (Beispiel: "#channel1,#channel2,#channnel3 key1,key2", #channel1 und #channel2 sind durch jeweils einen Schlüssel, key1 und key2, geschützt) (Hinweis: Inhalt wird evaluiert, siehe /help eval)"]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
@@ -608,14 +584,8 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`

-* [[option_irc.server_default.charset_message]] *irc.server_default.charset_message*
-** Beschreibung: pass:none[Teil der IRC Nachricht (empfangen oder gesendet) die zum Zielzeichensatz dekodiert/kodiert werden soll; message = die komplette IRC Nachricht (Standard), channel = beginnend mit dem Channel-Namen (sofern dieser gefunden wird, ansonsten Fallback auf text), text = beginnend mit dem Nachrichtentext (dieser Wert sollte ausprobiert werden, falls es Probleme bei der Kodierung des Channel-Namen geben sollte)]
-** Typ: integer
-** Werte: message, channel, text
-** Standardwert: `+message+`
-
 * [[option_irc.server_default.command]] *irc.server_default.command*
-** Beschreibung: pass:none[Befehl(e) welche nach einem Verbindungsaufbau zum Server und vor dem automatischem Betreten von Channels ausgeführt werden sollen (mehrere Befehle müssen durch ";" getrennt werden, soll ein Semikolon genutzt werden, schreibt man "\;", die Platzhalter $nick,$channel und $server werden durch den entsprechenden Wert ersetzt) (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
+** Beschreibung: pass:none[enthält Befehle die, nach einer Verbindung zum Server und bevor Channels betreten werden, ausgeführt werden sollen. Mehrere Befehle müssen durch ein ";" getrennt werden. Möchte man ein Semikolon nutzen muss man "\;" verwenden. Die speziellen Variablen $nick, $channel und $server werden dabei durch den jeweiligen Wert ersetzt (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
@@ -663,7 +633,7 @@
 ** Standardwert: `+"WeeChat ${info:version}"+`

 * [[option_irc.server_default.nicks]] *irc.server_default.nicks*
-** Beschreibung: pass:none[Nicknamen, die auf dem IRC-Server benutzt werden sollen (durch Kommatagetrennt) (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
+** Beschreibung: pass:none[Nicknamen, die auf dem IRC-Server benutzt werden sollen (durch Komma getrennt) (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
@@ -681,7 +651,7 @@
 ** Standardwert: `+""+`

 * [[option_irc.server_default.password]] *irc.server_default.password*
-** Beschreibung: pass:none[Passwort welches für den Server genutzt werden soll (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
+** Beschreibung: pass:none[Passwort für Server (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
@@ -693,7 +663,7 @@
 ** Standardwert: `+""+`

 * [[option_irc.server_default.realname]] *irc.server_default.realname*
-** Beschreibung: pass:none[Realname welcher für den Server genutzt werden soll (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
+** Beschreibung: pass:none[Realname der auf dem Server genutzt werden soll (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
@@ -717,7 +687,7 @@
 ** Standardwert: `+plain+`

 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
-** Beschreibung: pass:none[Passwort für SASL Authentifikation; diese Option findet keine Anwendung falls der Mechanismus "ecdsa-nist256p-challenge" und "external" verwendet wird (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
+** Beschreibung: pass:none[Passwort für SASL Authentifikation; diese Option findet keine Anwendung falls der Mechanismus "ecdsa-nist256p-challenge" und "external" verwendet wird (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
@@ -729,17 +699,11 @@
 ** Standardwert: `+15+`

 * [[option_irc.server_default.sasl_username]] *irc.server_default.sasl_username*
-** Beschreibung: pass:none[Username für SASL Authentifikation; diese Option wird nicht für den Mechanismus "external" verwendet (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
+** Beschreibung: pass:none[Username für SASL Authentifikation; diese Option wird nicht für den Mechanismus "external" verwendet (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`

-* [[option_irc.server_default.split_msg_max_length]] *irc.server_default.split_msg_max_length*
-** Beschreibung: pass:none[ausgehende IRC Nachrichten werden bei der angegebene Anzahl an Zeichen getrennt; der Standardwert beträgt 512, dabei handelt es sich um einen empfohlenen Wert; ein Wert von 0 deaktiviert eine Trennung von Nachrichten (dies wird nicht empfohlen, außer Du weißt was Du tust); erlaubte Werte sind 0 oder jeder Wert zwischen 128 und 4096; diese Option sollte nur bei nicht-Standard IRC Servern verändert werden, zum Beispiel ein bitlbee Gateway]
-** Typ: integer
-** Werte: 0 .. 4096
-** Standardwert: `+512+`
-
 * [[option_irc.server_default.ssl]] *irc.server_default.ssl*
 ** Beschreibung: pass:none[Server über SSL ansprechen]
 ** Typ: boolesch
@@ -759,13 +723,7 @@
 ** Standardwert: `+2048+`

 * [[option_irc.server_default.ssl_fingerprint]] *irc.server_default.ssl_fingerprint*
-** Beschreibung: pass:none[Fingerprint des Zertifikates welches als vertrauenswürdig eingestuft und für diesen Server akzeptiert wird; es sind nur hexadezimale Zeichen erlaubt (0-9, a-f): bei SHA-512 ist das Zertifikat 128 Zeichen lang, bei SHA-256 sind es 64 Zeichen, bei SHA-1 sind es 40 Zeichen (nicht empfohlen, da unsicher); mehrere Fingerprints können durch Kommata voneinander getrennt werden; wird diese Option genutzt, findet KEINE weitere Überprüfung der Zertifikate statt (Option "ssl_verify") (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
-** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette
-** Standardwert: `+""+`
-
-* [[option_irc.server_default.ssl_password]] *irc.server_default.ssl_password*
-** Beschreibung: pass:none[Passwort für SSL Zertifikat des privaten Schlüssels (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
+** Beschreibung: pass:none[Fingerprint des Zertifikates welches als vertrauenswürdig eingestuft und für diesen Server akzeptiert wird; es sind nur hexadezimale Zeichen erlaubt (0-9, a-f): bei SHA-512 ist das Zertifikat 64 Zeichen lang, bei SHA-256 sind es 32 Zeichen, bei SHA-1 sind es 20 Zeichen (nicht empfohlen, da unsicher); mehrere Fingerprints können durch Kommata voneinander getrennt werden; wird diese Option genutzt, findet KEINE weitere Überprüfung der Zertifikate statt (Option "ssl_verify") (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
@@ -783,13 +741,13 @@
 ** Standardwert: `+on+`

 * [[option_irc.server_default.usermode]] *irc.server_default.usermode*
-** Beschreibung: pass:none[Usermode(s) der direkt nach der Verbindung zum Server gesetzt werden soll. Dies geschieht bevor Befehle für den Server ausgeführt und bevor Channels automatisch betreten werden; Beispiele: "+R" (um den Modus "R" zu setzen), "+R-i" (setzt den Modus "R" und entfernt den Modus "i"); siehe /help mode um den Befehlssatz angezeigt zu bekommen (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
+** Beschreibung: pass:none[Usermode der direkt nach der Verbindung zum Server gesetzt werden soll. Dies geschieht bevor Befehle für den Server ausgeführt und bevor Channels automatisch betreten werden; Beispiele: "+R" (um den Modus "R" zu setzen), "+R-i" (setzt den Modus "R" und entfernt den Modus "i"); siehe /help mode um den Befehlssatz angezeigt zu bekommen (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`

 * [[option_irc.server_default.username]] *irc.server_default.username*
-** Beschreibung: pass:none[Username welcher für den Server genutzt werden soll (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
+** Beschreibung: pass:none[Username der auf dem Server genutzt werden soll (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
@@ -10,8 +10,6 @@
             load [-q] <filename>
             autoload
             reload|unload [-q] [<name>]
-             eval [-o|-oc] <code>
-             version

    list: installierte Skripten werden aufgelistet
 listfull: detaillierte Auflistung aller installierten Skripten
@@ -20,13 +18,8 @@ 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
-      -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben
    name: Name eines Skriptes (der Name der in der "register" Funktion der Skript-API genutzt wird)
-    eval: evaluiert einen Quelltext und das Ergebnis wird im aktuellen Buffer ausgegeben
-      -o: evaluierter Ergebnis wird im Buffer ausgegeben ohne das Befehle ausgeführt werden
-     -oc: evaluierter Ergebnis wird im Buffer ausgegeben und Befehle werden ausgeführt
-    code: Quelltext welcher evaluiert werden soll
- version: zeigt die Version des verwendeten Interpreters an
+      -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben

 Ohne Angabe eines Argumentes listet dieser Befehl alle geladenen Skripten auf.
 ----
@@ -1,15 +0,0 @@
-//
-// This file is auto-generated by script docgen.py.
-// DO NOT EDIT BY HAND!
-//
-* [[option_javascript.look.check_license]] *javascript.look.check_license*
-** Beschreibung: pass:none[Überprüft die Lizenz von Skripten, wenn sie geladen werden: Sollte die Lizenz abweichend von der Erweiterungslizenz sein, wird eine Warnung ausgegeben]
-** Typ: boolesch
-** Werte: on, off
-** Standardwert: `+off+`
-
-* [[option_javascript.look.eval_keep_context]] *javascript.look.eval_keep_context*
-** Beschreibung: pass:none[behält den Inhalt zwischen zwei Aufrufen bei Quellcode Evaluierung (Option "eval" des Skript-Befehls oder Info "%s_eval"); ein Hintergrundskript wird für die Evaluierung verwendet; wird diese Option deaktiviert, dann wird das Hintergrundskript nach jeder Evaluierung entfernt: das bedeutet weniger Speicherbedarf, ist aber langsamer]
-** Typ: boolesch
-** Werte: on, off
-** Standardwert: `+on+`
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sébastien Helleu	331dac14c3	Version 2.0.2-dev	2017-12-20 22:19:57 +01:00
Sébastien Helleu	76d398538d	Version 2.0.1	2017-12-20 22:03:06 +01:00
Sébastien Helleu	938599d9f7	core: add version 2.0.1 in release notes	2017-12-09 16:26:57 +01:00
Sébastien Helleu	c73b944629	python: fix integer arguments in hook_connect() and hook_fd() callbacks (cherry picked from commit `515334e53b`)	2017-12-09 16:00:20 +01:00
Sébastien Helleu	40f624d8d5	fset: fix typos in French translation of /help fset (cherry picked from commit `6db7035870`)	2017-12-09 15:59:01 +01:00