Permalink
Browse files

Merge branch 'master' into guns

Conflicts:
	src/core/wee-hook.h
	src/plugins/plugin.c
  • Loading branch information...
guns committed Nov 9, 2011
2 parents 52909a8 + 538e825 commit a05a1e77fbd2f5814d438a13d1ad9e7b2f10e27e
Showing 328 changed files with 31,019 additions and 31,013 deletions.
View
@@ -33,7 +33,7 @@ ENDIF(PREFIX)
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "6-dev")
+SET(VERSION_PATCH "7-dev")
SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
SET(LICENSE "GPL3")
SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -59,29 +59,39 @@ ELSE(DEFINED INCLUDEDIR)
SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
ENDIF(DEFINED INCLUDEDIR)
-OPTION(ENABLE_NCURSES "Enable Ncurses interface" ON)
-OPTION(ENABLE_GTK "Enable GTK interface" OFF)
-OPTION(ENABLE_NLS "Enable Native Language Support" ON)
-OPTION(ENABLE_GCRYPT "Enable libgcrypt support" ON)
-OPTION(ENABLE_GNUTLS "Enable SSLv3/TLS support" ON)
-OPTION(ENABLE_LARGEFILE "Enable Large File Support" ON)
-OPTION(ENABLE_ALIAS "Enable Alias plugin" ON)
-OPTION(ENABLE_ASPELL "Enable Aspell plugin" ON)
-OPTION(ENABLE_CHARSET "Enable Charset plugin" ON)
-OPTION(ENABLE_DEMO "Enable Demo plugin" OFF)
-OPTION(ENABLE_FIFO "Enable FIFO plugin" ON)
-OPTION(ENABLE_IRC "Enable IRC plugin" ON)
-OPTION(ENABLE_LOGGER "Enable Logger plugin" ON)
-OPTION(ENABLE_RELAY "Enable Relay plugin" ON)
-OPTION(ENABLE_RMODIFIER "Enable Rmodifier plugin" ON)
-OPTION(ENABLE_SCRIPTS "Enable script plugins" ON)
-OPTION(ENABLE_PERL "Enable Perl scripting language" ON)
-OPTION(ENABLE_PYTHON "Enable Python scripting language" ON)
-OPTION(ENABLE_RUBY "Enable Ruby scripting language" ON)
-OPTION(ENABLE_LUA "Enable Lua scripting language" ON)
-OPTION(ENABLE_TCL "Enable Tcl scripting language" ON)
-OPTION(ENABLE_XFER "Enable Xfer plugin" ON)
-OPTION(ENABLE_DOC "Enable Documentation" ON)
+OPTION(ENABLE_NCURSES "Enable Ncurses interface" ON)
+OPTION(ENABLE_GTK "Enable GTK interface" OFF)
+OPTION(ENABLE_NLS "Enable Native Language Support" ON)
+OPTION(ENABLE_GCRYPT "Enable libgcrypt support" ON)
+OPTION(ENABLE_GNUTLS "Enable SSLv3/TLS support" ON)
+OPTION(ENABLE_LARGEFILE "Enable Large File Support" ON)
+OPTION(ENABLE_ALIAS "Enable Alias plugin" ON)
+OPTION(ENABLE_ASPELL "Enable Aspell plugin" ON)
+OPTION(ENABLE_CHARSET "Enable Charset plugin" ON)
+OPTION(ENABLE_DEMO "Enable Demo plugin" OFF)
+OPTION(ENABLE_FIFO "Enable FIFO plugin" ON)
+OPTION(ENABLE_IRC "Enable IRC plugin" ON)
+OPTION(ENABLE_LOGGER "Enable Logger plugin" ON)
+OPTION(ENABLE_RELAY "Enable Relay plugin" ON)
+OPTION(ENABLE_RMODIFIER "Enable Rmodifier plugin" ON)
+OPTION(ENABLE_SCRIPTS "Enable script plugins" ON)
+OPTION(ENABLE_PERL "Enable Perl scripting language" ON)
+OPTION(ENABLE_PYTHON "Enable Python scripting language" ON)
+OPTION(ENABLE_RUBY "Enable Ruby scripting language" ON)
+OPTION(ENABLE_LUA "Enable Lua scripting language" ON)
+OPTION(ENABLE_TCL "Enable Tcl scripting language" ON)
+OPTION(ENABLE_GUILE "Enable Scheme (guile) scripting language" ON)
+OPTION(ENABLE_XFER "Enable Xfer plugin" ON)
+OPTION(ENABLE_DOC "Enable Documentation" ON)
+
+IF(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
+ SET(WEECHAT_HOME "~/.weechat")
+ENDIF(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
+
+SET(WEECHAT_HOME "${WEECHAT_HOME}" CACHE
+ STRING "WeeChat home directory for config, logs, scripts.. (default is \"~/.weechat\")"
+ FORCE)
+MARK_AS_ADVANCED(CLEAR WEECHAT_HOME)
IF(ENABLE_NLS)
ADD_SUBDIRECTORY( po )
View
@@ -1,12 +1,52 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
-v0.3.6-dev, 2011-09-30
+v0.3.7-dev, 2011-11-08
-Version 0.3.6 (under dev!)
+Version 0.3.7 (under dev!)
--------------------------
+* core: add option "jump_last_buffer_displayed" for command /input
+ (key: alt+"/") (task #11553)
+* core: display error in command /buffer if arguments are wrong (bug #34180)
+* core: add developer's guide (task #5416)
+* core: add option weechat.history.max_buffer_lines_minutes: maximum number of
+ minutes in history per buffer (task #10900), rename option
+ weechat.history.max_lines to weechat.history.max_buffer_lines_number
+* core: fix help on plugin option when config_set_desc_plugin is called to set
+ help on newly created option
+* core: add WEECHAT_HOME option in cmake and configure to setup default
+ WeeChat home (default is "~/.weechat") (task #11266)
+* core: add optional arguments for command /plugin load/reload/autoload
+* core: fix compilation error with "pid_t" on Mac OS X (bug #34639)
+* core: enable background process under Cygwin to connect to servers, fix
+ reconnection problem (bug #34626)
+* irc: display channel voice notices received in channel buffer (bug #34762),
+ display channel/op notices sent in channel buffer
+* irc: add option irc.color.mirc_remap to remap mirc colors in messages to
+ WeeChat colors
+* irc: allow URL "irc://" in command /connect
+* irc: auto-connect to servers created with "irc://" on command line but not
+ other servers if "-a" ("--no-connect") is given
+* guile: new script plugin for scheme (task #7289)
+* ruby: fix crash when reloading ruby plugin (bug #34474)
+
+Version 0.3.6 (2011-10-22)
+--------------------------
+
+* core: fix freeze when calling function util_file_get_content with a directory
+ instead of a filename
+* core: add color attribute "|" (keep attributes) and value "resetcolor" for
+ function weechat_color in plugin API (used by irc plugin to keep
+ bold/reverse/underlined in message when changing color) (bug #34550)
+* core: fix compilation error (INSTALLPREFIX undeclared) on OS X and when
+ compiling with included gettext (bug #26690)
+* core: display timeout for hook_process command only if debug for core is
+ enabled (task #11401)
+* core: bufferize lines displayed before core buffer is created, to display them
+ in buffer when it is created
+* core: fix display of background color in chat area after line feed
* core: fix paste detection (problem with end of lines)
* core: add new option weechat.look.color_basic_force_bold, off by default: bold
is used only if terminal has less than 16 colors (patch #7621)
@@ -51,7 +91,7 @@ Version 0.3.6 (under dev!)
* core: add support of mouse: new command /mouse, new key context "mouse",
new options weechat.look.mouse and weechat.look.mouse_timer_delay (task #5435)
* core: add command /cursor (free movement of cursor on screen), with key
- context "search"
+ context "cursor"
* core: automatic scroll direction in /bar scroll (x/y is now optional)
* core: add optional delay for key grab (commands /input grab_key and
/input grab_key_command, default is 500 milliseconds)
@@ -86,6 +126,9 @@ Version 0.3.6 (under dev!)
description for option when function is called)
* scripts: fix crash with scripts not auto-loaded having a buffer opened after
/upgrade (input/close callbacks for buffer not set properly)
+* irc: fix display of items "away" and "lag" in root bars, refresh all irc bar
+ items on signal "buffer_switch" (bug #34466)
+* irc: fix crash on malformed irc notice received (without message after target)
* irc: add missing messages for whois: 223, 264, 343
* irc: use high priority queue for sending modes and wallchops messages
* irc: allow reason for command /disconnect
View
@@ -43,6 +43,7 @@ EXTRA_DIST = CMakeLists.txt \
cmake/FindRuby.cmake \
cmake/FindSourcehighlight.cmake \
cmake/FindTCL.cmake \
+ cmake/FindGuile.cmake \
cmake/makedist.sh.in \
po/CMakeLists.txt \
po/srcfiles.cmake \
View
10 NEWS
@@ -1,10 +1,16 @@
WeeChat News
============
Sébastien Helleu <flashcode@flashtux.org>
-v0.3.6-dev, 2011-09-29
+v0.3.7-dev, 2011-11-05
-Version 0.3.6 (under dev!)
+Version 0.3.7 (under dev!)
+--------------------------
+
+* option 'weechat.history.max_lines' has been renamed to
+ 'weechat.history.max_buffer_lines_number'
+
+Version 0.3.6 (2011-10-22)
--------------------------
Important release notes:
View
9 README
@@ -11,18 +11,13 @@ Features
--------
* chat client with multi-protocols/servers connection
-* many GUI (curses, Gtk, Qt) (1)
* small, fast and very light
-* customizable and extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl)
+* customizable and extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl, Guile)
* compliant with IRC RFCs 1459, 2810, 2811, 2812 and 2813
* developed from scratch
-* multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other) (2)
+* multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other)
* free software, released under GPLv3
-NOTE: (1) only Curses interface is available today
- +
- (2) Windows version is under construction
-
Copyright
---------
View
@@ -35,11 +35,11 @@ IF(ASCIIDOC_EXECUTABLE)
COMMAND ${ASCIIDOC_EXECUTABLE} --version
OUTPUT_VARIABLE ASCIIDOC_VERSION
)
-
+
IF(${ASCIIDOC_VERSION} MATCHES "asciidoc 8.*")
SET(ASCIIDOC_FOUND TRUE)
ENDIF(${ASCIIDOC_VERSION} MATCHES "asciidoc 8.*")
-
+
MARK_AS_ADVANCED(
ASCIIDOC_EXECUTABLE
)
View
@@ -36,11 +36,11 @@ IF(LIBGCRYPT_CONFIG_EXECUTABLE)
EXEC_PROGRAM(${LIBGCRYPT_CONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS)
EXEC_PROGRAM(${LIBGCRYPT_CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS)
-
+
IF(${GCRYPT_CFLAGS} MATCHES "\n")
SET(GCRYPT_CFLAGS " ")
ENDIF(${GCRYPT_CFLAGS} MATCHES "\n")
-
+
IF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
SET(GCRYPT_FOUND TRUE)
ENDIF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
View
@@ -63,7 +63,7 @@ IF(HAVE_LIBINTL_H)
ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-
+
IF(LIBINTL_HAS_DGETTEXT)
SET(GETTEXT_FOUND TRUE)
ENDIF(LIBINTL_HAS_DGETTEXT)
View
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2011 Sebastien Helleu <flashcode@flashtux.org>
+#
+# This file is part of WeeChat, the extensible chat client.
+#
+# WeeChat is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# WeeChat is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with WeeChat. If not, see <http://www.gnu.org/licenses/>.
+#
+
+# - Find Guile
+# This module finds if Guile is installed and determines where the include files
+# and libraries are. It also determines what the name of the library is. This
+# code sets the following variables:
+#
+# GUILE_FOUND = Guile is installed
+# GUILE_INCLUDE_DIRS = Guile include directory
+# GUILE_LIBRARIES = Link options to compile Guile
+
+IF(GUILE_FOUND)
+ # Already in cache, be silent
+ SET(GUILE_FIND_QUIETLY TRUE)
+ENDIF(GUILE_FOUND)
+
+FIND_PATH(GUILE_INCLUDE_DIR libguile.h /usr/include /usr/local/include /usr/include/libguile /usr/local/include/libguile)
+
+FIND_LIBRARY(GUILE_LIBRARY NAMES guile PATH /usr/lib /usr/local/lib)
+
+IF(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
+ SET(GUILE_FOUND TRUE)
+ SET(GUILE_INCLUDE_DIRS ${GUILE_INCLUDE_DIR})
+ SET(GUILE_LIBRARIES ${GUILE_LIBRARY})
+ELSE(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
+ SET(GUILE_FOUND FALSE)
+ SET(GUILE_INCLUDE_DIRS)
+ SET(GUILE_LIBRARIES)
+ENDIF(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
+
+MARK_AS_ADVANCED(
+ GUILE_INCLUDE_DIR
+ GUILE_LIBRARY
+ )
View
@@ -54,12 +54,12 @@ IF(PERL_EXECUTABLE)
COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ldopts
OUTPUT_VARIABLE PERL_LFLAGS
)
-
+
# remove the new lines from the output by replacing them with empty strings
STRING(REPLACE "\n" "" PERL_INTERNAL_DIR "${PERL_INTERNAL_DIR}")
STRING(REPLACE "\n" "" PERL_CFLAGS "${PERL_CFLAGS}")
STRING(REPLACE "\n" "" PERL_LFLAGS "${PERL_LFLAGS}")
-
+
FIND_PATH(PERL_INCLUDE_PATH
NAMES perl.h
PATHS ${PERL_INTERNAL_DIR}
@@ -69,11 +69,11 @@ IF(PERL_EXECUTABLE)
NAMES perl
PATHS /usr/lib /usr/local/lib /usr/pkg/lib ${PERL_INTERNAL_DIR}
)
-
+
IF(PERL_LIBRARY AND PERL_INCLUDE_PATH)
SET(PERL_FOUND TRUE)
ENDIF(PERL_LIBRARY AND PERL_INCLUDE_PATH)
-
+
MARK_AS_ADVANCED(
PERL_EXECUTABLE
PERL_INCLUDE_PATH
View
@@ -151,7 +151,7 @@ endmacro(_pkgconfig_invoke_dyn)
# Splits given arguments into options and a package list
macro(_pkgconfig_parse_options _result _is_req)
set(${_is_req} 0)
-
+
foreach(_pkg ${ARGN})
if (_pkg STREQUAL "REQUIRED")
set(${_is_req} 1)
@@ -198,7 +198,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
message(STATUS "checking for modules '${_pkg_check_modules_list}'")
endif(_pkg_check_modules_cnt EQUAL 1)
endif(NOT ${_is_silent})
-
+
set(_pkg_check_modules_packages)
set(_pkg_check_modules_failed)
@@ -225,7 +225,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
if (_pkg_check_modules_pkg_op STREQUAL "=")
list(APPEND _pkg_check_modules_exist_query --exact-version)
endif(_pkg_check_modules_pkg_op STREQUAL "=")
-
+
if (_pkg_check_modules_pkg_op STREQUAL "<=")
list(APPEND _pkg_check_modules_exist_query --max-version)
endif(_pkg_check_modules_pkg_op STREQUAL "<=")
@@ -272,7 +272,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
else(_pkg_check_modules_failed)
# when we are here, we checked whether requested modules
# exist. Now, go through them and set variables
-
+
_pkgconfig_set(${_prefix}_FOUND 1)
list(LENGTH _pkg_check_modules_packages pkg_count)
@@ -284,7 +284,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
else(pkg_count EQUAL 1)
set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}")
endif(pkg_count EQUAL 1)
-
+
_pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion )
_pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX "" --variable=prefix )
_pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR "" --variable=includedir )
@@ -350,7 +350,7 @@ macro(pkg_search_module _prefix _module0)
message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found")
endif(${_pkg_is_required})
endif(NOT ${_prefix}_FOUND)
-
+
_pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
endmacro(pkg_search_module)
Oops, something went wrong.

0 comments on commit a05a1e7

Please sign in to comment.