Version 0.2.6.3

and remove commented check

CMakeLists.txt

@@ -0,0 +1,72 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+PROJECT(weechat)
+
+SET(CMAKE_VERBOSE_MAKEFILE OFF)
+SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+SET(CMAKE_SKIP_RPATH ON)
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W")
+IF(PREFIX)
+  SET(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix" FORCE)
+ENDIF(PREFIX)
+
+SET(VERSION 0.2.6.3)
+SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
+SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/weechat)
+SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share/weechat)
+SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
+STRING(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING})
+
+OPTION(DISABLE_NCURSES "Disable Ncurses interface")
+OPTION(ENABLE_GTK      "Enable GTK interface")
+OPTION(DISABLE_NLS     "Disable Native Language Support")
+OPTION(DISABLE_GNUTLS  "Disable SSLv3/TLS connection support")
+OPTION(DISABLE_PLUGINS "Disable Plugins support")
+OPTION(DISABLE_PERL    "Disable Perl scripting language")
+OPTION(DISABLE_PYTHON  "Disable Python scripting language")
+OPTION(DISABLE_RUBY    "Disable Ruby scripting language")
+OPTION(DISABLE_LUA     "Disable Lua scripting language")
+OPTION(DISABLE_ASPELL  "Disable Aspell plugin")
+OPTION(DISABLE_CHARSET "Disable Charset plugin")
+OPTION(DISABLE_DOC     "Disable Doc")
+
+ADD_SUBDIRECTORY( po ) 
+ADD_SUBDIRECTORY( src ) 
+IF(NOT DISABLE_DOC)
+  ADD_SUBDIRECTORY( doc ) 
+ENDIF(NOT DISABLE_DOC)
+
+CONFIGURE_FILE(config.h.cmake config.h @ONLY)
+
+CONFIGURE_FILE(
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/makedist.sh.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/makedist.sh" IMMEDIATE
+  @ONLY)
+
+CONFIGURE_FILE(
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET(uninstall
+  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
+ADD_CUSTOM_TARGET(dist
+  "${CMAKE_BINARY_DIR}/makedist.sh"
+  DEPENDS doc
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+

COPYING

@@ -1,285 +1,626 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 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.
 
-			    Preamble
+                            Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+                       TERMS AND CONDITIONS
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  0. Definitions.
 
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+  "This License" refers to version 3 of the GNU General Public License.
 
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  1. Source Code.
 
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  The Corresponding Source for a work in source code form is that
+same work.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+  13. Use with the GNU Affero General Public License.
 
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+  14. Revised Versions of this License.
 
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-			    NO WARRANTY
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+  15. Disclaimer of Warranty.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program 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 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -304,37 +645,30 @@ 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, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+    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.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
+parts of the General Public License.  Of course, your program's commands
+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 your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+  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
+<http://www.gnu.org/licenses/>.
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This 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 Library General
-Public License instead of this License.
+  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
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

ChangeLog

@@ -1,9 +1,113 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2007-03-29
+ChangeLog - 2009-06-13
 
 
+Version 0.2.6.3 (2009-06-13):
+   * fix gnutls detection (use pkg-config instead of libgnutls-config)
+     (bug #26790)
+
+Version 0.2.6.2 (2009-04-18):
+   * fix bug with charset decoding (for example with iso2022jp)
+
+Version 0.2.6.1 (2009-03-14):
+   * fix crash with some special chars in IRC messages (bug #25862)
+
+Version 0.2.6 (2007-09-06):
+   * fixed bug with log of plugin messages (option log_plugin_msg)
+   * added new option "deloutq" to /server command to delete all servers
+     messages out queues (task #7221)
+   * fixed display bug with some special chars in messages (some words were
+     truncated on screen) (bug #20944)
+   * fixed UTF-8 bug with color encoding/decoding
+   * fixed crash when searching text in buffer with ctrl-R (bug #20938)
+   * added string length limit for setup file options
+   * fixed bug with flock() when home is on NFS filesystem (bug #20913)
+   * added option to align text of messages (except first lines) (task #7246)
+   * fixed user modes in nicklist when ban and nick mode are received in the
+     same MODE message (bug #20870)
+   * fixed IRC message 333: silently ignore message if error when parsing it
+   * fixed server option "command_delay": does not freeze WeeChat any more
+   * added paste detection, new options look_paste_max_lines and
+     col_input_actions (task #5442)
+   * fixed bug with highlight and UTF-8 chars around word (bug #20753)
+   * added swedish quickstart guide
+   * added support of channel mode +u (channel user) (bug #20717)
+   * improved /connect command to connect to a host by creating a temporary
+     server, added option to /server to create temporary server (task #7095)
+   * added "copy", "rename" and "keep" options to /server command
+   * allow clear of multiple selected buffers with /clear (patch #6112)
+   * added key for setting unread marker on all buffers (default:
+     ctrl-S + ctrl-U) (task 7180)
+   * fixed nick prefix display on servers that doesn't support all prefixes
+     (bug #20025)
+   * fixed terminal encoding detection when NLS is disabled (bug #20646)
+   * fixed crash when sending data to channel or pv on disconnected server
+     (bug #20524)
+   * improved command /server ant its output
+   * added 3 default new keys: ctrl-B (left), ctrl-F (right), ctrl-D (delete)
+   * added "buffer_move" event handler to plugins API (task #6708)
+   * added key function "jump_previous_buffer" to jump to buffer previously
+     displayed (new key: alt-J + alt-P) (task #7085)
+   * added "%*" to completion template, to repeat last completion
+   * added "-nojoin" option for /connect and /reconnect commands (task #7074)
+   * fixed bugs with IRC color in messages, now color codes are inserted in
+     command line with ^Cc,^Cb,.. instead of %C,%B,.. (bug #20222, task #7060)
+   * fixed bug with smart nick completion (last speakers first) when a nick
+     is changed
+   * fixed charset bug with channel names in status bar (bug #20400)
+   * added "scroll" option to /buffer command
+   * down key now saves input to history and clears input line (task #7049)
+   * fixed log file when channel name contains "/" (bug #20072)
+   * command /away allowed when not connected to server (internally stored
+     and AWAY command is sent when connecting to server) (task #7003)
+   * added argument for /upgrade command (path to binary)
+   * fixed bug with /topic when channel not open and topic not defined
+     (bug #20141)
+   * added hotlist sort with new option "look_hotlist_sort" (task #5870)
+
+Version 0.2.5 (2007-06-07):
+   * fixed QUOTE command: now allowed when socket is ok (even if IRC
+     connection to server is not ok) (bug #20113)
+   * added missing IRC commands (327, 378, 379) (bug #20091)
+   * fixed hotlist when exiting search mode: current buffer is removed from
+     hotlist
+   * added "%M" for completion with nicks of current server (nicks on open
+     channels) (task #6931)
+   * improved key bindings: now possible to bind a key on many commands,
+     separated by semicolon (task #5444)
+   * improved IRC long message split: use word boundary (task #6685)
+   * removed ":" for unknown IRC commands before arguments (bug #19929)
+   * fixed "%C" completion: now completes with all channels of all servers
+   * fixed bug with "/buffer query_name", added server and channel completion
+     for /buffer command (bug #19928)
+   * added cmake for weechat compile (patch #5943)
+   * fixed IRC mode parsing when receiving modes with arguments (bug #19902)
+   * fixed crash with IRC JOIN malformed message (bug #19891)
+   * fixed bug with nick prefixes on some IRC servers (bug #19854)
+   * improved setup file save: now writes temporary file, then rename it
+     (task #6847)
+   * fixed bug with $nick/$channel/$server variables in commands
+   * forget current nick when user manually disconnects from server
+   * fixed nick display in input window
+   * fixed bug with erroneous nickname when connecting to server (bug #19812)
+   * fixed display bugs in IRC error messages
+   * added protocol priority for gnutls (patch #5915)
+   * added channel admin mode '!' for some IRC servers
+   * fixed bug with iso2022jp locale (bug #18719)
+   * fixed string format bug when displaying string thru plugin script API
+   * added /reconnect command (task #5448)
+   * added "-all" option for /connect and /disconnect commands (task #6232)
+   * improved nick completion: completion with last speakers first and self
+     nick at the end; added option look_nick_completion_smart, enabled by
+     default (task #5896)
+   * fixed nick completion in command arguments (bug #19590)
+   * fixed possible crash with nick completion when a nick leaves channel
+     (bug #19589)
+   * added color for input text not found in buffer history
+   * fixed USER message when connecting to IRC server (patch #5835)
+
 Version 0.2.4 (2007-03-29):
    * fixed color bug with IRC messages displayed by plugins (bug #19442)
    * fixed topic charset, now using channel charset if defined (bug #19386)

FAQ

@@ -1,4 +1,4 @@
-WeeChat FAQ, 2007-03-29
+WeeChat FAQ, 2007-09-06
 =======================
 
 Intended audience:
@@ -92,11 +92,15 @@ A:	For versions < 0.2.3, please upgrade to last stable version.
 	- check that weechat-curses is linked to libncursesw (warning: needed
 	  on most distributions but not all) :
 	  ldd /path/to/weechat-curses
+	- check that "Charset" plugin is loaded with /plugin command
+	  (if it is not, then you probably need "weechat-plugins" package)
 	- check charset line (on server buffer), you should see ISO-XXXXXX or
 	  UTF-8 for terminal charset. If you see ANSI_X3.4-1968 or other values,
 	  probably your locale is wrong.
 	- setup global decode value, for example:
 	  /setp charset.global.decode = ISO-8859-15
+	- if you are using UTF-8 locale, check that your terminal is UTF-8
+	  ready. Terminal recommended for UTF-8 is rxvt-unicode.
 
 
 2.5
@@ -179,6 +183,26 @@ A:	Yes, you have to use python script shell.py (available on WeeChat
 	users, you can issue:  /shell setenv LANG=en_US)
 
 
+2.12
+================================================================================
+Q:	With Curses GUI, how can I copy/paste text without pasting nicklist ?
+
+A:	You can use a terminal with rectangular selection (like rxvt-unicode,
+	konsole, ...).
+	Other solution is to move nicklist to top or bottom, for example:
+	  /set look_nicklist_position = top
+
+
+2.13
+================================================================================
+Q:	How to be warned when someone highlights me on a channel ?
+
+A:	You can use sound.pl script (available on scripts page), and then
+	setup a system command (to play sound, display message, ..) with this
+	command :
+	  /setp perl.sound.cmd_highlight = "/usr/bin/command arguments..."
+
+
 3.1
 ================================================================================
 Q:	How should I report bugs?

FAQ.fr

@@ -1,4 +1,4 @@
-WeeChat FAQ, 2007-03-29
+WeeChat FAQ, 2007-09-06
 =======================
 
 Public concerné :
@@ -99,12 +99,17 @@ R:	Pour les versions < 0.2.3, merci d'installer la derni
 	- vérifiez que weechat-curses est lié avec libncursesw (attention:
 	  nécessaire sur beaucoup de distributions, mais pas toutes) :
 	  ldd /chemin/vers/weechat-curses
+	- vérifiez que l'extension "Charset" est chargée avec la commande
+	  /plugin (s'il ne l'est pas, vous devez peut-être installer le
+	  paquet "weechat-plugins")
 	- vérifiez la ligne charset (sur le tampon serveur), vous devriez voir
 	  ISO-XXXXXX ou UTF-8 pour le charset du terminal. Si vous voyez
 	  ANSI_X3.4-1968 ou d'autres valeurs, votre locale est probablement
 	  erronée.
 	- affectez la valeur pour le décodage global, par exemple :
 	  /setp charset.global.decode = ISO-8859-15
+	- si vous utilisez la locale UTF-8, vérifiez que votre terminal est
+	  compatible UTF-8. Un terminal conseillé pour l'UTF-8 est rxvt-unicode.
 
 
 2.5
@@ -188,6 +193,28 @@ R:	Oui, il faut utiliser le script python shell.py (disponible sur le site
 	/shell setenv LANG=en_US)
 
 
+2.12
+================================================================================
+Q:	Avec l'interface Curses, comment puis-je copier/coller du texte sans
+	coller la liste des pseudos ?
+
+R:	Vous pouvez utiliser un terminal qui propose la sélection rectangulaire
+	(comme rxvt-unicode, konsole, etc...).
+	Une autre solution est de déplacer la liste des pseudos en haut ou en
+	bas, par exemple :
+	  /set look_nicklist_position = top
+
+
+2.13
+================================================================================
+Q:	Comment être averti lorsque quelqu'un prononce mon pseudo sur un canal ?
+
+R:	Vous pouvez utiliser le script sound.pl (disponible sur la page des
+	scripts), puis configurer une commande système (jouant un son, affichant
+	un message à l'écran, etc...) comme ceci :
+	  /setp perl.sound.cmd_highlight = "/usr/bin/commande parametres..."
+
+
 3.1
 ================================================================================
 Q:	Comment dois-je reporter les bugs ?

Makefile.am

@@ -2,7 +2,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 SUBDIRS = po doc intl src

NEWS

@@ -1,6 +1,33 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
+* FlashCode, 2009-06-13
+
+    WeeChat 0.2.6.3 released.
+
+    This version fixes gnutls detection.
+
+* FlashCode, 2009-04-18
+
+    WeeChat 0.2.6.2 released.
+
+    This version fixes a bug with charset decoding (like iso2022jp).
+
+* FlashCode, 2009-03-14
+
+    WeeChat 0.2.6.1 released.
+
+    This version fixes a major bug: crash with some special chars in IRC
+    messages.
+
+* FlashCode, 2007-09-06
+
+    WeeChat 0.2.6 released.
+
+* FlashCode, 2007-06-07
+
+    WeeChat 0.2.5 released.
+
 * FlashCode, 2007-03-29
 
     WeeChat 0.2.4 released.

README

@@ -29,7 +29,7 @@ WeeChat is distributed under GPL licence (see COPYING file for complete license)
 
 This program 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 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
@@ -38,8 +38,7 @@ 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, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 ---

autogen.sh

@@ -1,4 +1,20 @@
 #!/bin/sh
+#
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
 
 ###
 ### common stuff

cmake/FindAspell.cmake

@@ -0,0 +1,48 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+# - Find Aspell
+# This module finds if libaspell is installed and determines where 
+# the include files and libraries are.
+#
+# This code sets the following variables:
+#
+#  ASPELL_INCLUDE_PATH = path to where aspell.h can be found
+#  ASPELL_LIBRARY = path to where libaspell.so* can be found
+
+IF (ASPELL_FOUND)
+  # Already in cache, be silent
+  SET(ASPELL_FIND_QUIETLY TRUE)
+ENDIF (ASPELL_FOUND)
+
+FIND_PATH(ASPELL_INCLUDE_PATH
+  NAMES aspell.h
+  PATHS /usr/include /usr/local/include /usr/pkg/include
+)
+
+FIND_LIBRARY(ASPELL_LIBRARY
+  NAMES aspell aspell-15
+  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
+)
+
+IF (ASPELL_INCLUDE_PATH AND ASPELL_LIBRARY)
+   SET(ASPELL_FOUND TRUE)
+ENDIF (ASPELL_INCLUDE_PATH AND ASPELL_LIBRARY)
+
+MARK_AS_ADVANCED(
+  ASPELL_INCLUDE_PATH
+  ASPELL_LIBRARY
+  )

cmake/FindGettext.cmake

@@ -0,0 +1,67 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+# - Find Gettext
+# This module finds if gettext is installed and determines where 
+# the include files and libraries are.
+#
+# This code sets the following variables:
+#
+#  GETTEXT_FOUND = is gettext usable on system?
+
+IF(GETTEXT_FOUND)
+   # Already in cache, be silent
+   SET(GETTEXT_FIND_QUIETLY TRUE)
+ENDIF(GETTEXT_FOUND)
+
+INCLUDE(CheckIncludeFiles)
+INCLUDE(CheckLibraryExists)
+INCLUDE(CheckFunctionExists)
+
+FIND_PATH(LIBINTL_INCLUDE
+  NAMES libintl.h
+  PATH /usr/local/include /usr/pkg/include /usr/include
+)
+
+SET(CMAKE_REQUIRED_INCLUDES ${LIBINTL_INCLUDE})
+
+CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)
+
+IF(HAVE_LIBINTL_H)
+
+  CHECK_FUNCTION_EXISTS(dgettext LIBC_HAS_DGETTEXT)
+  IF(LIBC_HAS_DGETTEXT)
+    SET(GETTEXT_FOUND TRUE)
+  ELSE(LIBC_HAS_DGETTEXT)
+    FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl
+      PATHS
+      /usr/local/lib
+      /usr/lib
+      )
+    IF(LIBINTL_LIBRARY)
+      IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+        SET(CMAKE_REQUIRED_LIBRARIES "iconv")
+        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
+      ELSE(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
+      ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+      
+      IF(LIBINTL_HAS_DGETTEXT)
+	SET(GETTEXT_FOUND TRUE)
+      ENDIF(LIBINTL_HAS_DGETTEXT)
+    ENDIF(LIBINTL_LIBRARY)
+  ENDIF(LIBC_HAS_DGETTEXT)
+ENDIF(HAVE_LIBINTL_H)

cmake/FindGnuTLS.cmake

@@ -0,0 +1,71 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+# - Find GnuTLS
+# This module finds if libgnutls is installed and determines where 
+# the include files and libraries are.
+#
+# This code sets the following variables:
+#
+#  GNUTLS_INCLUDE_PATH = path to where <gnutls/gnutls.h> can be found
+#  GNUTLS_LIBRARY = path to where libgnutls.so* can be found
+#  GNUTLS_CFLAGS = cflags to use to compile
+#  GNUTLS_LDFLAGS = ldflags to use to compile
+
+IF(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
+   # Already in cache, be silent
+   set(GNUTLS_FIND_QUIETLY TRUE)
+ENDIF(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
+
+FIND_PROGRAM(PKG_CONFIG_EXECUTABLE NAMES pkg-config)
+
+EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix gnutls
+   OUTPUT_VARIABLE GNUTLS_PREFIX
+)
+
+EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags gnutls
+   OUTPUT_VARIABLE GNUTLS_CFLAGS
+)
+STRING(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_FLAGS}")
+
+EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --libs gnutls
+   OUTPUT_VARIABLE GNUTLS_LDFLAGS
+)
+STRING(REGEX REPLACE "[\r\n]" "" GNUTLS_LDFLAGS "${GNUTLS_LDFLAGS}")
+
+SET(GNUTLS_POSSIBLE_INCLUDE_PATH "${GNUTLS_PREFIX}/include")
+SET(GNUTLS_POSSIBLE_LIB_DIR "${GNUTLS_PREFIX}/lib")
+
+FIND_PATH(GNUTLS_INCLUDE_PATH
+  NAMES gnutls/gnutls.h
+  PATHS GNUTLS_POSSIBLE_INCLUDE_PATH
+)
+
+FIND_LIBRARY(GNUTLS_LIBRARY
+  NAMES gnutls
+  PATHS GNUTLS_POSSIBLE_LIB_DIR
+)
+
+IF (GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
+  SET(GNUTLS_FOUND TRUE)
+ENDIF (GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
+
+MARK_AS_ADVANCED(
+  GNUTLS_INCLUDE_PATH
+  GNUTLS_LIBRARY
+  GNUTLS_CFLAGS
+  GNUTLS_LDFLAGS
+)

cmake/FindIconv.cmake

@@ -0,0 +1,79 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+# - Find Iconv
+# This module finds if libiconv is installed and determines where 
+# the include files and libraries are.
+#
+# This code sets the following variables:
+#
+#  ICONV_INCLUDE_PATH = path to where <iconv.h> can be found
+#  ICONV_LIBRARY = path to where libiconv.so* can be found (on non glibc based systems)
+#
+#  ICONV_FOUND = is iconv usable on system?
+
+IF(ICONV_FOUND)
+   # Already in cache, be silent
+   set(ICONV_FIND_QUIETLY TRUE)
+ENDIF(ICONV_FOUND)
+
+FIND_PATH(ICONV_INCLUDE_PATH
+  NAMES iconv.h
+  PATHS /usr/include /usr/local/include /usr/pkg/include
+)
+
+FIND_LIBRARY(ICONV_LIBRARY
+  NAMES iconv
+  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
+)
+
+IF(ICONV_INCLUDE_PATH)
+  IF(ICONV_LIBRARY)
+    STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
+    CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
+    IF(NOT ICONV_FOUND)
+      CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
+    ENDIF(NOT ICONV_FOUND)
+  ELSE(ICONV_LIBRARY)
+    CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND)
+  ENDIF(ICONV_LIBRARY)
+ENDIF(ICONV_INCLUDE_PATH)
+
+include(CheckCSourceCompiles)
+
+IF(ICONV_LIBRARY)
+  SET(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
+  SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH})
+ENDIF(ICONV_LIBRARY)
+
+SET(CMAKE_REQUIRED_FLAGS -Werror)
+check_c_source_compiles("
+  #include <iconv.h>
+  int main(){
+    iconv_t conv = 0;
+    const char* in = 0;
+    size_t ilen = 0;
+    char* out = 0;
+    size_t olen = 0;
+    iconv(conv, &in, &ilen, &out, &olen);
+    return 0;
+  }
+" ICONV_2ARG_IS_CONST)
+MARK_AS_ADVANCED(
+  ICONV_INCLUDE_PATH
+  ICONV_LIBRARY
+  ICONV_FOUND
+)

cmake/FindLua.cmake

@@ -0,0 +1,81 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+# - Find Lua
+# This module finds if liblua is installed and determines where 
+# the include files and libraries are.
+#
+# This code sets the following variables:
+#
+#  LUA_INCLUDE_PATH = path to where <lua.h> can be found
+#  LUA_LIBRARY = path to where liblua.so* (and liblualib.so* for lua <can be found (on non glibc based systems)
+#
+#  LUA_FOUND = is liblua usable on system?
+
+IF(LUA_FOUND)
+   # Already in cache, be silent
+   SET(LUA_FIND_QUIETLY TRUE)
+ENDIF(LUA_FOUND)
+
+FIND_PATH(
+        LUA51_INCLUDE_PATH lua.h
+        PATHS /usr/include /usr/local/include /usr/pkg/include
+        PATH_SUFFIXES lua51 lua5.1 lua-5.1
+)
+
+FIND_LIBRARY(
+        LUA51_LIBRARY NAMES lua51 lua5.1 lua-5.1 lua
+        PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
+)
+
+IF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
+  SET(LUA_INCLUDE_PATH "${LUA51_INCLUDE_PATH}")
+  SET(LUA_LIBRARY "${LUA51_LIBRARY}")
+  SET(LUA_VERSION "5.1")
+  SET(LUA_FOUND TRUE)
+ELSE(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
+  FIND_PATH(
+        LUA50_INCLUDE_PATH lua.h
+        PATHS /usr/include /usr/local/include /usr/pkg/include
+        PATH_SUFFIXES lua50 lua5.0 lua-5.0 lua
+  )
+
+  FIND_LIBRARY(
+        LUA50_LIBRARY NAMES lua50 lua5.0 lua-5.0 lua
+        PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
+  )
+
+  FIND_LIBRARY(
+  		LUALIB50_LIBRARY NAMES lualib50 lualib5.0 lualib-5.0 lualib
+		PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
+  )
+
+  IF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY)
+    SET(LUA_INCLUDE_PATH "${LUA50_INCLUDE_PATH}")
+    SET(LUA_LIBRARY "${LUA50_LIBRARY}")
+    SET(LUALIB_LIBRARY "${LUALIB50_LIBRARY}")
+    SET(LUA_VERSION "5.0")
+    SET(LUA_FOUND TRUE)
+  ENDIF(LUA50_INCLUDE_PATH AND LUA50_LIBRARY AND LUALIB50_LIBRARY)
+ENDIF(LUA51_INCLUDE_PATH AND LUA51_LIBRARY)
+
+
+MARK_AS_ADVANCED(
+  LUA_INCLUDE_PATH
+  LUA_LIBRARY
+  LUALIB_LIBRARY
+#  LUA_VERSION
+)

cmake/FindNcurses.cmake

@@ -0,0 +1,38 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+IF(NCURSES_FOUND)
+  SET(NCURSES_FIND_QUIETLY TRUE)
+ENDIF(NCURSES_FOUND)
+
+FIND_PATH(NCURSES_INCLUDE_PATH
+  NAMES ncurses.h curses.h
+  PATHS /usr/include /usr/local/include /usr/pkg/include
+)
+
+FIND_LIBRARY(NCURSES_LIBRARY
+  NAMES ncursesw ncurses
+  PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
+)
+
+IF (NCURSES_INCLUDE_PATH AND NCURSES_LIBRARY)
+  SET(NCURSES_FOUND TRUE)
+ENDIF(NCURSES_INCLUDE_PATH AND NCURSES_LIBRARY)
+
+MARK_AS_ADVANCED(
+  NCURSES_INCLUDE_PATH
+  NCURSES_LIBRARY
+)

cmake/FindPerl.cmake

@@ -0,0 +1,82 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+# - Find Perl libraries
+# This module finds if Perl 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:
+#
+#  PERL_EXECUTABLE   = full path to the perl binary
+#  PERL_INCLUDE_PATH = path to where perl.h can be found
+#  PERL_LIBRARY = path to where libperl.so* can be found
+#  PERL_CFLAGS = perl compiler options for compiling
+#  PERL_LFLAGS = perl compiler options for linking
+
+IF(PERL_FOUND)
+   # Already in cache, be silent
+   SET(PERL_FIND_QUIETLY TRUE)
+ENDIF(PERL_FOUND)
+
+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}")
+  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}
+    )
+
+  FIND_LIBRARY(PERL_LIBRARY
+    NAMES perl
+    PATHS /usr/lib /usr/local/lib /usr/pkg/lib ${PERL_INTERNAL_DIR}
+    )
+  
+  IF(PERL_LIBRARY AND PERL_INCLUDE_PATH)
+    SET(PERL_FOUND TRUE)
+  ENDIF(PERL_LIBRARY AND PERL_INCLUDE_PATH)
+  
+  MARK_AS_ADVANCED(
+    PERL_EXECUTABLE
+    PERL_INCLUDE_PATH
+    PERL_LIBRARY
+    PERL_CFLAGS
+    PERL_LFLAGS
+    )
+ENDIF(PERL_EXECUTABLE)
+

cmake/FindPython.cmake

@@ -0,0 +1,79 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+# - Find Python
+# This module finds if Python 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:
+#
+#  PYTHON_EXECUTABLE   = full path to the python binary
+#  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(PYTHON_FOUND)
+
+FIND_PROGRAM(PYTHON_EXECUTABLE 
+  NAMES python python2.5 python2.4 python2.3 python2.2
+  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+  )
+
+IF(PYTHON_EXECUTABLE)
+  EXECUTE_PROCESS(
+    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_config_var('CONFINCLUDEPY')"
+    OUTPUT_VARIABLE PYTHON_INC_DIR
+    )
+  
+  EXECUTE_PROCESS(
+    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_config_var('LIBPL')"
+    OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH
+    )
+  
+  EXECUTE_PROCESS(
+    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_config_var('LINKFORSHARED')"
+    OUTPUT_VARIABLE PYTHON_LFLAGS
+    )
+  
+  # remove the new lines from the output by replacing them with empty strings
+  STRING(REPLACE "\n" "" PYTHON_INC_DIR "${PYTHON_INC_DIR}")
+  STRING(REPLACE "\n" "" PYTHON_POSSIBLE_LIB_PATH "${PYTHON_POSSIBLE_LIB_PATH}")
+  STRING(REPLACE "\n" "" PYTHON_LFLAGS "${PYTHON_LFLAGS}")
+  
+  FIND_PATH(PYTHON_INCLUDE_PATH
+    NAMES Python.h
+    PATHS ${PYTHON_INC_DIR}
+    )
+  
+  FIND_LIBRARY(PYTHON_LIBRARY
+    NAMES python python2.5 python2.4 python2.3 python2.2
+    PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+    )
+
+  IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
+    SET(PYTHON_FOUND TRUE)
+  ENDIF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
+  
+  MARK_AS_ADVANCED(
+    PYTHON_EXECUTABLE
+    PYTHON_INCLUDE_PATH
+    PYTHON_LIBRARY
+    PYTHON_LFLAGS
+    )
+  
+ENDIF(PYTHON_EXECUTABLE)

cmake/FindRuby.cmake

@@ -0,0 +1,77 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+# - Find Ruby
+# This module finds if Ruby 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:
+#
+#  RUBY_EXECUTABLE   = full path to the ruby binary
+#  RUBY_INCLUDE_PATH = path to where ruby.h can be found
+#  RUBY_LIBRARY = path to where libruby.so* can be found
+
+IF(RUBY_FOUND)
+   # Already in cache, be silent
+   SET(RUBY_FIND_QUIETLY TRUE)
+ENDIF(RUBY_FOUND)
+
+FIND_PROGRAM(RUBY_EXECUTABLE 
+  NAMES ruby ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16
+  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+  )
+
+IF(RUBY_EXECUTABLE)
+  EXECUTE_PROCESS(
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['archdir']"
+    OUTPUT_VARIABLE RUBY_ARCH_DIR
+    )
+
+  EXECUTE_PROCESS(
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['libdir']"
+    OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
+    )
+  
+  EXECUTE_PROCESS(
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubylibdir']"
+    OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
+    )
+  
+  # remove the new lines from the output by replacing them with empty strings
+  STRING(REPLACE "\n" "" RUBY_ARCH_DIR "${RUBY_ARCH_DIR}")
+  STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}")
+  STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}")
+  
+  FIND_PATH(RUBY_INCLUDE_PATH
+    NAMES ruby.h
+    PATHS ${RUBY_ARCH_DIR}
+    )
+
+  FIND_LIBRARY(RUBY_LIBRARY
+    NAMES ruby ruby1.6 ruby16 ruby1.8 ruby18 ruby1.9 ruby19
+    PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
+    )
+
+  IF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
+    SET(RUBY_FOUND TRUE)
+  ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
+
+  MARK_AS_ADVANCED(
+    RUBY_EXECUTABLE
+    RUBY_LIBRARY
+    RUBY_INCLUDE_PATH
+    )
+  
+ENDIF(RUBY_EXECUTABLE)

cmake/cmake_uninstall.cmake.in

@@ -0,0 +1,21 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+  MESSAGE(STATUS "Uninstalling \"${file}\"")
+  IF(NOT EXISTS "${file}")
+    MESSAGE(FATAL_ERROR "File \"${file}\" does not exists.")
+  ENDIF(NOT EXISTS "${file}")
+  EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
+    OUTPUT_VARIABLE rm_out
+    RETURN_VARIABLE rm_retval)
+  IF("${rm_retval}" GREATER 0)
+    MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
+  ENDIF("${rm_retval}" GREATER 0)
+ENDFOREACH(file)
+
+
+

cmake/makedist.sh.in

@@ -0,0 +1,33 @@
+#!/bin/sh
+VERSION=@VERSION@
+SRCROOT=@CMAKE_SOURCE_DIR@
+BUILDDIR=@CMAKE_BINARY_DIR@
+PROJECT=@PROJECT_NAME@
+TAG=release-$(echo $VERSION | sed -e 's/\./-/g')
+
+EXCLUDE="@DIST_EXCLUDE@"
+EXPORT_DIR="${PROJECT}-${VERSION}"
+
+if [ -z  $CVSROOT ]; then
+    echo "The CVSROOT variable must be set"
+    exit 1
+fi
+
+echo "Exporting source tree"
+if [ $(echo $VERSION | grep cvs) ]; then
+    cvs export -r HEAD -d $PROJECT-$VERSION $PROJECT
+else
+    cvs export -r $TAG -d $PROJECT-$VERSION $PROJECT
+fi
+
+echo "Removing not needed stuff"
+for i in $EXCLUDE ; do
+    echo "  $i"
+    rm -rf $EXPORT_DIR/$i
+done
+
+echo "Generating archive"
+tar cjf ${BUILDDIR}/${PROJECT}-${VERSION}.tar.bz2 ${EXPORT_DIR}
+
+echo "Cleaning up"
+rm -rf ${EXPORT_DIR}

config.h.cmake

@@ -0,0 +1,29 @@
+#cmakedefine HAVE_ARPA_INET_H
+#cmakedefine HAVE_LIBINTL_H
+#cmakedefine HAVE_LIMITS_H
+#cmakedefine HAVE_LOCALE_H
+#cmakedefine HAVE_NETDB_H
+#cmakedefine HAVE_NETINET_IN_H
+#cmakedefine HAVE_STDLIB_H
+#cmakedefine HAVE_STRING_H
+#cmakedefine HAVE_SYS_SOCKET_H
+#cmakedefine HAVE_SYS_TIME_H
+#cmakedefine HAVE_SYS_TYPES_H
+#cmakedefine HAVE_UNISTD_H
+#cmakedefine HAVE_PWD_H
+#cmakedefine HAVE_ERRNO_H
+#cmakedefine HAVE_REGEX_H
+#cmakedefine HAVE_WCHAR_H
+#cmakedefine HAVE_SYS_FILE_H
+#cmakedefine HAVE_FLOCK
+#cmakedefine HAVE_LANGINFO_CODESET
+#cmakedefine HAVE_STRNDUP
+#cmakedefine ICONV_2ARG_IS_CONST 1
+#define PACKAGE_VERSION "@VERSION@"
+#define PACKAGE "@PROJECT_NAME@"
+#define PACKAGE_NAME "@PROJECT_NAME@"
+#define PACKAGE_STRING "@PKG_STRING@"
+#define WEECHAT_LIBDIR "@LIBDIR@"
+#define WEECHAT_SHAREDIR "@SHAREDIR@"
+#define LOCALEDIR "@LOCALEDIR@"
+#define _GNU_SOURCE 1

configure.in

@@ -2,7 +2,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,18 +11,17 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.2.4, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.2.6.3, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([src/common/weechat.c])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.2.4])
+AM_INIT_AUTOMAKE([weechat], [0.2.6.3])
 
 # Checks for programs
 AC_PROG_CC
@@ -601,20 +600,28 @@ fi
 # ------------------------------------------------------------------------------
 
 if test "x$enable_gnutls" = "xyes" ; then
-    found_gnutls="no"
-    AM_PATH_LIBGNUTLS( 1.0.0, found_gnutls=yes, AC_MSG_WARN([[
+   AC_CHECK_HEADER(gnutls/gnutls.h,ac_found_gnutls_header="yes",ac_found_gnutls_header="no")
+   AC_CHECK_LIB(gnutls,gnutls_global_init,ac_found_gnutls_lib="yes",ac_found_gnutls_lib="no")
+
+   AC_MSG_CHECKING(for gnutls headers and librairies)
+   if test "x$ac_found_gnutls_header" = "xno" -o "x$ac_found_gnutls_lib" = "xno" ; then
+      AC_MSG_RESULT(no)
+      AC_MSG_WARN([
 *** libgnutls was not found. You may want to get it from ftp://ftp.gnutls.org/pub/gnutls/
-*** WeeChat will be built without GnuTLS support.]]))
-    if test "x$found_gnutls" = "xyes" ; then
-        GNUTLS_CFLAGS=`libgnutls-config --cflags`
-        GNUTLS_LFLAGS=`libgnutls-config --libs`
+*** WeeChat will be built without GnuTLS support.])
+      enable_gnutls="no"
+      not_found="$not_found gnutls"
+    else
+	AC_MSG_RESULT(yes)
+        GNUTLS_CFLAGS=`pkg-config gnutls --cflags`
+        GNUTLS_LFLAGS=`pkg-config gnutls --libs`
         AC_SUBST(GNUTLS_CFLAGS)
         AC_SUBST(GNUTLS_LFLAGS)
         AC_DEFINE(HAVE_GNUTLS)
-    else
-        enable_gnutls="no"
-        not_found="$not_found gnutls"
+        CFLAGS="$CFLAGS -DHAVE_GNUTLS"
     fi
+else
+    not_asked="$not_asked gnutls"
 fi
 
 # ------------------------------------------------------------------------------
@@ -796,6 +803,7 @@ AC_OUTPUT([Makefile
            doc/pl/Makefile
            doc/cs/Makefile
            doc/sco/Makefile
+           doc/sv/Makefile
            src/Makefile
            src/common/Makefile
            src/irc/Makefile

doc/CMakeLists.txt

@@ -0,0 +1,167 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+SET(DOC_LANGS
+  cs
+  de
+  en
+  fr
+  pl
+  ru
+  sco
+  sv
+  )
+
+FIND_PROGRAM(
+  COPY cp
+  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
+)
+
+FIND_PROGRAM(
+  XSLTPROC xsltproc
+  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
+)
+
+FIND_PROGRAM(
+  DBLATEX dblatex
+  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
+  )
+
+FIND_FILE(DOC_XSL_PREFIX chunk.xsl PATHS
+  /usr/share/xml/docbook/stylesheet/nwalsh/
+  /usr/share/xml/docbook/xsl-stylesheets-1.69/
+  PATH_SUFFIXES html
+  DOC "Path to nwalsh xsl stylesheet"
+  )
+STRING(REPLACE "/html/chunk.xsl" "" DOC_XSL_PREFIX "${DOC_XSL_PREFIX}")
+      
+IF(XSLTPROC AND DOC_XSL_PREFIX AND COPY)
+  SET(BUILD_HTML TRUE)
+ENDIF(XSLTPROC AND DOC_XSL_PREFIX AND COPY)
+
+IF(DBLATEX AND COPY)
+  SET(BUILD_PDF TRUE)
+ENDIF(DBLATEX AND COPY)
+
+IF(BUILD_HTML)
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-html.xsl.in
+    ${CMAKE_CURRENT_BINARY_DIR}/weechat-html.xsl
+    @ONLY
+    )
+
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-html-one.xsl.in
+    ${CMAKE_CURRENT_BINARY_DIR}/weechat-html-one.xsl
+    @ONLY
+    )
+ENDIF(BUILD_HTML)
+
+
+IF(BUILD_HTML OR BUILD_PDF)
+  EXECUTE_PROCESS(
+    COMMAND date "+%F %T"
+    OUTPUT_VARIABLE DOC_DATE
+    )
+  STRING(REPLACE "\n" "" DOC_DATE "${DOC_DATE}")
+
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/date.xml.in
+    ${CMAKE_CURRENT_BINARY_DIR}/date.xml
+    @ONLY
+    )
+  
+  FOREACH(dlang ${DOC_LANGS})
+    IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat.${dlang}.xml)
+      
+      IF(BUILD_HTML)
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang})
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build)
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang})
+      
+	ADD_CUSTOM_COMMAND(
+	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/index.html ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/weechat.${dlang}.html
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/config.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/irc_commands.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/key_functions.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat_commands.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_BINARY_DIR}/date.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/weechat-doc.css" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/weechat-doc.css" "${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}"
+	  COMMAND ${XSLTPROC} ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/ ${CMAKE_CURRENT_BINARY_DIR}/weechat-html.xsl ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/weechat.${dlang}.xml
+	  COMMAND ${XSLTPROC} ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/weechat.${dlang}.html ${CMAKE_CURRENT_BINARY_DIR}/weechat-html-one.xsl ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/weechat.${dlang}.xml
+	  DEPENDS
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat.${dlang}.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/config.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/irc_commands.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/key_functions.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat_commands.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/date.xml.in
+	  ${CMAKE_CURRENT_SOURCE_DIR}/weechat-html-one.xsl.in
+	  ${CMAKE_CURRENT_SOURCE_DIR}/weechat-html.xsl.in
+	  ${CMAKE_CURRENT_SOURCE_DIR}/date.xml.in
+	  ${CMAKE_CURRENT_SOURCE_DIR}/weechat-doc.css
+	  COMMENT "Building html doc (${dlang})"
+	  )
+	ADD_CUSTOM_TARGET(doc-html-${dlang} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/index.html)
+	ADD_CUSTOM_TARGET(doc-html-one-${dlang} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/weechat.${dlang}.html)
+	INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang} DESTINATION share/doc/${PROJECT_NAME}/html)
+	
+      ENDIF(BUILD_HTML)
+    
+      IF(BUILD_PDF)
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang})
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build)
+	
+	ADD_CUSTOM_COMMAND(
+	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/weechat.${dlang}.pdf
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/config.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/irc_commands.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/key_functions.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat_commands.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_BINARY_DIR}/date.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build"
+	  COMMAND ${DBLATEX} ARGS -c ${CMAKE_CURRENT_SOURCE_DIR}/dblatex.conf -o ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/weechat.${dlang}.pdf ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/weechat.${dlang}.xml
+	  DEPENDS
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat.${dlang}.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/config.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/irc_commands.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/key_functions.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat_commands.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/date.xml.in
+	  ${CMAKE_CURRENT_SOURCE_DIR}/weechat-html-one.xsl.in
+	  ${CMAKE_CURRENT_SOURCE_DIR}/date.xml.in
+	  COMMENT "Building pdf doc (${dlang})"
+	  )
+	ADD_CUSTOM_TARGET(doc-pdf-${dlang} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/weechat.${dlang}.pdf)
+	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/weechat.${dlang}.pdf DESTINATION share/doc/${PROJECT_NAME})
+
+      ENDIF(BUILD_PDF)
+      
+    ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat.${dlang}.xml)
+  
+  ENDFOREACH(dlang ${DOC_LANGS})
+
+ENDIF(BUILD_HTML OR BUILD_PDF)
+
+FOREACH(dlang ${DOC_LANGS})
+  IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat_quickstart.${dlang}.txt)
+    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat_quickstart.${dlang}.txt DESTINATION share/doc/${PROJECT_NAME})
+  ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat_quickstart.${dlang}.txt)
+ENDFOREACH(dlang ${DOC_LANGS})
+
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION share/man/man1)

doc/Makefile.am

@@ -2,7 +2,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,11 +11,10 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-SUBDIRS = . en fr de ru pl cs sco
+SUBDIRS = . en fr de ru pl cs sco sv
 
 man_MANS = weechat-curses.1
 

doc/buildxml.pl

@@ -4,7 +4,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #

doc/cs/Makefile.am

@@ -2,7 +2,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 LANGCODE = cs

doc/date.xml.in

@@ -0,0 +1 @@
+<pubdate>@DOC_DATE@</pubdate>

doc/de/Makefile.am

@@ -2,7 +2,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 LANGCODE = de

doc/de/config.xml

@@ -108,7 +108,7 @@
   <entry>Ganzzahl</entry>
   <entry>zwischen 0 und 100</entry>
   <entry>0</entry>
-  <entry>Maximale Größe der Nicklist (Breite oder Höhe, je nach look_nicklist_position (0: kein Maximum); Wenn min == max &gt; 0, ist die Größe fest.</entry>
+  <entry>Max size for nicklist (width or height, depending on look_nicklist_position (0 = no max size; if min = max and &gt; 0, then size is fixed))</entry>
 </row>
 <row>
   <entry><option>look_nicklist_separator</option></entry>
@@ -180,6 +180,13 @@
   <entry>20</entry>
   <entry>Maximale Größe zum Ausrichten von Nicknamen und anderen Nachrichten (sollte &gt;= look_align_size sein)</entry>
 </row>
+<row>
+  <entry><option>look_align_text_offset</option></entry>
+  <entry>Ganzzahl</entry>
+  <entry>zwischen -1 und 64</entry>
+  <entry>-1</entry>
+  <entry>Offset for aligning lines of messages (except first lines), default is -1 (align after nick), a null or positive value is offset after beginning of line</entry>
+</row>
 <row>
   <entry><option>look_nick_completor</option></entry>
   <entry>Zeichenfolge</entry>
@@ -194,6 +201,13 @@
   <entry>'[]-^'</entry>
   <entry>Zeichen, die bei der Nickvervollständigung ignoriert werden</entry>
 </row>
+<row>
+  <entry><option>look_nick_completion_smart</option></entry>
+  <entry>Boolean</entry>
+  <entry>eine beliebige Zeichenfolge</entry>
+  <entry>'on'</entry>
+  <entry>Intelligente vervollständigung der Nicknamen (vervollständigt zuerst mit dem letzten Nick, der einen angesprochen hat)</entry>
+</row>
 <row>
   <entry><option>look_nick_complete_first</option></entry>
   <entry>Boolean</entry>
@@ -250,10 +264,17 @@
   <entry>0</entry>
   <entry>Maximale Länge der Namen in der Hotlist (0: kein Limit)</entry>
 </row>
+<row>
+  <entry><option>look_hotlist_sort</option></entry>
+  <entry>Zeichenfolge</entry>
+  <entry>'group_time_asc', 'group_time_desc', 'group_number_asc', 'group_number_desc', 'number_asc', 'number_desc'</entry>
+  <entry>'group_time_asc'</entry>
+  <entry>Hotlist sort type (group_time_asc (default), group_time_desc, group_number_asc, group_number_desc, number_asc, number_desc)</entry>
+</row>
 <row>
   <entry><option>look_day_change</option></entry>
   <entry>Boolean</entry>
-  <entry>zwischen 0 und 32</entry>
+  <entry>'group_time_asc', 'group_time_desc', 'group_number_asc', 'group_number_desc', 'number_asc', 'number_desc'</entry>
   <entry>'on'</entry>
   <entry>Spezielle Nachricht anzeigen, wenn ein neuer Tag beginnt</entry>
 </row>
@@ -278,10 +299,17 @@
   <entry>'[%n(%m)] '</entry>
   <entry>Format der Eingabezeile ('%c' wird durch den Channel- oder Servernamen ersetzt, '%n' durch den Nicknamen und '%m' durch die Nick-Modi)</entry>
 </row>
+<row>
+  <entry><option>look_paste_max_lines</option></entry>
+  <entry>Ganzzahl</entry>
+  <entry>zwischen 0 und 2147483647</entry>
+  <entry>3</entry>
+  <entry>Max number of lines for paste without asking user (0 = disable this feature)</entry>
+</row>
 <row>
   <entry><option>col_real_white</option></entry>
   <entry>Boolean</entry>
-  <entry>eine beliebige Zeichenfolge</entry>
+  <entry>zwischen 0 und 2147483647</entry>
   <entry>'off'</entry>
   <entry>Wenn gesetzt, benutze echtes Weiß, als Voreinstellung jedoch für Terminals mit weißem Hintergrund deaktiviert (solltest du niemals einen weißen Hintergrund benutzen, solltest du diese Option aktivieren um ein echtes Weiß anstelle der voreingestellten Terminal Vordergrundfarbe zu bekommen)</entry>
 </row>
@@ -551,6 +579,20 @@
   <entry>'cyan'</entry>
   <entry>Farbe des Trennzeichens in der Eingabezeile</entry>
 </row>
+<row>
+  <entry><option>col_input_text_not_found</option></entry>
+  <entry>Farbe</entry>
+  <entry>Curses- oder Gtk-Farben</entry>
+  <entry>'red'</entry>
+  <entry>Farbe für den Text nicht gefunden</entry>
+</row>
+<row>
+  <entry><option>col_input_actions</option></entry>
+  <entry>Farbe</entry>
+  <entry>Curses- oder Gtk-Farben</entry>
+  <entry>'lightgreen'</entry>
+  <entry>Color for actions in input window</entry>
+</row>
 <row>
   <entry><option>col_input_bg</option></entry>
   <entry>Farbe</entry>
@@ -607,6 +649,13 @@
   <entry>'yellow'</entry>
   <entry>Farbe des Voice-Symbols</entry>
 </row>
+<row>
+  <entry><option>col_nick_user</option></entry>
+  <entry>Farbe</entry>
+  <entry>Curses- oder Gtk-Farben</entry>
+  <entry>'blue'</entry>
+  <entry>Color for user symbol</entry>
+</row>
 <row>
   <entry><option>col_nick_more</option></entry>
   <entry>Farbe</entry>
@@ -934,7 +983,7 @@
   <entry>Boolean</entry>
   <entry>eine beliebige Zeichenfolge</entry>
   <entry>'on'</entry>
-  <entry>Erlaube Benutzern, spezielle Codes zu versenden (%B=fett, %Cxx,yy=Farbe, %U=unterstrichen, %R=reverse/umgekehrt)</entry>
+  <entry>Allow user to send colors with special codes (^Cb=bold, ^Ccxx=color, ^Ccxx,yy=color+background, ^Cu=underline, ^Cr=reverse)</entry>
 </row>
 <row>
   <entry><option>irc_send_unknown_commands</option></entry>
@@ -1212,7 +1261,7 @@
 <row>
   <entry><option>server_command_delay</option></entry>
   <entry>Ganzzahl</entry>
-  <entry>zwischen 0 und 5</entry>
+  <entry>zwischen 0 und 3600</entry>
   <entry>0</entry>
   <entry>Wartezeit in Sekunden nach Ausführung des Befehls, um z.B. eine Authentifizierung zu ermöglichen</entry>
 </row>

doc/de/key_functions.xml

@@ -157,6 +157,10 @@
   <entry><literal>jump_last_buffer</literal></entry>
   <entry>zum letzten Puffer springen</entry>
 </row>
+<row>
+  <entry><literal>jump_previous_buffer</literal></entry>
+  <entry>jump to previous buffer</entry>
+</row>
 <row>
   <entry><literal>jump_server</literal></entry>
   <entry>zum Serverpuffer springen</entry>
@@ -181,6 +185,10 @@
   <entry><literal>scroll_unread</literal></entry>
   <entry>scrolle zur ersten, ungelesenen Zeile im Puffer</entry>
 </row>
+<row>
+  <entry><literal>set_unread</literal></entry>
+  <entry>set unread marker on all buffers</entry>
+</row>
 <row>
   <entry><literal>hotlist_clear</literal></entry>
   <entry>Hotlist leeren</entry>

doc/de/weechat.de.xml

@@ -8,7 +8,7 @@ Copyright (c) 2003-2007 by FlashCode <flashcode@flashtux.org>
 
 This manual 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 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
 This manual is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@ 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, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 -->
 
@@ -36,7 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
   <bookinfo>
     
-    <title>WeeChat 0.2.4 - User guide</title>
+    <title>WeeChat 0.2.6 - User guide</title>
     <subtitle>Schneller, leichter und erweiterbarer IRC Client</subtitle>
     
     <author>
@@ -54,24 +53,23 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     
     <legalnotice>
       <para>
-        Dieses Programm ist freie Software. Sie können es unter 
-        den Bedingungen der GNU General Public License, 
-        wie von der Free Software Foundation veröffentlicht, 
-        weitergeben und/oder modifizieren, entweder gemäß Version 2 
-        der Lizenz oder (nach Ihrer Option) jeder späteren Version. 
+        Dieses Programm ist freie Software. Sie können es unter
+        den Bedingungen der GNU General Public License,
+        wie von der Free Software Foundation veröffentlicht,
+        weitergeben und/oder modifizieren, entweder gemäß Version 3
+        der Lizenz oder (nach Ihrer Option) jeder späteren Version.
       </para>
       <para>
-        Die Veröffentlichung dieses Programms erfolgt in der 
-        Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE 
-        IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der 
-        MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. 
-        Details finden Sie in der GNU General Public License. 
+        Die Veröffentlichung dieses Programms erfolgt in der
+        Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE
+        IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der
+        MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK.
+        Details finden Sie in der GNU General Public License.
       </para>
       <para>
-        Sie sollten ein Exemplar der GNU General Public License 
-        zusammen mit diesem Programm erhalten haben. Falls nicht, 
-        schreiben Sie an die Free Software Foundation, Inc., 
-        51 Franklin St, Fifth Floor, Boston, MA 02110, USA. 
+        Sie sollten ein Exemplar der GNU General Public License
+        zusammen mit diesem Programm erhalten haben. Falls nicht,
+        &lt;http://www.gnu.org/licenses/&gt;.
       </para>
     </legalnotice>
     
@@ -95,14 +93,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   <!-- =========================== Introduction =========================== -->
   
   <chapter id="chapIntroduction">
-    <title> Einführung </title>
+    <title>Einführung</title>
     
     <para>
       Dieses Kapitel beschreibt WeeChat und die Vorraussetzungen für die Installation.
     </para>
     
     <section id="secDescription">
-      <title> Beschreibung </title>
+      <title>Beschreibung</title>
       
       <para>
         WeeChat (Wee Enhanced Environment for Chat) ist ein freier
@@ -166,10 +164,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     </section>
     
     <section id="secPreRequis">
-      <title> Vorraussetzungen </title>
+      <title>Vorraussetzungen</title>
       
       <para>
-        Um WeeChat zu installieren, werden <emphasis> gebraucht </emphasis>:
+        Um WeeChat zu installieren, werden <emphasis>gebraucht</emphasis>:
         <itemizedlist>
           <listitem>
             <para>
@@ -224,7 +222,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     </para>
     
     <section id="secBinaryPackages">
-      <title> Binäre Pakete </title>
+      <title>Binäre Pakete</title>
       
       <para>
         Binäre Pakete sind für die folgenden Distributionen verfügbar:
@@ -257,7 +255,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     </section>
     
     <section id="secSourcePackage">
-      <title> Quellcode-Pakete </title>
+      <title>Quellcode-Pakete</title>
       
       <para>
         Alles was sie tun müssen, ist in einer Konsole oder einem Terminal aufzurufen:
@@ -303,7 +301,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   <!-- ============================== Usage =============================== -->
   
   <chapter id="chapUsage">
-    <title> Nutzung </title>
+    <title>Nutzung</title>
     
     <para>
       Dieses Kapitel erklärt, wie Weechat zu starten ist, die zu verwendenden
@@ -452,26 +450,26 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     </section>
     
     <section id="secKeyboardShortcuts">
-      <title> Tastenkombinationen </title>
+      <title>Tastenkombinationen</title>
       
       <para>
         <informaltable colsep="0" frame="none">
           <tgroup cols="2">
             <thead>
               <row>
-                <entry> Tastenkombination </entry>
-                <entry> Wirkung </entry>
+                <entry>Tastenkombination</entry>
+                <entry>Wirkung</entry>
               </row>
             </thead>
             <tbody>
               <row>
-                <entry>Links</entry>
+                <entry>Links / Strg + B</entry>
                 <entry>
                   Gehe zum vorherigen Zeichen in der Kommandozeile
                 </entry>
               </row>
               <row>
-                <entry>Rechts</entry>
+                <entry>Rechts / Strg + F</entry>
                 <entry>
                   Gehe zum nächsten Zeichen in der Kommandozeile
                 </entry>
@@ -494,6 +492,37 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                   Gehe zum Anfang der Kommandozeile
                 </entry>
               </row>
+              <!-- TRANSLATION NEEDED -->
+              <row>
+                <entry>Strg + C dann B</entry>
+                <entry>
+                  Insert code for bold text.
+                </entry>
+              </row>
+              <row>
+                <entry>Strg + C dann C</entry>
+                <entry>
+                  Insert code for colored text.
+                </entry>
+              </row>
+              <row>
+                <entry>Strg + C dann O</entry>
+                <entry>
+                  Insert code for color reset.
+                </entry>
+              </row>
+              <row>
+                <entry>Strg + C dann R</entry>
+                <entry>
+                  Insert code for reverse color.
+                </entry>
+              </row>
+              <row>
+                <entry>Strg + C dann U</entry>
+                <entry>
+                  Insert code for underlined text.
+                </entry>
+              </row>
               <row>
                 <entry>Ende / Strg + E</entry>
                 <entry>
@@ -519,6 +548,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                   (zwei Mal: suche nach dem genauen Text)
                 </entry>
               </row>
+              <row>
+                <entry>Strg + S dann Strg + U</entry>
+                <entry>
+                  <!-- TRANSLATION NEEDED -->
+                  Set unread marker on all buffers
+                </entry>
+              </row>
               <row>
                 <entry>Strg + T</entry>
                 <entry>
@@ -550,7 +586,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                 </entry>
               </row>
               <row>
-                <entry>Entfernen</entry>
+                <entry>Entfernen / Strg + D</entry>
                 <entry>
                   Lösche das nächste Zeichen in der Kommandozeile
                 </entry>
@@ -596,19 +632,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                 </entry>
               </row>
               <row>
-                <entry>Alt + Seite hoch / Alt + Seite runter </entry>
+                <entry>Alt + Seite hoch / Alt + Seite runter</entry>
                 <entry>
                   Ein paar Zeilen hoch / runter im Verlauf des Buffers
                 </entry>
               </row>
               <row>
-                <entry> Alt + Pos1 / Alt + Ende </entry>
+                <entry>Alt + Pos1 / Alt + Ende</entry>
                 <entry>
                   Gehe zum Anfang / Ende des Puffers
                 </entry>
               </row>
               <row>
-                <entry> F5 / Alt + Links </entry>
+                <entry>F5 / Alt + Links</entry>
                 <entry>
                   Gehe zum vorherigen Puffer
                 </entry>
@@ -699,6 +735,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                   Schalte zum letzten Puffer
                 </entry>
               </row>
+              <row>
+                <entry>Alt + J then Alt + P</entry>
+                <entry>
+                  <!-- TRANSLATION NEEDED -->
+                  Switch to buffer previously displayed
+                </entry>
+              </row>
               <row>
                 <entry>Alt + J dann Alt + R</entry>
                 <entry>
@@ -782,7 +825,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     </section>
     
     <section id="secCommandLine">
-      <title> Kommandozeile </title>
+      <title>Kommandozeile</title>
       
       <para>
         Die WeeChat Kommandozeile (am Ende des Fensters) lässt sie Nachrichten an einen
@@ -812,7 +855,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
       
       <para>
         Wenn die Option IRC-Farben ("<literal>irc_colors_send</literal>") senden 
-        angeschaltet ist, können sie Farbcodierung und Attribute wiefolgt verwenden:
+        angeschaltet ist, können sie Farbcodierung und Attribute wiefolgt verwenden
+        <!-- TRANSLATION NEEDED -->
+        (press Ctrl-C then following letter, with optional value):
         <informaltable colsep="0" frame="none">
           <tgroup cols="2">
             <thead>
@@ -823,20 +868,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
             </thead>
             <tbody>
               <row>
-                <entry>%B</entry>
+                <entry>^Cb</entry>
                 <entry>
                   Fett (bold)
                 </entry>
               </row>
               <row>
-                <entry>%Cxx</entry>
+                <entry>^Ccxx</entry>
                 <entry>
                   Textfarbe "<literal>xx</literal>" (color)
                   (siehe Farbtabelle)
                 </entry>
               </row>
               <row>
-                <entry>%Cxx,yy</entry>
+                <entry>^Ccxx,yy</entry>
                 <entry>
                   Textfarbe "<literal>xx</literal>"
                   und Hintergrund "<literal>yy</literal>"
@@ -844,29 +889,23 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                 </entry>
               </row>
               <row>
-                <entry>%O</entry>
+                <entry>^Co</entry>
                 <entry>
                   Schalte Farben und Attribute ab
                 </entry>
               </row>
               <row>
-                <entry>%R</entry>
+                <entry>^Cr</entry>
                 <entry>
                   umgedrehte Farben (tausche Textfarbe mit Hintergrundfarbe)
                 </entry>
               </row>
               <row>
-                <entry>%U</entry>
+                <entry>^Cu</entry>
                 <entry>
                   Unterstreiche Text
                 </entry>
               </row>
-              <row>
-                <entry>%%</entry>
-                <entry>
-                  Schreibe ein einzelnes "<literal>%</literal>"
-                </entry>
-              </row>
             </tbody>
           </tgroup>
         </informaltable>
@@ -875,7 +914,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
       </para>
       
       <para>
-        Farbcodes für %C:
+        Farbcodes für ^Cc:
         <informaltable colsep="0" frame="none">
           <tgroup cols="2">
             <thead>
@@ -899,11 +938,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
               </row>
               <row>
                 <entry>03</entry>
-                <entry>dunkles Grün </entry>
+                <entry>dunkles Grün</entry>
               </row>
               <row>
                 <entry>04</entry>
-                <entry>helles Rot </entry>
+                <entry>helles Rot</entry>
               </row>
               <row>
                 <entry>05</entry>
@@ -911,43 +950,43 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
               </row>
               <row>
                 <entry>06</entry>
-                <entry> Magenta </entry>
+                <entry>Magenta</entry>
               </row>
               <row>
                 <entry>07</entry>
-                <entry> Orange </entry>
+                <entry>Orange</entry>
               </row>
               <row>
                 <entry>08</entry>
-                <entry> Gelb </entry>
+                <entry>Gelb</entry>
               </row>
               <row>
                 <entry>09</entry>
-                <entry> helles Grün</entry>
+                <entry>helles Grün</entry>
               </row>
               <row>
                 <entry>10</entry>
-                <entry> Cyan </entry>
+                <entry>Cyan</entry>
               </row>
               <row>
                 <entry>11</entry>
-                <entry> helles Cyan</entry>
+                <entry>helles Cyan</entry>
               </row>
               <row>
                 <entry>12</entry>
-                <entry> helles Blau </entry>
+                <entry>helles Blau</entry>
               </row>
               <row>
                 <entry>13</entry>
-                <entry> helles Magenta </entry>
+                <entry>helles Magenta</entry>
               </row>
               <row>
                 <entry>14</entry>
-                <entry> Grau </entry>
+                <entry>Grau</entry>
               </row>
               <row>
                 <entry>15</entry>
-                <entry> helles Grau (Weiss)</entry>
+                <entry>helles Grau (Weiss)</entry>
               </row>
             </tbody>
           </tgroup>
@@ -958,20 +997,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
         Beispiel: Anzeige von "<literal>hello everybody!</literal>" mit
         "<literal>hello</literal>" fett in hellem Blau, und 
         "<literal>everybody</literal>" unterstrichen in hellem Rot:
-<screen><userinput>%C12%Bhello%B%C04%U everybody%U%C!</userinput></screen>
+<screen><userinput>^Cc12^Cbhello^Cb^Cc04^Cu everybody^Cu^Cc!</userinput></screen>
       </para>
       
     </section>
     
     <section id="secWeeChatIRCCommands">
-      <title>WeeChat / IRC Kommandos </title>
+      <title>WeeChat / IRC Kommandos</title>
       
       <para>
         Dieses Kapitel listet alle WeeChat- und IRC-Kommandos auf.
       </para>
       
       <section id="secWeeChatCommands">
-        <title> WeeChat Kommandos </title>
+        <title>WeeChat Kommandos</title>
         
         <para>
           &weechat_commands.xml;
@@ -980,15 +1019,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
       </section>
       
       <section id="secKeyFunctions">
-        <title> Funktionen </title>
+        <title>Funktionen</title>
         
         <para>
           <informaltable colsep="0" frame="none">
             <tgroup cols="2">
               <thead>
                 <row>
-                  <entry> Funktion </entry>
-                  <entry> Beschreibung </entry>
+                  <entry>Funktion</entry>
+                  <entry>Beschreibung</entry>
                 </row>
               </thead>
               <tbody>
@@ -1003,7 +1042,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
       </section>
       
       <section id="secIRCCommands">
-        <title> IRC Kommandos </title>
+        <title>IRC Kommandos</title>
         
         <para>
           &irc_commands.xml;
@@ -1014,7 +1053,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     </section>
     
     <section id="secConfigurationFile">
-      <title> Konfigurationsdatei </title>
+      <title>Konfigurationsdatei</title>
       
       <para>
         Liste der Optionen für die Konfigurationsdatei:
@@ -1022,11 +1061,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
           <tgroup cols="5">
             <thead>
               <row>
-                <entry> Option </entry>
-                <entry> Typ </entry>
-                <entry> Wert </entry>
-                <entry> Default </entry>
-                <entry> Beschreibung </entry>
+                <entry>Option</entry>
+                <entry>Typ</entry>
+                <entry>Wert</entry>
+                <entry>Default</entry>
+                <entry>Beschreibung</entry>
               </row>
             </thead>
             <tbody>
@@ -1044,8 +1083,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
           <tgroup cols="2">
             <thead>
               <row>
-                <entry> Schlüsselwort </entry>
-                <entry> Farbe </entry>
+                <entry>Schlüsselwort</entry>
+                <entry>Farbe</entry>
               </row>
             </thead>
             <tbody>
@@ -1055,59 +1094,59 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
               </row>
               <row>
                 <entry><literal>black</literal></entry>
-                <entry> Schwarz </entry>
+                <entry>Schwarz</entry>
               </row>
               <row>
                 <entry><literal>red</literal></entry>
-                <entry> dunkles Rot </entry>
+                <entry>dunkles Rot</entry>
               </row>
               <row>
                 <entry><literal>lightred</literal></entry>
-                <entry> helles Rot </entry>
+                <entry>helles Rot</entry>
               </row>
               <row>
                 <entry><literal>green</literal></entry>
-                <entry> dunkles Grün </entry>
+                <entry>dunkles Grün</entry>
               </row>
               <row>
                 <entry><literal>lightgreen</literal></entry>
-                <entry> helles Grün </entry>
+                <entry>helles Grün</entry>
               </row>
               <row>
                 <entry><literal>brown</literal></entry>
-                <entry> Braun </entry>
+                <entry>Braun</entry>
               </row>
               <row>
                 <entry><literal>yellow</literal></entry>
-                <entry> Gelb </entry>
+                <entry>Gelb</entry>
               </row>
               <row>
                 <entry><literal>blue</literal></entry>
-                <entry> dunkles Blau </entry>
+                <entry>dunkles Blau</entry>
               </row>
               <row>
                 <entry><literal>lightblue</literal></entry>
-                <entry> helles Blau </entry>
+                <entry>helles Blau</entry>
               </row>
               <row>
                 <entry><literal>magenta</literal></entry>
-                <entry> dunkles Magenta </entry>
+                <entry>dunkles Magenta</entry>
               </row>
               <row>
                 <entry><literal>lightmagenta</literal></entry>
-                <entry> helles Magenta </entry>
+                <entry>helles Magenta</entry>
               </row>
               <row>
                 <entry><literal>cyan</literal></entry>
-                <entry> dunkles Cyan </entry>
+                <entry>dunkles Cyan</entry>
               </row>
               <row>
                 <entry><literal>lightcyan</literal></entry>
-                <entry> helles Cyan </entry>
+                <entry>helles Cyan</entry>
               </row>
               <row>
                 <entry><literal>white</literal></entry>
-                <entry> Weiss </entry>
+                <entry>Weiss</entry>
               </row>
             </tbody>
           </tgroup>
@@ -1117,7 +1156,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     </section>
     
     <section id="secFIFOpipe">
-      <title> Remote-Schnittstelle (FIFO pipe) </title>
+      <title>Remote-Schnittstelle (FIFO pipe)</title>
       
       <para>
         Sie können WeeChat auch extern steuern, indem sie Kommandos oder Text
@@ -1176,7 +1215,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 <screen>
 #!/bin/sh
 if [ $# -eq 1 ]; then
-    for fifo in $(/bin/ls ~/.weechat/weechat_fifo_* 2>/dev/null); do
+    for fifo in ~/.weechat/weechat_fifo_*
+    do
         echo -e "$1" >$fifo
     done
 fi
@@ -1224,7 +1264,7 @@ fi
     </section>
     
     <section id="secWriteAPlugin">
-      <title> Ein Plugin schreiben </title>
+      <title>Ein Plugin schreiben</title>
       
       <para>
         Das Plugin muss die Datei "weechat-plugin.h" einbinden (verfügbar 
@@ -1241,7 +1281,7 @@ fi
             <thead>
               <row>
                 <entry>Variable</entry>
-                <entry> Beschreibung </entry>
+                <entry>Beschreibung</entry>
               </row>
             </thead>
             <tbody>
@@ -1742,6 +1782,63 @@ plugin->exec_on_files (plugin, "/tmp", &amp;callback);
               </listitem>
             </itemizedlist>
           </para>
+          <!-- TRANSLATION NEEDED -->
+          <para>
+            To display colored text, there are following codes:
+            <informaltable colsep="0" frame="none">
+              <tgroup cols="2">
+                <thead>
+                  <row>
+                    <entry>Code</entry>
+                    <entry>Description</entry>
+                  </row>
+                </thead>
+                <tbody>
+                  <row>
+                    <entry>0x02</entry>
+                    <entry>
+                      bold text
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x03 + "xx"</entry>
+                    <entry>
+                      text color "<literal>xx</literal>"
+                      (see <xref linkend="secAPI_get_irc_color" /> for colors)
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x03 + "xx,yy"</entry>
+                    <entry>
+                      text color "<literal>xx</literal>"
+                      and background "<literal>yy</literal>"
+                      (see <xref linkend="secAPI_get_irc_color" /> for colors)
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x0F</entry>
+                    <entry>
+                      disable color and attributes
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x12</entry>
+                    <entry>
+                      reverse video (revert text color with background)
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x1F</entry>
+                    <entry>
+                      underlined text
+                    </entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </informaltable>
+            Note: the same code (without number for 0x03) may be used to stop
+            the attribute.
+          </para>
           <para>
             Rückgabewert: keiner.
           </para>
@@ -1751,6 +1848,10 @@ plugin->exec_on_files (plugin, "/tmp", &amp;callback);
 plugin->print (plugin, NULL, NULL, "hello");
 plugin->print (plugin, NULL, "#weechat", "hello");
 plugin->print (plugin, "freenode", "#weechat", "hello");
+plugin->print (plugin, NULL, NULL,
+               "Test: \x02 Fett \x0F\x03%02d Blau \x03%02d Grün",
+               plugin->get_irc_color (plugin, "blue"),
+               plugin->get_irc_color (plugin, "green"));
 </screen>
           </para>
         </section>
@@ -1783,6 +1884,10 @@ plugin->print (plugin, "freenode", "#weechat", "hello");
               </listitem>
             </itemizedlist>
           </para>
+          <para>
+            <!-- TRANSLATION NEEDED -->
+            To display colored text, see <xref linkend="secAPI_print" />.
+          </para>
           <para>
             Rückgabewert: keiner.
           </para>
@@ -2153,6 +2258,15 @@ msg_handler = plugin->msg_handler_add (plugin, "KICK",
                           <entry><literal>%-</literal></entry>
                           <entry>keine Vervollständigung für das Argument</entry>
                         </row>
+                        <row>
+                          <entry><literal>%*</literal></entry>
+                          <entry>
+                            <!-- TRANSLATION NEEDED -->
+                            repeat last completion for all following arguments
+                            (this code has to be at the end of completion
+                            template, preceded by "|")
+                          </entry>
+                        </row>
                         <row>
                           <entry><literal>%a</literal></entry>
                           <entry>Alias</entry>
@@ -2169,7 +2283,7 @@ msg_handler = plugin->msg_handler_add (plugin, "KICK",
                         </row>
                         <row>
                           <entry><literal>%C</literal></entry>
-                          <entry>Channels des gegenwärtigen Servers</entry>
+                          <entry>alle channels (inklusive Queries)</entry>
                         </row>
                         <row>
                           <entry><literal>%f</literal></entry>
@@ -2195,6 +2309,12 @@ msg_handler = plugin->msg_handler_add (plugin, "KICK",
                           <entry><literal>%m</literal></entry>
                           <entry>Nicknamen des gegenwärtigen Servers</entry>
                         </row>
+                        <row>
+                          <entry><literal>%M</literal></entry>
+                          <entry>
+                            Nicks auf dem gegenwärtigen Server (in allen offenen Channeln)
+                          </entry>
+                        </row>
                         <row>
                           <entry><literal>%n</literal></entry>
                           <entry>Nicknamen des gegenwärtigen Channels</entry>
@@ -2551,27 +2671,7 @@ keyb_handler = plugin->keyboard_handler_add (plugin, &amp;my_keyb);
               </listitem>
               <listitem>
                 <para>
-                  <option>event</option> : Ereignis, siehe folgende Tabelle:
-                  <informaltable colsep="0" frame="none">
-                    <tgroup cols="2">
-                      <thead>
-                        <row>
-                          <entry>Ereignis</entry>
-                          <entry>Beschreibung</entry>
-                        </row>
-                      </thead>
-                      <tbody>
-                        <row>
-                          <entry><literal>buffer_open</literal></entry>
-                          <entry>ein Puffer wurde geöffnet</entry>
-                        </row>
-                        <row>
-                          <entry><literal>buffer_close</literal></entry>
-                          <entry>ein Puffer wurde geschlossen</entry>
-                        </row>
-                      </tbody>
-                    </tgroup>
-                  </informaltable>
+                  <option>event</option> : Ereignis (siehe folgende Tabelle)
                 </para>
               </listitem>
               <listitem>
@@ -2587,8 +2687,8 @@ keyb_handler = plugin->keyboard_handler_add (plugin, &amp;my_keyb);
                   </command>
                 </para>
                 <para>
-                  Argument argc wird auf 1 gesetzt, argv[0] ist die Nummer des Puffers, der
-                  geöffnet oder geschlossen wird.
+                  <!-- TRANSLATION NEEDED -->
+                  Arguments depend on event (see table below).
                 </para>
               </listitem>
               <listitem>
@@ -2605,6 +2705,44 @@ keyb_handler = plugin->keyboard_handler_add (plugin, &amp;my_keyb);
               </listitem>
             </itemizedlist>
           </para>
+          <!-- TRANSLATION NEEDED -->
+          <para>
+            List of events:
+            <informaltable colsep="0" frame="none">
+              <tgroup cols="3">
+                <thead>
+                  <row>
+                    <entry>Ereignis</entry>
+                    <entry>Beschreibung</entry>
+                    <entry>Arguments</entry>
+                  </row>
+                </thead>
+                <tbody>
+                  <row>
+                    <entry><literal>buffer_open</literal></entry>
+                    <entry>ein Puffer wurde geöffnet</entry>
+                    <entry>
+                      argc = 1, argv = { buffer number }
+                    </entry>
+                  </row>
+                  <row>
+                    <entry><literal>buffer_close</literal></entry>
+                    <entry>ein Puffer wurde geschlossen</entry>
+                    <entry>
+                      argc = 1, argv = { buffer number }
+                    </entry>
+                  </row>
+                  <row>
+                    <entry><literal>buffer_move</literal></entry>
+                    <entry>a buffer was moved</entry>
+                    <entry>
+                      argc = 2, argv = { new buffer number, old number }
+                    </entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </informaltable>
+          </para>
           <para>
             Rückgabewert: Pointer auf den neuen Ereignishandler.
           </para>
@@ -3058,7 +3196,7 @@ plugin->exec_command (plugin, "freenode", "#weechat", "hello");
                         </row>
                         <row>
                           <entry><literal>weechat_libdir</literal></entry>
-                          <entry>WeeChat-Systemverzeichnis (Bibliotheken) </entry>
+                          <entry>WeeChat-Systemverzeichnis (Bibliotheken)</entry>
                         </row>
                         <row>
                           <entry><literal>weechat_sharedir</literal></entry>
@@ -4744,6 +4882,117 @@ void weechat_plugin_end (t_weechat_plugin *plugin)
       
     </section>
     
+    <section id="secCharset">
+      <title>Zeichensatz Plugin</title>
+      
+      <para>
+        Das Zeichensatz-Plugin ermöglicht das Ver- und Entschlüsseln von Daten
+        auf 3 Ebenen: Global, pro Server oder pro Channel.
+        Das Plugin ist optional, wird jedoch empfohlen: wenn es nicht geladen ist, 
+        kann WeeChat nur UTF-8-Daten lesen und schreiben.
+      </para>
+      
+      <para>
+        Das Zeichensatz-Plugin sollte beim Start von WeeChat automatisch geladen
+        werden.
+        Um sicherzustellen, dass das Plugin geladen wurde, versuchen Sie:
+        "<literal>/charset</literal>".
+        Wenn der Befehl nicht gefunden wird, laden Sie das Plugin manuell mit dem Befehl:
+        <screen>/plugin load charset</screen>
+        Wenn das Plugin nicht gefunden wird, kompilieren Sie WeeChat erneut mit Plugin-
+        und Zeichensatz-Support
+      </para>
+      
+      <para>
+        Wenn das Zeichensatz-Plugin startet, zeigt es den Terminalzeichensatz
+        und den internen Zeichensatz an. Der Terminalzeichensatz hängt von
+        den LOCALE-Einstellungen ab, der interne ist UTF-8.
+        Zum Beispiel:
+<screen>
+-P- Charset plugin starting, terminal charset: ISO-8859-15 (WeeChat internal: UTF-8)
+</screen>
+      </para>
+            
+      <section id="secCharsetSettings">
+        <title>Einstellungen</title>
+        
+        <itemizedlist>
+          <listitem>
+            <para>
+              Um den globalen Zeichensatz zum Kodieren und Dekodieren festzulegen, benutzen Sie den
+              "<literal>/setp</literal>" Befehl.
+              Zum Beispiel:
+<screen>
+/setp charset.global.decode = ISO-8859-15
+/setp charset.global.encode = ISO-8859-15
+</screen>
+              Wenn der Zeichensatz zum Dekodieren nicht gesetzt ist (z.B. beim ersten
+              Start des Plugins), wird es automatisch auf den Terminalzeichensatz
+              eingestellt (wenn es nicht UTF-8 ist) oder als Voreinstellung auf
+              "<literal>ISO-8859-1</literal>" gesetzt.
+              Der voreingestellte Enkodierungszeichensatz ist leer, so dass in der
+              Voreinstellung mit dem internen Zeichensatz (UTF-8) enkodiert wird.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Um den Serverzeichensatz festzulegen, benutzen Sie den
+              "<literal>/charset</literal>"-Befehl im Server-Puffer.
+              Wenn Sie nur einen Zeichensatz vorgeben, wird dieser automatisch
+              zum Enkodieren und Dekodieren verwendet.
+              Zum Beispiel:
+              <screen>/charset ISO-8859-15</screen>
+              Das ist gleichbedeutend mit:
+<screen>
+/charset decode ISO-8859-15
+/charset encode ISO-8859-15
+</screen>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Um den zeichensatz im Channel (oder einem privatem Chat) festzulegen, 
+              müssen Sie den gleichen Befehl wie für den Server benutzen, jedoch in
+              dem Channel-Puffer (oder Query-Puffer) 
+            </para>
+          </listitem>
+        </itemizedlist>
+                
+      </section>
+      
+      <section id="secCharsetFAQ">
+        <title>FAQ</title>
+        
+        <para>
+          Wenn Sie Probleme mit den Zeichen oder dem Zeichensatz-Plugin haben:
+          <itemizedlist>
+            <listitem>
+              <para>
+                überprüfen Sie, ob weechat-curses zu libcursesw gelinkt ist
+                (Achtung: Wird bei den meisten, jedoch nicht bei allen Distributionen benötigt):
+                <screen>ldd /pfad/zu/weechat-curses</screen>
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                überprüfen Sie die Zeichensatz-Zeile im Server-Puffer, dort sollten ISO-XXXXXX
+                oder UTF-8 für den Terminal-Zeichensatz stehen. Wenn Sie dort ANSI_X3.4-1968
+                oder andere Werte sehen, sind Ihre LOCALES eventuell falsch eingestellt.
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                Setze die globalen Dekodier-Einstellungen, z.B.:
+                <screen>/setp charset.global.decode = ISO-8859-15</screen>
+              </para>
+            </listitem>
+          </itemizedlist>
+        </para>
+        
+      </section>
+      
+    </section>
+    
     <section id="secScriptsPlugins">
       <title>Skript-Plugins</title>
       
@@ -5105,6 +5354,10 @@ weechat.set_charset("ISO-8859-1")
               </listitem>
             </itemizedlist>
           </para>
+          <para>
+            <!-- TRANSLATION NEEDED -->
+            To display colored text, see <xref linkend="secAPI_print" />.
+          </para>
           <para>
             Rückgabewert: 1 bei Erfolg, 0 wenn ein Fehler aufgetreten ist
           </para>
@@ -5115,6 +5368,7 @@ weechat.set_charset("ISO-8859-1")
 weechat::print("message");
 weechat::print("message", "#weechat");
 weechat::print("message", "#weechat", "freenode");
+weechat::print("test: \x0305 rot \x0F normal");
 
 # python
 weechat.prnt("message")
@@ -5134,6 +5388,72 @@ weechat.print("message", "#weechat", "freenode")
           </para>
         </section>
         
+        <!-- TRANSLATION NEEDED -->
+        <section id="secScript_print_server">
+          <title>print_server</title>
+          
+          <para>
+            Perl prototype:
+            <command>
+              weechat::print_server(message)
+            </command>
+          </para>
+          <para>
+            Python prototype:
+            <command>
+              weechat.print_server(message)
+            </command>
+          </para>
+          <para>
+            Ruby prototype:
+            <command>
+              Weechat.print_server(message)
+            </command>
+          </para>
+          <para>
+            Lua prototype:
+            <command>
+              weechat.print_server(message)
+            </command>
+          </para>
+          <para>
+            Display a message on server buffer.
+          </para>
+          <para>
+            Arguments:
+            <itemizedlist>
+              <listitem>
+                <para>
+                  <option>message</option>: message
+                </para>
+              </listitem>
+            </itemizedlist>
+          </para>
+          <para>
+            To display colored text, see <xref linkend="secAPI_print" />.
+          </para>
+          <para>
+            Return value: 1 if success, 0 if an error occurred.
+          </para>
+          <para>
+            Examples:
+<screen>
+# perl
+weechat::print_server("message");
+weechat::print_server("test: \x0305 rot \x0F normal");
+
+# python
+weechat.print_server("message")
+
+# ruby
+Weechat.print_server("message")
+
+-- lua
+weechat.print_server("message")
+</screen>
+          </para>
+        </section>
+                
         <section id="secScript_print_infobar">
           <title>print_infobar</title>
           

doc/de/weechat_commands.xml

@@ -22,15 +22,28 @@ Argumente: Argumente f
 <programlisting>
 Puffer verwalten
 
- Aktion: Pufferaktion:
-   move: Puffer in der Liste bewegen (kann auch relativ sein, wie -1)
-  close: Puffer schließen (eine Part-Message kann optional angegeben werden)
-   list: alle offenen Puffer auflisten (Standardaktion)
- notify: Notify-Level für Puffer festlegen (0=nie, 1=bei hervorgehobenen Nachrichten, 2=1+persönliche Nachricht, 3=2+join/part)
-         (wenn der Befehl in einem Server Puffer ausgeführt wird, setzt er den Default-Notify-Level für den ganzen Server)
-Server
-Channel: gehe zum Puffer mit Servernamen oder Channelnamen
- Nummer: gehe zu Puffer mit dieser Nummer
+ action: action to do:
+   move: move buffer in the list (may be relative, for example -1)
+  close: close buffer (optional arg is part message, for a channel)
+   list: list open buffers (no parameter implies this list)
+ notify: set notify level for buffer (0=never, 1=highlight, 2=1+msg, 3=2+join/part)
+         (when executed on server buffer, this sets default notify level for whole server)
+ scroll: scroll in history (may be relative, and may end by a letter: s=sec, m=min, h=hour, d=day, M=month, y=year); if there is only letter, then scroll to beginning of this item
+
+ number: jump to buffer by number
+server,
+channel: jump to buffer by server and/or channel name
+
+Examples:
+        move buffer: /buffer move 5
+       close buffer: /buffer close this is part msg
+         set notify: /buffer notify 2
+    scroll 1 day up: /buffer scroll 1d  ==  /buffer scroll -1d  ==  /buffer scroll -24h
+scroll to beginning
+        of this day: /buffer scroll d
+ scroll 15 min down: /buffer scroll +15m
+  scroll 20 msgs up: /buffer scroll -20
+   jump to #weechat: /buffer #weechat
 
 </programlisting>
 <command>builtin  Befehl</command>
@@ -41,7 +54,7 @@ Befehl: auszuf
 
 
 </programlisting>
-<command>clear  [-all | Nummer]</command>
+<command>clear  [-all | number [number ...]]</command>
 <programlisting>
 Fenster leeren
 
@@ -49,18 +62,25 @@ Fenster leeren
 Nummer: lösche den Puffer mit der angegebenen Nummer
 
 </programlisting>
-<command>connect  [Servername]</command>
+<command>connect  [-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port port] [-ipv6] [-ssl]]</command>
 <programlisting>
-mit einem Server verbinden
+mit Server verbinden
 
-Servername: Zielserver
+      -all: connect to all servers
+servername: internal server name to connect
+   -nojoin: do not join any channel (even if autojoin is enabled on server)
+  hostname: hostname to connect, creating temporary server
+      port: port for server (integer, default is 6667)
+      ipv6: use IPv6 protocol
+       ssl: use SSL protocol
 
 </programlisting>
-<command>disconnect  [Servername]</command>
+<command>disconnect  [-all | Servername [Servername ...]]</command>
 <programlisting>
-Serververbindung trennen
+Serververbindung(en) trennen
 
-Servername: Name des zu trennenden Servers
+      -all: Trenne von allen Servern
+servername: Servername, von dem getrennt werden soll
 
 </programlisting>
 <command>dcc  Aktion [Nickname [Datei]]</command>
@@ -72,12 +92,13 @@ Nickname: Empf
     Datei: zu versendende (lokal vorliegende) Datei
 
 </programlisting>
-<command>debug  dump | windows</command>
+<command>debug  dump | buffer | windows</command>
 <programlisting>
 Debugging-Nachricht ausgeben
 
-dump: Speicherabbild im WeeChat-Logfile ablegen (wie nach einem Programmabsturz)
-windows: zeigt Fensterdaten an
+   dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)
+ buffer: dump buffer content with hexadecimal values in log file
+windows: display windows tree
 
 </programlisting>
 <command>help  [Befehl]</command>
@@ -135,21 +156,13 @@ autoload: lade automatisch alle Plugins im System- oder Benutzerverzeichnis
 Ohne Argument, listet /plugin alle geladenen Plugins auf.
 
 </programlisting>
-<command>server  [Servername] | [Servername Hostname Port [-auto | -noauto] [-ipv6] [-ssl] [-pwd Passwort] [-nicks Nick1 Nick2 Nick3] [-username Benutzername] [-realname Name] [-command Befehl] [-autojoin Channel[,Channel]] ] | [del Servername]</command>
+<command>reconnect  [-all [-nojoin] | servername [servername ...] [-nojoin]]</command>
 <programlisting>
-Auflisten, Hinzufügen oder Entfernen von Servern
+mit einem Server oder mehreren Servern neu verbinden
 
-Servername: anzuzeigender Servername
-  Hostname: Name oder IP-Adresse des Servers
-      Port: Port des Servers
-      ipv6: IPv6 benutzen
-       ssl: SSL benutzen
-  Passwort: Serverpasswort
-     Nick1: erster Nickname
-     Nick2: zweiter Nickname
-     Nick3: dritter Nicname
-  Benutzername: Benutzername
-  Realname: voller Name des Benutzers
+      -all: reconnect to all servers
+servername: server name to reconnect
+   -nojoin: do not join any channel (even if autojoin is enabled on server)
 
 </programlisting>
 <command>save  [Datei]</command>
@@ -158,6 +171,34 @@ Konfiguration abspeichern
 
 Datei: Name der zu speichernden Konfigurationsdatei
 
+</programlisting>
+<command>server  [list [servername]] | [listfull [servername]] | [add servername hostname [-port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname realname] [-command command] [-autojoin channel[,channel]] ] | [copy servername newservername] | [rename servername newservername] | [keep servername] | [del servername]</command>
+<programlisting>
+Auflisten, Hinzufügen oder Entfernen von Servern
+
+      list: list servers (no parameter implies this list)
+  listfull: list servers with detailed info for each server
+       add: create a new server
+servername: server name, for internal and display use
+  hostname: name or IP address of server
+      port: port for server (integer, default is 6667)
+      temp: create temporary server (not saved in config file)
+      auto: automatically connect to server when WeeChat starts
+    noauto: do not connect to server when WeeChat starts (default)
+      ipv6: use IPv6 protocol
+       ssl: use SSL protocol
+  password: password for server
+     nick1: first nick for server
+     nick2: alternate nick for server
+     nick3: second alternate nick for server
+  username: user name
+  realname: real name of user
+      copy: duplicate a server
+    rename: rename a server
+      keep: keep server in config file (for temporary servers only)
+       del: delete a server
+   deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
+
 </programlisting>
 <command>set  [Option [ = Wert]]</command>
 <programlisting>
@@ -201,11 +242,13 @@ Bei jedem Argument steht '*' f
 Ohne Argumente listet /unignore alle definierten /ignore-Regeln auf.
 
 </programlisting>
-<command>upgrade</command>
+<command>upgrade  [path_to_binary]</command>
 <programlisting>
 aktualisiert WeeChat ohne die Verbindung zum Server zu trennen
 
-Dieser Befehl wird auf dem Weechat-Binary ausgeführt, daher sollte dieses kompiliert oder mit einem Paketmanager installiert sein, bevor der Befehl ausgeführt wird.
+path_to_binary: path to WeeChat binary (default is current binary)
+
+This command run again a WeeChat binary, so it should have been compiled or installed with a package manager before running this command.
 
 </programlisting>
 <command>uptime  [-o]</command>

doc/en/Makefile.am

@@ -2,7 +2,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 LANGCODE = en

doc/en/config.xml

@@ -108,7 +108,7 @@
   <entry>integer</entry>
   <entry>between 0 and 100</entry>
   <entry>0</entry>
-  <entry>Max size for nicklist (width or height, depending on look_nicklist_position (0 = no max size; if min == max and &gt; 0, then size is fixed))</entry>
+  <entry>Max size for nicklist (width or height, depending on look_nicklist_position (0 = no max size; if min = max and &gt; 0, then size is fixed))</entry>
 </row>
 <row>
   <entry><option>look_nicklist_separator</option></entry>
@@ -180,6 +180,13 @@
   <entry>20</entry>
   <entry>Max size for aligning nick and other messages (should be &gt;= to look_align_size)</entry>
 </row>
+<row>
+  <entry><option>look_align_text_offset</option></entry>
+  <entry>integer</entry>
+  <entry>between -1 and 64</entry>
+  <entry>-1</entry>
+  <entry>Offset for aligning lines of messages (except first lines), default is -1 (align after nick), a null or positive value is offset after beginning of line</entry>
+</row>
 <row>
   <entry><option>look_nick_completor</option></entry>
   <entry>string</entry>
@@ -194,6 +201,13 @@
   <entry>'[]-^'</entry>
   <entry>Chars ignored for nick completion</entry>
 </row>
+<row>
+  <entry><option>look_nick_completion_smart</option></entry>
+  <entry>boolean</entry>
+  <entry>'on' or 'off'</entry>
+  <entry>'on'</entry>
+  <entry>Smart completion for nicks (completes with last speakers first)</entry>
+</row>
 <row>
   <entry><option>look_nick_complete_first</option></entry>
   <entry>boolean</entry>
@@ -250,6 +264,13 @@
   <entry>0</entry>
   <entry>Max length of names in hotlist (0 = no limit)</entry>
 </row>
+<row>
+  <entry><option>look_hotlist_sort</option></entry>
+  <entry>string</entry>
+  <entry>'group_time_asc', 'group_time_desc', 'group_number_asc', 'group_number_desc', 'number_asc', 'number_desc'</entry>
+  <entry>'group_time_asc'</entry>
+  <entry>Hotlist sort type (group_time_asc (default), group_time_desc, group_number_asc, group_number_desc, number_asc, number_desc)</entry>
+</row>
 <row>
   <entry><option>look_day_change</option></entry>
   <entry>boolean</entry>
@@ -266,8 +287,8 @@
 </row>
 <row>
   <entry><option>look_read_marker</option></entry>
-  <entry>string</entry>
-  <entry>any string</entry>
+  <entry>char</entry>
+  <entry>any char</entry>
   <entry>' '</entry>
   <entry>Use a marker on servers/channels to show first unread line</entry>
 </row>
@@ -278,6 +299,13 @@
   <entry>'[%n(%m)] '</entry>
   <entry>Format for input prompt ('%c' is replaced by channel or server, '%n' by nick and '%m' by nick modes)</entry>
 </row>
+<row>
+  <entry><option>look_paste_max_lines</option></entry>
+  <entry>integer</entry>
+  <entry>between 0 and 2147483647</entry>
+  <entry>3</entry>
+  <entry>Max number of lines for paste without asking user (0 = disable this feature)</entry>
+</row>
 <row>
   <entry><option>col_real_white</option></entry>
   <entry>boolean</entry>
@@ -551,6 +579,20 @@
   <entry>'cyan'</entry>
   <entry>Color for input text (delimiters)</entry>
 </row>
+<row>
+  <entry><option>col_input_text_not_found</option></entry>
+  <entry>color</entry>
+  <entry>Curses or Gtk color</entry>
+  <entry>'red'</entry>
+  <entry>Color for text not found</entry>
+</row>
+<row>
+  <entry><option>col_input_actions</option></entry>
+  <entry>color</entry>
+  <entry>Curses or Gtk color</entry>
+  <entry>'lightgreen'</entry>
+  <entry>Color for actions in input window</entry>
+</row>
 <row>
   <entry><option>col_input_bg</option></entry>
   <entry>color</entry>
@@ -607,6 +649,13 @@
   <entry>'yellow'</entry>
   <entry>Color for voice symbol</entry>
 </row>
+<row>
+  <entry><option>col_nick_user</option></entry>
+  <entry>color</entry>
+  <entry>Curses or Gtk color</entry>
+  <entry>'blue'</entry>
+  <entry>Color for user symbol</entry>
+</row>
 <row>
   <entry><option>col_nick_more</option></entry>
   <entry>color</entry>
@@ -934,7 +983,7 @@
   <entry>boolean</entry>
   <entry>'on' or 'off'</entry>
   <entry>'on'</entry>
-  <entry>Allow user to send colors with special codes (%B=bold, %Cxx,yy=color, %U=underline, %R=reverse)</entry>
+  <entry>Allow user to send colors with special codes (^Cb=bold, ^Ccxx=color, ^Ccxx,yy=color+background, ^Cu=underline, ^Cr=reverse)</entry>
 </row>
 <row>
   <entry><option>irc_send_unknown_commands</option></entry>
@@ -1212,7 +1261,7 @@
 <row>
   <entry><option>server_command_delay</option></entry>
   <entry>integer</entry>
-  <entry>between 0 and 5</entry>
+  <entry>between 0 and 3600</entry>
   <entry>0</entry>
   <entry>Delay (in seconds) after command was executed (example: give some time for authentication)</entry>
 </row>

doc/en/key_functions.xml

@@ -157,6 +157,10 @@
   <entry><literal>jump_last_buffer</literal></entry>
   <entry>jump to last buffer</entry>
 </row>
+<row>
+  <entry><literal>jump_previous_buffer</literal></entry>
+  <entry>jump to previous buffer</entry>
+</row>
 <row>
   <entry><literal>jump_server</literal></entry>
   <entry>jump to server buffer</entry>
@@ -181,6 +185,10 @@
   <entry><literal>scroll_unread</literal></entry>
   <entry>scroll to first unread line in buffer</entry>
 </row>
+<row>
+  <entry><literal>set_unread</literal></entry>
+  <entry>set unread marker on all buffers</entry>
+</row>
 <row>
   <entry><literal>hotlist_clear</literal></entry>
   <entry>clear hotlist</entry>

doc/en/weechat.en.xml

@@ -8,7 +8,7 @@ Copyright (c) 2003-2007 by FlashCode <flashcode@flashtux.org>
 
 This manual 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 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
 This manual is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@ 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, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 -->
 
@@ -36,7 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
   <bookinfo>
     
-    <title>WeeChat 0.2.4 - User guide</title>
+    <title>WeeChat 0.2.6 - User guide</title>
     <subtitle>Fast, light and extensible IRC client</subtitle>
     
     <author>
@@ -56,7 +55,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
       <para>
         This manual 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 2 of the License, or
+        the Free Software Foundation; either version 3 of the License, or
         (at your option) any later version.
       </para>
       <para>
@@ -67,9 +66,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
       </para>
       <para>
         You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the Free Software
-        Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-        02110-1301 USA
+        along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
       </para>
     </legalnotice>
     
@@ -461,13 +458,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
             </thead>
             <tbody>
               <row>
-                <entry>Left arrow</entry>
+                <entry>Left arrow / Ctrl + B</entry>
                 <entry>
                   Go to previous char in command line
                 </entry>
               </row>
               <row>
-                <entry>Right arrow</entry>
+                <entry>Right arrow / Ctrl + F</entry>
                 <entry>
                   Go to next char in command line
                 </entry>
@@ -490,6 +487,36 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                   Go to the beginning of command line
                 </entry>
               </row>
+              <row>
+                <entry>Ctrl + C then B</entry>
+                <entry>
+                  Insert code for bold text.
+                </entry>
+              </row>
+              <row>
+                <entry>Ctrl + C then C</entry>
+                <entry>
+                  Insert code for colored text.
+                </entry>
+              </row>
+              <row>
+                <entry>Ctrl + C then O</entry>
+                <entry>
+                  Insert code for color reset.
+                </entry>
+              </row>
+              <row>
+                <entry>Ctrl + C then R</entry>
+                <entry>
+                  Insert code for reverse color.
+                </entry>
+              </row>
+              <row>
+                <entry>Ctrl + C then U</entry>
+                <entry>
+                  Insert code for underlined text.
+                </entry>
+              </row>
               <row>
                 <entry>End / Ctrl + E</entry>
                 <entry>
@@ -515,6 +542,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                   (two times: search exact text)
                 </entry>
               </row>
+              <row>
+                <entry>Ctrl + S then Ctrl + U</entry>
+                <entry>
+                  Set unread marker on all buffers
+                </entry>
+              </row>
               <row>
                 <entry>Ctrl + T</entry>
                 <entry>
@@ -546,7 +579,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                 </entry>
               </row>
               <row>
-                <entry>Delete</entry>
+                <entry>Delete / Ctrl + D</entry>
                 <entry>
                   Delete next char in command line
                 </entry>
@@ -695,6 +728,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                   Switch to last buffer
                 </entry>
               </row>
+              <row>
+                <entry>Alt + J then Alt + P</entry>
+                <entry>
+                  Switch to buffer previously displayed
+                </entry>
+              </row>
               <row>
                 <entry>Alt + J then Alt + R</entry>
                 <entry>
@@ -807,7 +846,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
       
       <para>
         If option for sending IRC colors ("<literal>irc_colors_send</literal>")
-        is enabled, you can use color codes and attributes, as follow:
+        is enabled, you can use color codes and attributes, as follow (press
+        Ctrl-C then following letter, with optional value):
         <informaltable colsep="0" frame="none">
           <tgroup cols="2">
             <thead>
@@ -818,20 +858,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
             </thead>
             <tbody>
               <row>
-                <entry>%B</entry>
+                <entry>^Cb</entry>
                 <entry>
                   bold text
                 </entry>
               </row>
               <row>
-                <entry>%Cxx</entry>
+                <entry>^Ccxx</entry>
                 <entry>
                   text color "<literal>xx</literal>"
                   (see colors table below)
                 </entry>
               </row>
               <row>
-                <entry>%Cxx,yy</entry>
+                <entry>^Ccxx,yy</entry>
                 <entry>
                   text color "<literal>xx</literal>"
                   and background "<literal>yy</literal>"
@@ -839,38 +879,32 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                 </entry>
               </row>
               <row>
-                <entry>%O</entry>
+                <entry>^Co</entry>
                 <entry>
                   disable color and attributes
                 </entry>
               </row>
               <row>
-                <entry>%R</entry>
+                <entry>^Cr</entry>
                 <entry>
                   reverse video (revert text color with background)
                 </entry>
               </row>
               <row>
-                <entry>%U</entry>
+                <entry>^Cu</entry>
                 <entry>
                   underlined text
                 </entry>
               </row>
-              <row>
-                <entry>%%</entry>
-                <entry>
-                  display one "<literal>%</literal>"
-                </entry>
-              </row>
             </tbody>
           </tgroup>
         </informaltable>
-        Note: the same code (without number for %C) may be used to stop the
+        Note: the same code (without number for ^Cc) may be used to stop the
         attribute.
       </para>
       
       <para>
-        Color codes for %C are:
+        Color codes for ^Cc are:
         <informaltable colsep="0" frame="none">
           <tgroup cols="2">
             <thead>
@@ -953,7 +987,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
         Example: display of "<literal>hello everybody!</literal>" with
         "<literal>hello</literal>" in light blue bold, and 
         "<literal>everybody</literal>" in light red underlined:
-<screen><userinput>%C12%Bhello%B%C04%U everybody%U%C!</userinput></screen>
+<screen><userinput>^Cc12^Cbhello^Cb^Cc04^Cu everybody^Cu^Cc!</userinput></screen>
       </para>
       
     </section>
@@ -1173,7 +1207,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 <screen>
 #!/bin/sh
 if [ $# -eq 1 ]; then
-    for fifo in $(/bin/ls ~/.weechat/weechat_fifo_* 2>/dev/null); do
+    for fifo in ~/.weechat/weechat_fifo_*
+    do
         echo -e "$1" >$fifo
     done
 fi
@@ -1745,6 +1780,62 @@ plugin->exec_on_files (plugin, "/tmp", &amp;callback);
               </listitem>
             </itemizedlist>
           </para>
+          <para>
+            To display colored text, there are following codes:
+            <informaltable colsep="0" frame="none">
+              <tgroup cols="2">
+                <thead>
+                  <row>
+                    <entry>Code</entry>
+                    <entry>Description</entry>
+                  </row>
+                </thead>
+                <tbody>
+                  <row>
+                    <entry>0x02</entry>
+                    <entry>
+                      bold text
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x03 + "xx"</entry>
+                    <entry>
+                      text color "<literal>xx</literal>"
+                      (see <xref linkend="secAPI_get_irc_color" /> for colors)
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x03 + "xx,yy"</entry>
+                    <entry>
+                      text color "<literal>xx</literal>"
+                      and background "<literal>yy</literal>"
+                      (see <xref linkend="secAPI_get_irc_color" /> for colors)
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x0F</entry>
+                    <entry>
+                      disable color and attributes
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x12</entry>
+                    <entry>
+                      reverse video (revert text color with background)
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x1F</entry>
+                    <entry>
+                      underlined text
+                    </entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </informaltable>
+            Note: the same code (without number for 0x03) may be used to stop
+            the attribute.
+          </para>
           <para>
             Return value: none.
           </para>
@@ -1754,6 +1845,10 @@ plugin->exec_on_files (plugin, "/tmp", &amp;callback);
 plugin->print (plugin, NULL, NULL, "hello");
 plugin->print (plugin, NULL, "#weechat", "hello");
 plugin->print (plugin, "freenode", "#weechat", "hello");
+plugin->print (plugin, NULL, NULL,
+               "test: \x02 bold \x0F\x03%02d blue \x03%02d green",
+               plugin->get_irc_color (plugin, "blue"),
+               plugin->get_irc_color (plugin, "green"));
 </screen>
           </para>
         </section>
@@ -1786,6 +1881,9 @@ plugin->print (plugin, "freenode", "#weechat", "hello");
               </listitem>
             </itemizedlist>
           </para>
+          <para>
+            To display colored text, see <xref linkend="secAPI_print" />.
+          </para>
           <para>
             Return value: none.
           </para>
@@ -2170,6 +2268,14 @@ msg_handler = plugin->msg_handler_add (plugin, "KICK",
                           <entry><literal>%-</literal></entry>
                           <entry>no completion for argument</entry>
                         </row>
+                        <row>
+                          <entry><literal>%*</literal></entry>
+                          <entry>
+                            repeat last completion for all following arguments
+                            (this code has to be at the end of completion
+                            template, preceded by "|")
+                          </entry>
+                        </row>
                         <row>
                           <entry><literal>%a</literal></entry>
                           <entry>alias</entry>
@@ -2186,7 +2292,7 @@ msg_handler = plugin->msg_handler_add (plugin, "KICK",
                         </row>
                         <row>
                           <entry><literal>%C</literal></entry>
-                          <entry>channels of current server</entry>
+                          <entry>all channels (including queries)</entry>
                         </row>
                         <row>
                           <entry><literal>%f</literal></entry>
@@ -2212,6 +2318,12 @@ msg_handler = plugin->msg_handler_add (plugin, "KICK",
                           <entry><literal>%m</literal></entry>
                           <entry>nick on current server</entry>
                         </row>
+                        <row>
+                          <entry><literal>%M</literal></entry>
+                          <entry>
+                            nicks on current server (on all open channels)
+                          </entry>
+                        </row>
                         <row>
                           <entry><literal>%n</literal></entry>
                           <entry>nicks of current channel</entry>
@@ -2578,27 +2690,7 @@ keyb_handler = plugin->keyboard_handler_add (plugin, &amp;my_keyb);
               </listitem>
               <listitem>
                 <para>
-                  <option>event</option> : event, see table below:
-                  <informaltable colsep="0" frame="none">
-                    <tgroup cols="2">
-                      <thead>
-                        <row>
-                          <entry>Event</entry>
-                          <entry>Description</entry>
-                        </row>
-                      </thead>
-                      <tbody>
-                        <row>
-                          <entry><literal>buffer_open</literal></entry>
-                          <entry>a buffer was open</entry>
-                        </row>
-                        <row>
-                          <entry><literal>buffer_close</literal></entry>
-                          <entry>a buffer was closed</entry>
-                        </row>
-                      </tbody>
-                    </tgroup>
-                  </informaltable>
+                  <option>event</option> : event (see table below)
                 </para>
               </listitem>
               <listitem>
@@ -2614,8 +2706,7 @@ keyb_handler = plugin->keyboard_handler_add (plugin, &amp;my_keyb);
                   </command>
                 </para>
                 <para>
-                  Argument argc is set to 1, argv[0] is number of buffer
-                  open/closed.
+                  Arguments depend on event (see table below).
                 </para>
               </listitem>
               <listitem>
@@ -2632,6 +2723,43 @@ keyb_handler = plugin->keyboard_handler_add (plugin, &amp;my_keyb);
               </listitem>
             </itemizedlist>
           </para>
+          <para>
+            List of events:
+            <informaltable colsep="0" frame="none">
+              <tgroup cols="3">
+                <thead>
+                  <row>
+                    <entry>Event</entry>
+                    <entry>Description</entry>
+                    <entry>Arguments</entry>
+                  </row>
+                </thead>
+                <tbody>
+                  <row>
+                    <entry><literal>buffer_open</literal></entry>
+                    <entry>a buffer was open</entry>
+                    <entry>
+                      argc = 1, argv = { buffer number }
+                    </entry>
+                  </row>
+                  <row>
+                    <entry><literal>buffer_close</literal></entry>
+                    <entry>a buffer was closed</entry>
+                    <entry>
+                      argc = 1, argv = { buffer number }
+                    </entry>
+                  </row>
+                  <row>
+                    <entry><literal>buffer_move</literal></entry>
+                    <entry>a buffer was moved</entry>
+                    <entry>
+                      argc = 2, argv = { new buffer number, old number }
+                    </entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </informaltable>
+          </para>
           <para>
             Return value: pointer to new event handler.
           </para>
@@ -4782,6 +4910,114 @@ void weechat_plugin_end (t_weechat_plugin *plugin)
       
     </section>
     
+    <section id="secCharset">
+      <title>Charset plugin</title>
+      
+      <para>
+        Charset plugin lets you encode or decode data using charsets, with 3
+        levels: global, by server, or by channel.
+        This plugin is optional, but recommended: if it's not loaded, WeeChat
+        can only read/write UTF-8 data.
+      </para>
+      
+      <para>
+        Charset plugin should be autoloaded by WeeChat at startup.
+        To be sure plugin is loaded, try:
+        "<literal>/charset</literal>".
+        If command is not found, then load plugin with command:
+        <screen>/plugin load charset</screen>
+        If plugin is not found, then you should compile again WeeChat with
+        plugins and Charset support.
+      </para>
+      
+      <para>
+        When Charset plugin starts, it displays terminal and internal charsets.
+        Terminal charset depends on your locale, and internal is UTF-8.
+        For example :
+<screen>
+-P- Charset plugin starting, terminal charset: ISO-8859-15 (WeeChat internal: UTF-8)
+</screen>
+      </para>
+            
+      <section id="secCharsetSettings">
+        <title>Settings</title>
+        
+        <itemizedlist>
+          <listitem>
+            <para>
+              To set global decode and encode charsets, use
+              "<literal>/setp</literal>" command.
+              For example:
+<screen>
+/setp charset.global.decode = ISO-8859-15
+/setp charset.global.encode = ISO-8859-15
+</screen>
+              If global decode charset is not set (for example during first
+              load of Charset plugin), it will be automatically set to terminal
+              charset (if it's different from UTF-8), or by default to
+              "<literal>ISO-8859-1</literal>".
+              Default encode value is empty, so it sends by default with
+              internal charset (UTF-8).
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              To set server charset, use "<literal>/charset</literal>" command
+              on server buffer.
+              If you give only charset, then it will set "decode" and "encode"
+              values.
+              For example:
+              <screen>/charset ISO-8859-15</screen>
+              It's equivalent to:
+<screen>
+/charset decode ISO-8859-15
+/charset encode ISO-8859-15
+</screen>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              To set channel (or private) charset, use same commands as server,
+              but on channel (or private) buffer.
+            </para>
+          </listitem>
+        </itemizedlist>
+                
+      </section>
+      
+      <section id="secCharsetFAQ">
+        <title>FAQ</title>
+        
+        <para>
+          If you have problems with chars or accents using Charset plugin:
+          <itemizedlist>
+            <listitem>
+              <para>
+                check that weechat-curses is linked to libncursesw (warning:
+                needed on most distributions but not all) :
+                <screen>ldd /path/to/weechat-curses</screen>
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                check charset line (on server buffer), you should see
+                ISO-XXXXXX or UTF-8 for terminal charset. If you see
+                ANSI_X3.4-1968 or other values, probably your locale is wrong.
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                setup global decode value, for example:
+                <screen>/setp charset.global.decode = ISO-8859-15</screen>
+              </para>
+            </listitem>
+          </itemizedlist>
+        </para>
+        
+      </section>
+      
+    </section>
+    
     <section id="secScriptsPlugins">
       <title>Scripts plugins</title>
       
@@ -5142,6 +5378,9 @@ weechat.set_charset("ISO-8859-1")
               </listitem>
             </itemizedlist>
           </para>
+          <para>
+            To display colored text, see <xref linkend="secAPI_print" />.
+          </para>
           <para>
             Return value: 1 if success, 0 if an error occurred.
           </para>
@@ -5152,6 +5391,7 @@ weechat.set_charset("ISO-8859-1")
 weechat::print("message");
 weechat::print("message", "#weechat");
 weechat::print("message", "#weechat", "freenode");
+weechat::print("test: \x0305 red \x0F normal");
 
 # python
 weechat.prnt("message")
@@ -5171,6 +5411,71 @@ weechat.print("message", "#weechat", "freenode")
           </para>
         </section>
         
+        <section id="secScript_print_server">
+          <title>print_server</title>
+          
+          <para>
+            Perl prototype:
+            <command>
+              weechat::print_server(message)
+            </command>
+          </para>
+          <para>
+            Python prototype:
+            <command>
+              weechat.print_server(message)
+            </command>
+          </para>
+          <para>
+            Ruby prototype:
+            <command>
+              Weechat.print_server(message)
+            </command>
+          </para>
+          <para>
+            Lua prototype:
+            <command>
+              weechat.print_server(message)
+            </command>
+          </para>
+          <para>
+            Display a message on server buffer.
+          </para>
+          <para>
+            Arguments:
+            <itemizedlist>
+              <listitem>
+                <para>
+                  <option>message</option>: message
+                </para>
+              </listitem>
+            </itemizedlist>
+          </para>
+          <para>
+            To display colored text, see <xref linkend="secAPI_print" />.
+          </para>
+          <para>
+            Return value: 1 if success, 0 if an error occurred.
+          </para>
+          <para>
+            Examples:
+<screen>
+# perl
+weechat::print_server("message");
+weechat::print_server("test: \x0305 red \x0F normal");
+
+# python
+weechat.print_server("message")
+
+# ruby
+Weechat.print_server("message")
+
+-- lua
+weechat.print_server("message")
+</screen>
+          </para>
+        </section>
+        
         <section id="secScript_print_infobar">
           <title>print_infobar</title>
           

doc/en/weechat_commands.xml

@@ -28,9 +28,22 @@ manage buffers
    list: list open buffers (no parameter implies this list)
  notify: set notify level for buffer (0=never, 1=highlight, 2=1+msg, 3=2+join/part)
          (when executed on server buffer, this sets default notify level for whole server)
+ scroll: scroll in history (may be relative, and may end by a letter: s=sec, m=min, h=hour, d=day, M=month, y=year); if there is only letter, then scroll to beginning of this item
+
+ number: jump to buffer by number
 server,
 channel: jump to buffer by server and/or channel name
- number: jump to buffer by number
+
+Examples:
+        move buffer: /buffer move 5
+       close buffer: /buffer close this is part msg
+         set notify: /buffer notify 2
+    scroll 1 day up: /buffer scroll 1d  ==  /buffer scroll -1d  ==  /buffer scroll -24h
+scroll to beginning
+        of this day: /buffer scroll d
+ scroll 15 min down: /buffer scroll +15m
+  scroll 20 msgs up: /buffer scroll -20
+   jump to #weechat: /buffer #weechat
 
 </programlisting>
 <command>builtin  command</command>
@@ -41,7 +54,7 @@ command: command to execute (a '/' is automatically added if not found at beginn
 
 
 </programlisting>
-<command>clear  [-all | number]</command>
+<command>clear  [-all | number [number ...]]</command>
 <programlisting>
 clear window(s)
 
@@ -49,17 +62,24 @@ clear window(s)
 number: clear buffer by number
 
 </programlisting>
-<command>connect  [servername]</command>
+<command>connect  [-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port port] [-ipv6] [-ssl]]</command>
 <programlisting>
-connect to a server
+connect to server(s)
 
-servername: server name to connect
+      -all: connect to all servers
+servername: internal server name to connect
+   -nojoin: do not join any channel (even if autojoin is enabled on server)
+  hostname: hostname to connect, creating temporary server
+      port: port for server (integer, default is 6667)
+      ipv6: use IPv6 protocol
+       ssl: use SSL protocol
 
 </programlisting>
-<command>disconnect  [servername]</command>
+<command>disconnect  [-all | servername [servername ...]]</command>
 <programlisting>
-disconnect from a server
+disconnect from server(s)
 
+      -all: disconnect from all servers
 servername: server name to disconnect
 
 </programlisting>
@@ -72,11 +92,12 @@ nickname: nickname to send file or chat
     file: filename (on local host)
 
 </programlisting>
-<command>debug  dump | windows</command>
+<command>debug  dump | buffer | windows</command>
 <programlisting>
 print debug messages
 
    dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)
+ buffer: dump buffer content with hexadecimal values in log file
 windows: display windows tree
 
 </programlisting>
@@ -134,13 +155,35 @@ autoload: autoload plugins in system or user directory
 Without argument, /plugin command lists loaded plugins.
 
 </programlisting>
-<command>server  [servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname realname] [-command command] [-autojoin channel[,channel]] ] | [del servername]</command>
+<command>reconnect  [-all [-nojoin] | servername [servername ...] [-nojoin]]</command>
+<programlisting>
+reconnect to server(s)
+
+      -all: reconnect to all servers
+servername: server name to reconnect
+   -nojoin: do not join any channel (even if autojoin is enabled on server)
+
+</programlisting>
+<command>save  [file]</command>
+<programlisting>
+save config to disk
+
+file: filename for writing config
+
+</programlisting>
+<command>server  [list [servername]] | [listfull [servername]] | [add servername hostname [-port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname realname] [-command command] [-autojoin channel[,channel]] ] | [copy servername newservername] | [rename servername newservername] | [keep servername] | [del servername]</command>
 <programlisting>
 list, add or remove servers
 
+      list: list servers (no parameter implies this list)
+  listfull: list servers with detailed info for each server
+       add: create a new server
 servername: server name, for internal and display use
   hostname: name or IP address of server
-      port: port for server (integer)
+      port: port for server (integer, default is 6667)
+      temp: create temporary server (not saved in config file)
+      auto: automatically connect to server when WeeChat starts
+    noauto: do not connect to server when WeeChat starts (default)
       ipv6: use IPv6 protocol
        ssl: use SSL protocol
   password: password for server
@@ -149,13 +192,11 @@ servername: server name, for internal and display use
      nick3: second alternate nick for server
   username: user name
   realname: real name of user
-
-</programlisting>
-<command>save  [file]</command>
-<programlisting>
-save config to disk
-
-file: filename for writing config
+      copy: duplicate a server
+    rename: rename a server
+      keep: keep server in config file (for temporary servers only)
+       del: delete a server
+   deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
 
 </programlisting>
 <command>set  [option [ = value]]</command>
@@ -200,11 +241,13 @@ For each argument, '*' means all.
 Without argument, /unignore command lists all defined ignore.
 
 </programlisting>
-<command>upgrade</command>
+<command>upgrade  [path_to_binary]</command>
 <programlisting>
 upgrade WeeChat without disconnecting from servers
 
-This command run again WeeChat binary, so it should have been compiled or installed with a package manager before running this command.
+path_to_binary: path to WeeChat binary (default is current binary)
+
+This command run again a WeeChat binary, so it should have been compiled or installed with a package manager before running this command.
 
 </programlisting>
 <command>uptime  [-o]</command>

doc/fr/Makefile.am

@@ -2,7 +2,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 LANGCODE = fr

doc/fr/config.xml

@@ -87,28 +87,28 @@
   <entry>booléen</entry>
   <entry>'on' ou 'off'</entry>
   <entry>'on'</entry>
-  <entry>Afficher la fenêtre des utilisateurs (pour les fenêtres de canaux)</entry>
+  <entry>Afficher la fenêtre des pseudos (pour les fenêtres de canaux)</entry>
 </row>
 <row>
   <entry><option>look_nicklist_position</option></entry>
   <entry>chaîne</entry>
   <entry>'left', 'right', 'top', 'bottom'</entry>
   <entry>'right'</entry>
-  <entry>Position de la fenêtre d'utilisateurs (haut (top), gauche (left), droite (right, par défaut), bas (bottom))</entry>
+  <entry>Position de la fenêtre des pseudos (haut (top), gauche (left), droite (right, par défaut), bas (bottom))</entry>
 </row>
 <row>
   <entry><option>look_nicklist_min_size</option></entry>
   <entry>entier</entry>
   <entry>entre 0 et 100</entry>
   <entry>0</entry>
-  <entry>Taille minimum pour la fenêtre d'utilisateurs (largeur ou hauteur, selon look_nicklist_position (0 = pas de taille minimum))</entry>
+  <entry>Taille minimum pour la fenêtre des pseudos (largeur ou hauteur, selon look_nicklist_position (0 = pas de taille minimum))</entry>
 </row>
 <row>
   <entry><option>look_nicklist_max_size</option></entry>
   <entry>entier</entry>
   <entry>entre 0 et 100</entry>
   <entry>0</entry>
-  <entry>Taille maximum pour la fenêtre d'utilisateurs (largeur ou hauteur, selon look_nicklist_position (0 = pas de taille maximum; si min == max et &gt; 0, alors la taille est fixe))</entry>
+  <entry>Taille maximum pour la fenêtre des pseudos (largeur ou hauteur, selon look_nicklist_position (0 = pas de taille maximum; si min = max et &gt; 0, alors la taille est fixe))</entry>
 </row>
 <row>
   <entry><option>look_nicklist_separator</option></entry>
@@ -122,21 +122,21 @@
   <entry>chaîne</entry>
   <entry>toute chaîne</entry>
   <entry>'-cmd-'</entry>
-  <entry>Texte à afficher en lieu et place du nom d'utilisateur lorsque la connexion n'est pas active</entry>
+  <entry>Texte à afficher en lieu et place du pseudo lorsque la connexion n'est pas active</entry>
 </row>
 <row>
   <entry><option>look_nickmode</option></entry>
   <entry>booléen</entry>
   <entry>'on' ou 'off'</entry>
   <entry>'on'</entry>
-  <entry>Afficher le mode de l'utilisateur ((half)op/voice) devant chaque utilisateur</entry>
+  <entry>Afficher le mode du pseudo ((half)op/voice) devant chaque utilisateur</entry>
 </row>
 <row>
   <entry><option>look_nickmode_empty</option></entry>
   <entry>booléen</entry>
   <entry>'on' ou 'off'</entry>
   <entry>'off'</entry>
-  <entry>Afficher un espace si le mode utilisateur n'est pas (half)op/voice</entry>
+  <entry>Afficher un espace si le mode du pseudo n'est pas (half)op/voice</entry>
 </row>
 <row>
   <entry><option>look_nick_prefix</option></entry>
@@ -180,6 +180,13 @@
   <entry>20</entry>
   <entry>Taille maximum pour l'alignement des pseudos et autres messages (doit être &gt;= à look_align_size)</entry>
 </row>
+<row>
+  <entry><option>look_align_text_offset</option></entry>
+  <entry>entier</entry>
+  <entry>entre -1 et 64</entry>
+  <entry>-1</entry>
+  <entry>Décalage pour aligner les lignes des messages (exceptées les premières lignes), par défaut -1 (aligner après le pseudo), une valeur nulle ou positive est le décalage après le début de la ligne</entry>
+</row>
 <row>
   <entry><option>look_nick_completor</option></entry>
   <entry>chaîne</entry>
@@ -194,6 +201,13 @@
   <entry>'[]-^'</entry>
   <entry>Caractères à ignorer pour la complétion des pseudos</entry>
 </row>
+<row>
+  <entry><option>look_nick_completion_smart</option></entry>
+  <entry>booléen</entry>
+  <entry>'on' ou 'off'</entry>
+  <entry>'on'</entry>
+  <entry>Complétion intelligente pour les pseudos (complète d'abord avec les personnes qui ont parlé récemment)</entry>
+</row>
 <row>
   <entry><option>look_nick_complete_first</option></entry>
   <entry>booléen</entry>
@@ -250,6 +264,13 @@
   <entry>0</entry>
   <entry>Nombre maximum des noms dans la liste d'activité (0 = pas de limite)</entry>
 </row>
+<row>
+  <entry><option>look_hotlist_sort</option></entry>
+  <entry>chaîne</entry>
+  <entry>'group_time_asc', 'group_time_desc', 'group_number_asc', 'group_number_desc', 'number_asc', 'number_desc'</entry>
+  <entry>'group_time_asc'</entry>
+  <entry>Type de tri pour la liste d'activité (group_time_asc (par défaut), group_time_desc, group_number_asc, group_number_desc, number_asc, number_desc)</entry>
+</row>
 <row>
   <entry><option>look_day_change</option></entry>
   <entry>booléen</entry>
@@ -266,8 +287,8 @@
 </row>
 <row>
   <entry><option>look_read_marker</option></entry>
-  <entry>chaîne</entry>
-  <entry>toute chaîne</entry>
+  <entry>caractère</entry>
+  <entry>tout caractère</entry>
   <entry>' '</entry>
   <entry>Utiliser un marqueur sur les serveurs/canaux pour montrer la première ligne non lue</entry>
 </row>
@@ -278,6 +299,13 @@
   <entry>'[%n(%m)] '</entry>
   <entry>Format pour l'invite de la zone de saisie ('%c' est remplacé par le canal ou serveur, '%n' par le pseudo et '%m' par les modes du pseudo)</entry>
 </row>
+<row>
+  <entry><option>look_paste_max_lines</option></entry>
+  <entry>entier</entry>
+  <entry>entre 0 et 2147483647</entry>
+  <entry>3</entry>
+  <entry>Nombre maximum de lignes pour la détection de collage sans demander à l'utilisateur (0 = désactiver cette fonctionnalité)</entry>
+</row>
 <row>
   <entry><option>col_real_white</option></entry>
   <entry>booléen</entry>
@@ -304,7 +332,7 @@
   <entry>couleur</entry>
   <entry>couleur Curses ou Gtk</entry>
   <entry>'lightmagenta'</entry>
-  <entry>Couleur pour les '+' lors du scroll sur le titre</entry>
+  <entry>Couleur pour les '+' lors du défilement du titre</entry>
 </row>
 <row>
   <entry><option>col_title_bg</option></entry>
@@ -374,14 +402,14 @@
   <entry>couleur</entry>
   <entry>couleur Curses ou Gtk</entry>
   <entry>'lightcyan'</entry>
-  <entry>Couleur pour les noms d'utilisateurs dans les actions (fenêtre de discussion)</entry>
+  <entry>Couleur pour les pseudos dans les actions (fenêtre de discussion)</entry>
 </row>
 <row>
   <entry><option>col_chat_host</option></entry>
   <entry>couleur</entry>
   <entry>couleur Curses ou Gtk</entry>
   <entry>'cyan'</entry>
-  <entry>Couleur pour les noms de machines (fenêtre de discussion)</entry>
+  <entry>Couleur pour les hôtes (fenêtre de discussion)</entry>
 </row>
 <row>
   <entry><option>col_chat_channel</option></entry>
@@ -551,6 +579,20 @@
   <entry>'cyan'</entry>
   <entry>Couleur pour le texte saisi (délimiteurs)</entry>
 </row>
+<row>
+  <entry><option>col_input_text_not_found</option></entry>
+  <entry>couleur</entry>
+  <entry>couleur Curses ou Gtk</entry>
+  <entry>'red'</entry>
+  <entry>Couleur pour le texte non trouvé</entry>
+</row>
+<row>
+  <entry><option>col_input_actions</option></entry>
+  <entry>couleur</entry>
+  <entry>couleur Curses ou Gtk</entry>
+  <entry>'lightgreen'</entry>
+  <entry>Couleur pour les actions dans la fenêtre de saisie</entry>
+</row>
 <row>
   <entry><option>col_input_bg</option></entry>
   <entry>couleur</entry>
@@ -607,12 +649,19 @@
   <entry>'yellow'</entry>
   <entry>Couleur pour le symbole voix</entry>
 </row>
+<row>
+  <entry><option>col_nick_user</option></entry>
+  <entry>couleur</entry>
+  <entry>couleur Curses ou Gtk</entry>
+  <entry>'blue'</entry>
+  <entry>Couleur pour le symbole utilisateur</entry>
+</row>
 <row>
   <entry><option>col_nick_more</option></entry>
   <entry>couleur</entry>
   <entry>couleur Curses ou Gtk</entry>
   <entry>'lightmagenta'</entry>
-  <entry>Couleur pour les '+' lors du scroll sur les pseudos</entry>
+  <entry>Couleur pour les '+' lors du défilement des pseudos</entry>
 </row>
 <row>
   <entry><option>col_nick_sep</option></entry>
@@ -934,7 +983,7 @@
   <entry>booléen</entry>
   <entry>'on' ou 'off'</entry>
   <entry>'on'</entry>
-  <entry>Autorise l'utilisateur à envoyer des couleurs avec des codes spéciaux (%B=gras, %Cxx,yy=couleur, %U=souligné, %R=inversé)</entry>
+  <entry>Autorise l'utilisateur à envoyer des couleurs avec des codes spéciaux (^Cb=gras, ^Cxx=couleur, ^Ccxx,yy=couleur+fond, ^Cu=souligné, ^Cr=inversé)</entry>
 </row>
 <row>
   <entry><option>irc_send_unknown_commands</option></entry>
@@ -1025,7 +1074,7 @@
   <entry>booléen</entry>
   <entry>'on' ou 'off'</entry>
   <entry>'on'</entry>
-  <entry>Continuer automatiquement les transferts dcc si la connexion avec la machine distante a été perdue</entry>
+  <entry>Continuer automatiquement les transferts dcc si la connexion avec l'hôte a été perdue</entry>
 </row>
 <row>
   <entry><option>proxy_use</option></entry>
@@ -1053,7 +1102,7 @@
   <entry>chaîne</entry>
   <entry>toute chaîne</entry>
   <entry>''</entry>
-  <entry>Adresse du serveur proxy (IP ou nom)</entry>
+  <entry>Adresse du serveur proxy (IP ou nom de machine)</entry>
 </row>
 <row>
   <entry><option>proxy_port</option></entry>
@@ -1212,7 +1261,7 @@
 <row>
   <entry><option>server_command_delay</option></entry>
   <entry>entier</entry>
-  <entry>entre 0 et 5</entry>
+  <entry>entre 0 et 3600</entry>
   <entry>0</entry>
   <entry>Délai (en secondes) après exécution de la commande (exemple: donner du temps pour l'authentification)</entry>
 </row>

doc/fr/irc_commands.xml

@@ -36,17 +36,17 @@ message: message pour l'absence (si pas de message donn
 </programlisting>
 <command>ban  [canal] [pseudo [pseudo ...]]</command>
 <programlisting>
-bannit des pseudos ou masques
+bannit des pseudos ou hôtes
 
  canal: nom du canal pour le bannissement
-pseudo: pseudo ou masque pour le bannissement
+pseudo: pseudo ou hôte pour le bannissement
 
 </programlisting>
 <command>ctcp  cible type [arguments]</command>
 <programlisting>
 envoyer un message CTCP (Client-To-Client Protocol)
 
-    cible: utilisateur à qui envoyer le CTCP
+    cible: pseudo à qui envoyer le CTCP
      type: type de CTCP (exemples: "version", "ping", etc...)
 arguments: arguments pour le CTCP
 
@@ -61,12 +61,12 @@ message_de_fin: message de fin (affich
 </programlisting>
 <command>dehalfop  [pseudo [pseudo]]</command>
 <programlisting>
-retire le statut de demi-opérateur du canal à/aux nick(s)
+retire le statut de demi-opérateur du canal à/aux pseudo(s)
 
 </programlisting>
 <command>deop  [pseudo [pseudo]]</command>
 <programlisting>
-retire le statut d'opérateur du canal à/aux nick(s)
+retire le statut d'opérateur du canal à/aux pseudo(s)
 
 </programlisting>
 <command>devoice  [pseudo [pseudo]]</command>
@@ -81,7 +81,7 @@ arr
 </programlisting>
 <command>halfop  [pseudo [pseudo]]</command>
 <programlisting>
-donner le statut de demi-opérateur à un/des utilisateur(s)
+donner le statut de demi-opérateur à un/des pseudo(s)
 
 </programlisting>
 <command>info  [cible]</command>
@@ -93,15 +93,15 @@ cible: nom du serveur
 </programlisting>
 <command>invite  pseudo canal</command>
 <programlisting>
-inviter un utilisateur sur un canal
+inviter un pseudo sur un canal
 
- pseudo: utilisateur à inviter
+ pseudo: pseudo à inviter
 channel: canal pour l'invitation
 
 </programlisting>
 <command>ison  pseudo [pseudo ...]</command>
 <programlisting>
-vérifier si un utilisateur est actuellement sur IRC
+vérifier si un pseudo est actuellement sur IRC
 
 pseudo: pseudo
 
@@ -119,16 +119,16 @@ canal: nom du canal
 retirer par la force un utilisateur d'un canal
 
       canal: canal où l'utilisateur se trouve
-     pseudo: utilisateur à éliminer
+     pseudo: pseudo à éliminer
 commentaire: commentaire pour l'élimination
 
 </programlisting>
 <command>kickban  [canal] pseudo [commentaire]</command>
 <programlisting>
-retirer par la force un utilisateur d'un canal et le bannir
+retirer par la force un pseudo d'un canal et le bannir
 
       canal: canal où l'utilisateur se trouve
-     pseudo: utilisateur à éliminer et bannir
+     pseudo: pseudo à éliminer et bannir
 commentaire: commentaire pour l'élimination
 
 </programlisting>
@@ -136,7 +136,7 @@ commentaire: commentaire pour l'
 <programlisting>
 fermer la connexion client-serveur
 
-     pseudo: utilisateur
+     pseudo: pseudo
 commentaire: commentaire pour la mort
 
 </programlisting>
@@ -171,7 +171,7 @@ envoyer une action CTCP au canal courant
 message: message à envoyer
 
 </programlisting>
-<command>mode  { canal {[+|-]|o|p|s|i|t|n|b|v} [limite] [utilisateur] [masque de banissement] } | { nick {[+|-]|i|w|s|o} }</command>
+<command>mode  { canal {[+|-]|o|p|s|i|t|n|b|v} [limite] [utilisateur] [masque de banissement] } | { pseudo {[+|-]|i|w|s|o} }</command>
 <programlisting>
 changer le mode du canal ou de l'utilisateur
 
@@ -190,7 +190,7 @@ modes de canaux :
   v: donner/reprendre la possibilité de parler sur un canal modéré
   k: définir une clé (mot de passe) pour accéder au canal
 modes utilisateur :
-  pseudo: utilisateur à modifier
+  pseudo: pseudo à modifier
   i: marquer un utilisateur comme invisible
   s: marquer un utilisateur pour recevoir les notices du serveur
   w: l'utilisateur reçoit les wallops
@@ -206,15 +206,15 @@ cible: nom du serveur
 </programlisting>
 <command>msg  cible[,cible] texte</command>
 <programlisting>
-envoyer un message à un utilisateur ou canal
+envoyer un message à un pseudo ou canal
 
-cible: utilisateur ou canal (peut-être un masque, '*' = canal courant)
+cible: pseudo ou canal (peut-être un masque, '*' = canal courant)
 texte: texte à envoyer
 
 </programlisting>
 <command>names  [canal[,canal]]</command>
 <programlisting>
-lister les utilisateurs sur des canaux
+lister les pseudos sur des canaux
 
 canal: nom du canal
 
@@ -231,13 +231,13 @@ pseudo: nouveau pseudo
 <programlisting>
 envoyer un message notice à un utilisateur
 
-pseudo: utilisateur cible pour la notice
+pseudo: pseudo cible pour la notice
  texte: texte à envoyer
 
 </programlisting>
 <command>op  pseudo [pseudo]</command>
 <programlisting>
-donner le statut opérateur à un/des utilisateur(s)
+donner le statut opérateur à un/des pseudo(s)
 
 </programlisting>
 <command>oper  utilisateur mot_de_passe</command>
@@ -273,9 +273,9 @@ d
 </programlisting>
 <command>query  pseudo [texte]</command>
 <programlisting>
-envoyer un message privé à un utilisateur
+envoyer un message privé à un pseudo
 
-pseudo: utilisateur pour la conversation privée
+pseudo: pseudo pour la conversation privée
  texte: texte à envoyer
 
 </programlisting>
@@ -376,15 +376,15 @@ cible: serveur
 </programlisting>
 <command>unban  [canal] pseudo [pseudo ...]</command>
 <programlisting>
-supprime le bannissement sur des pseudos ou masques
+supprime le bannissement sur des pseudos ou hôtes
 
  canal: nom du canal pour supprimer le bannissement
-pseudo: pseudo ou masque pour supprimer le bannissement
+pseudo: pseudo ou hôte pour supprimer le bannissement
 
 </programlisting>
 <command>userhost  pseudo [pseudo ...]</command>
 <programlisting>
-retourne une liste d'informations sur des utilisateurs
+retourne une liste d'informations sur des pseudos
 
 pseudo: pseudo
 
@@ -398,15 +398,15 @@ cible: serveur
 </programlisting>
 <command>version  [serveur | pseudo]</command>
 <programlisting>
-retourne la version de l'utilisateur ou du serveur (courant ou spécifié)
+retourne la version du pseudo ou du serveur (courant ou spécifié)
 
 serveur: nom du serveur
- pseudo: utilisateur
+ pseudo: pseudo
 
 </programlisting>
 <command>voice  [pseudo [pseudo]]</command>
 <programlisting>
-donne la voix à/aux utilisateur(s)
+donne la voix à/aux pseudo(s)
 
 </programlisting>
 <command>wallops  texte</command>
@@ -429,12 +429,12 @@ masque: information qui correspond
 demande les informations sur le(s) utilisateur(s)
 
 serveur: nom du serveur
- pseudo: utilisateur (peut être un masque)
+ pseudo: pseudo (peut être un masque)
 
 </programlisting>
 <command>whowas  pseudo [,pseudo [,pseudo ...]] [nombre [cible]]</command>
 <programlisting>
-demander de l'information sur un nick qui n'existe plus
+demander de l'information sur un pseudo qui n'existe plus
 
 pseudo: pseudo à chercher
 nombre: nombre de réponses à retourner (recherche complète si nombre négatif)

doc/fr/key_functions.xml

@@ -157,6 +157,10 @@
   <entry><literal>jump_last_buffer</literal></entry>
   <entry>sauter au dernier tampon</entry>
 </row>
+<row>
+  <entry><literal>jump_previous_buffer</literal></entry>
+  <entry>sauter au tampon précédent</entry>
+</row>
 <row>
   <entry><literal>jump_server</literal></entry>
   <entry>sauter au tampon du serveur</entry>
@@ -171,15 +175,19 @@
 </row>
 <row>
   <entry><literal>scroll_previous_highlight</literal></entry>
-  <entry>scroller jusqu'au highlight précédent du tampon</entry>
+  <entry>faire défiler jusqu'au highlight précédent du tampon</entry>
 </row>
 <row>
   <entry><literal>scroll_next_highlight</literal></entry>
-  <entry>scroller jusqu'au highlight suivant du tampon</entry>
+  <entry>faire défiler jusqu'au highlight suivant du tampon</entry>
 </row>
 <row>
   <entry><literal>scroll_unread</literal></entry>
-  <entry>scroller jusqu'à la première ligne non lue du tampon</entry>
+  <entry>faire défiler jusqu'à la première ligne non lue du tampon</entry>
+</row>
+<row>
+  <entry><literal>set_unread</literal></entry>
+  <entry>positionner le marqueur de données non lues sur tous les tampons</entry>
 </row>
 <row>
   <entry><literal>hotlist_clear</literal></entry>

doc/fr/weechat.fr.xml

@@ -8,7 +8,7 @@ Copyright (c) 2003-2007 by FlashCode <flashcode@flashtux.org>
 
 This manual 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 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
 This manual is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@ 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, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 -->
 
@@ -36,7 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
   <bookinfo>
     
-    <title>WeeChat 0.2.4 - Guide utilisateur</title>
+    <title>WeeChat 0.2.6 - Guide utilisateur</title>
     <subtitle>Client IRC rapide, léger et extensible</subtitle>
     
     <author>
@@ -56,7 +55,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
       <para>
         This manual 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 2 of the License, or
+        the Free Software Foundation; either version 3 of the License, or
         (at your option) any later version.
       </para>
       <para>
@@ -67,9 +66,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
       </para>
       <para>
         You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the Free Software
-        Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-        02110-1301 USA
+        along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
       </para>
     </legalnotice>
     
@@ -470,13 +467,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
             </thead>
             <tbody>
               <row>
-                <entry>Flèche gauche</entry>
+                <entry>Flèche gauche / Ctrl + B</entry>
                 <entry>
                   Aller au caractère précédent sur la ligne de commande
                 </entry>
               </row>
               <row>
-                <entry>Flèche droite</entry>
+                <entry>Flèche droite / Ctrl + F</entry>
                 <entry>
                   Aller au caractère suivant sur la ligne de commande
                 </entry>
@@ -499,6 +496,36 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                   Aller au début de la ligne de commande
                 </entry>
               </row>
+              <row>
+                <entry>Ctrl + C puis B</entry>
+                <entry>
+                  Insérer le code pour mettre le texte en gras.
+                </entry>
+              </row>
+              <row>
+                <entry>Ctrl + C puis C</entry>
+                <entry>
+                  Insérer le code pour écrire en couleur.
+                </entry>
+              </row>
+              <row>
+                <entry>Ctrl + C puis O</entry>
+                <entry>
+                  Insérer le code pour réinitaliser la couleur.
+                </entry>
+              </row>
+              <row>
+                <entry>Ctrl + C puis R</entry>
+                <entry>
+                  Insérer le code pour écrire en couleur inversée.
+                </entry>
+              </row>
+              <row>
+                <entry>Ctrl + C puis U</entry>
+                <entry>
+                  Insérer le code pour écrire en souligné.
+                </entry>
+              </row>
               <row>
                 <entry>End / Ctrl + E</entry>
                 <entry>
@@ -524,6 +551,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                   (deux appuis successifs pour rechercher du texte exact)
                 </entry>
               </row>
+              <row>
+                <entry>Ctrl + S puis Ctrl + U</entry>
+                <entry>
+                  Positionner le marqueur de données non lues sur tous les
+                  tampons
+                </entry>
+              </row>
               <row>
                 <entry>Ctrl + T</entry>
                 <entry>
@@ -555,7 +589,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                 </entry>
               </row>
               <row>
-                <entry>Delete</entry>
+                <entry>Delete / Ctrl + D</entry>
                 <entry>
                   Effacer le caractère suivant sur la ligne de commande
                 </entry>
@@ -706,6 +740,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                   Sauter au dernier tampon
                 </entry>
               </row>
+              <row>
+                <entry>Alt + J puis Alt + P</entry>
+                <entry>
+                  Sauter au tampon affiché précédemment
+                </entry>
+              </row>
               <row>
                 <entry>Alt + J puis Alt + R</entry>
                 <entry>
@@ -821,7 +861,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
       <para>
         Si l'option d'envoi des couleurs IRC
         ("<literal>irc_colors_send</literal>") est activée, il est possible
-        d'utiliser des codes couleur et attributs comme suit :
+        d'utiliser des codes couleur et attributs comme suit (appuyer sur Ctrl-C
+        puis la lettre qui suit et éventuellement une valeur) :
         <informaltable colsep="0" frame="none">
           <tgroup cols="2">
             <thead>
@@ -832,20 +873,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
             </thead>
             <tbody>
               <row>
-                <entry>%B</entry>
+                <entry>^Cb</entry>
                 <entry>
                   texte gras
                 </entry>
               </row>
               <row>
-                <entry>%Cxx</entry>
+                <entry>^Ccxx</entry>
                 <entry>
                   couleur du texte "<literal>xx</literal>"
                   (voir le tableau des couleurs ci-dessous)
                 </entry>
               </row>
               <row>
-                <entry>%Cxx,yy</entry>
+                <entry>^Ccxx,yy</entry>
                 <entry>
                   couleur du texte "<literal>xx</literal>"
                   et du fond "<literal>yy</literal>"
@@ -853,38 +894,32 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                 </entry>
               </row>
               <row>
-                <entry>%O</entry>
+                <entry>^Co</entry>
                 <entry>
                   désactiver la couleur et tous les attributs
                 </entry>
               </row>
               <row>
-                <entry>%R</entry>
+                <entry>^Cr</entry>
                 <entry>
                   vidéo inverse (inversion de la couleur d'écriture et du fond)
                 </entry>
               </row>
               <row>
-                <entry>%U</entry>
+                <entry>^Cu</entry>
                 <entry>
                   texte souligné
                 </entry>
               </row>
-              <row>
-                <entry>%%</entry>
-                <entry>
-                  afficher un seul "<literal>%</literal>"
-                </entry>
-              </row>
             </tbody>
           </tgroup>
         </informaltable>
-        NB: le même code (sans le numéro pour %C) peut être utilisé pour stopper
+        NB: le même code (sans le numéro pour ^Cc) peut être utilisé pour stopper
         l'attribut défini.
       </para>
       
       <para>
-        Les codes couleur pour %C sont :
+        Les codes couleur pour ^Cc sont :
         <informaltable colsep="0" frame="none">
           <tgroup cols="2">
             <thead>
@@ -967,7 +1002,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
         Exemple : affichage de "<literal>bonjour tout le monde !</literal>"
         avec "<literal>bonjour</literal>" en bleu clair gras, et 
         "<literal>tout le monde</literal>" en rouge clair souligné :
-<screen><userinput>%C12%Bbonjour%B%C04%U tout le monde%U%C !</userinput></screen>
+<screen><userinput>^Cc12^Cbbonjour^Cb^Cc04^Cu tout le monde^Cu^Cc !</userinput></screen>
       </para>
       
     </section>
@@ -1189,7 +1224,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 <screen>
 #!/bin/sh
 if [ $# -eq 1 ]; then
-    for fifo in $(/bin/ls ~/.weechat/weechat_fifo_* 2>/dev/null); do
+    for fifo in ~/.weechat/weechat_fifo_*
+    do
         echo -e "$1" >$fifo
     done
 fi
@@ -1782,6 +1818,65 @@ plugin->exec_on_files (plugin, "/tmp", &amp;callback);
               </listitem>
             </itemizedlist>
           </para>
+          <para>
+            Pour afficher du texte en couleur, il faut utiliser les codes
+            suivants :
+            <informaltable colsep="0" frame="none">
+              <tgroup cols="2">
+                <thead>
+                  <row>
+                    <entry>Code</entry>
+                    <entry>Description</entry>
+                  </row>
+                </thead>
+                <tbody>
+                  <row>
+                    <entry>0x02</entry>
+                    <entry>
+                      texte gras
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x03 + "xx"</entry>
+                    <entry>
+                      couleur du texte "<literal>xx</literal>"
+                      (voir <xref linkend="secAPI_get_irc_color" /> pour les
+                      couleurs)
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x03 + "xx,yy"</entry>
+                    <entry>
+                      couleur du texte "<literal>xx</literal>"
+                      et du fond "<literal>yy</literal>"
+                      (voir <xref linkend="secAPI_get_irc_color" /> pour les
+                      couleurs)
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x0F</entry>
+                    <entry>
+                      désactiver la couleur et tous les attributs
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x12</entry>
+                    <entry>
+                      vidéo inverse (inversion de la couleur d'écriture et du fond)
+                    </entry>
+                  </row>
+                  <row>
+                    <entry>0x1F</entry>
+                    <entry>
+                      texte souligné
+                    </entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </informaltable>
+            NB: le même code (sans le numéro pour 0x03) peut être utilisé pour stopper
+            l'attribut défini.
+          </para>
           <para>
             Valeur renvoyée : aucune.
           </para>
@@ -1791,6 +1886,11 @@ plugin->exec_on_files (plugin, "/tmp", &amp;callback);
 plugin->print (plugin, NULL, NULL, "hello");
 plugin->print (plugin, NULL, "#weechat", "hello");
 plugin->print (plugin, "freenode", "#weechat", "hello");
+plugin->print (plugin, "freenode", "#weechat", "hello");
+plugin->print (plugin, NULL, NULL,
+               "test: \x02 gras \x0F\x03%02d bleu \x03%02d vert",
+               plugin->get_irc_color (plugin, "blue"),
+               plugin->get_irc_color (plugin, "green"));
 </screen>
           </para>
         </section>
@@ -1824,6 +1924,10 @@ plugin->print (plugin, "freenode", "#weechat", "hello");
               </listitem>
             </itemizedlist>
           </para>
+          <para>
+            Pour afficher du texte en couleur, voir
+            <xref linkend="secAPI_print" />.
+          </para>
           <para>
             Valeur renvoyée : aucune.
           </para>
@@ -2217,6 +2321,14 @@ msg_handler = plugin->msg_handler_add (plugin, "KICK",
                           <entry><literal>%-</literal></entry>
                           <entry>aucune complétion pour le paramètre</entry>
                         </row>
+                        <row>
+                          <entry><literal>%*</literal></entry>
+                          <entry>
+                            répétition de la dernière complétion pour tous
+                            les paramètres suivants (ce code doit être à la
+                            fin du modèle de complétion, précédé d'un "|")
+                          </entry>
+                        </row>
                         <row>
                           <entry><literal>%a</literal></entry>
                           <entry>alias</entry>
@@ -2233,7 +2345,7 @@ msg_handler = plugin->msg_handler_add (plugin, "KICK",
                         </row>
                         <row>
                           <entry><literal>%C</literal></entry>
-                          <entry>canaux du serveur courant</entry>
+                          <entry>tous les canaux (y compris les privés)</entry>
                         </row>
                         <row>
                           <entry><literal>%f</literal></entry>
@@ -2259,6 +2371,13 @@ msg_handler = plugin->msg_handler_add (plugin, "KICK",
                           <entry><literal>%m</literal></entry>
                           <entry>pseudo sur le serveur courant</entry>
                         </row>
+                        <row>
+                          <entry><literal>%M</literal></entry>
+                          <entry>
+                            pseudos sur le serveur courant
+                            (tous les canaux ouverts)
+                          </entry>
+                        </row>
                         <row>
                           <entry><literal>%n</literal></entry>
                           <entry>pseudos du canal courant</entry>
@@ -2638,28 +2757,8 @@ keyb_handler = plugin->keyboard_handler_add (plugin, &amp;mon_keyb);
               </listitem>
               <listitem>
                 <para>
-                  <option>évènement</option> : évènement, voir le tableau
-                  ci-dessous :
-                  <informaltable colsep="0" frame="none">
-                    <tgroup cols="2">
-                      <thead>
-                        <row>
-                          <entry>Evènement</entry>
-                          <entry>Description</entry>
-                        </row>
-                      </thead>
-                      <tbody>
-                        <row>
-                          <entry><literal>buffer_open</literal></entry>
-                          <entry>un tampon a été ouvert</entry>
-                        </row>
-                        <row>
-                          <entry><literal>buffer_close</literal></entry>
-                          <entry>un tampon a été fermé</entry>
-                        </row>
-                      </tbody>
-                    </tgroup>
-                  </informaltable>
+                  <option>évènement</option> : évènement (voir le tableau
+                  ci-dessous)
                 </para>
               </listitem>
               <listitem>
@@ -2675,8 +2774,8 @@ keyb_handler = plugin->keyboard_handler_add (plugin, &amp;mon_keyb);
                   </command>
                 </para>
                 <para>
-                  Le paramètre argc vaut 1 et argv[0] contient le numéro
-                  du tampon ouvert ou fermé.
+                  Les paramètres passés à la fonction dépendent de l'évènement
+                  (voir le tableau ci-dessous).
                 </para>
               </listitem>
               <listitem>
@@ -2693,6 +2792,43 @@ keyb_handler = plugin->keyboard_handler_add (plugin, &amp;mon_keyb);
               </listitem>
             </itemizedlist>
           </para>
+          <para>
+            Liste des évènements :
+            <informaltable colsep="0" frame="none">
+              <tgroup cols="3">
+                <thead>
+                  <row>
+                    <entry>Evènement</entry>
+                    <entry>Description</entry>
+                    <entry>Paramètres</entry>
+                  </row>
+                </thead>
+                <tbody>
+                  <row>
+                    <entry><literal>buffer_open</literal></entry>
+                    <entry>un tampon a été ouvert</entry>
+                    <entry>
+                      argc = 1, argv = { numéro de tampon }
+                    </entry>
+                  </row>
+                  <row>
+                    <entry><literal>buffer_close</literal></entry>
+                    <entry>un tampon a été fermé</entry>
+                    <entry>
+                      argc = 1, argv = { numéro de tampon }
+                    </entry>
+                  </row>
+                  <row>
+                    <entry><literal>buffer_move</literal></entry>
+                    <entry>un tampon a été déplacé</entry>
+                    <entry>
+                      argc = 2, argv = { nouveau numéro de tampon, ancien numéro }
+                    </entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </informaltable>
+          </para>
           <para>
             Valeur renvoyée : le pointeur vers le nouveau gestionnaire
             d'évènement.
@@ -4902,6 +5038,124 @@ void weechat_plugin_end (t_weechat_plugin *plugin)
       
     </section>
     
+    <section id="secCharset">
+      <title>Extension Charset</title>
+      
+      <para>
+        L'extension Charset vous permet d'encoder et décoder les données en
+        utilisant un jeu de caractères, avec 3 niveaux : global, par serveur,
+        ou par canal.
+        Cette extension est facultative, mais recommandée : si elle n'est pas
+        chargée, WeeChat pourra uniquement lire/écrire des données UTF-8.
+      </para>
+      
+      <para>
+        L'extension Charset devrait être automatiquement chargée par WeeChat
+        au démarrage.
+        Pour s'assurer que l'extension est bien chargée, essayez :
+        "<literal>/charset</literal>".
+        Si la commande n'est pas trouvée, alors chargez l'extension avec la
+        commande :
+        <screen>/plugin load charset</screen>
+        Si l'extension n'est pas trouvée, alors vous devriez recompiler
+        WeeChat avec les extensions et le support de Charset.
+      </para>
+      
+      <para>
+        Lorsque l'extension Charset démarre, elle affiche le jeu de caractères
+        du terminal et l'interne.
+        Le jeu de caractères du terminal dépend de votre locale, et l'interne
+        est UTF-8.
+        Par exemple :
+<screen>
+-P- Charset plugin starting, terminal charset: ISO-8859-15 (WeeChat internal: UTF-8)
+</screen>
+      </para>
+              
+      <section id="secCharsetSettings">
+        <title>Configuration</title>
+        
+        <itemizedlist>
+          <listitem>
+            <para>
+              Pour modifier les jeux de caractères de décodage et d'encodage
+              globaux, utilisez la commande "<literal>/setp</literal>".
+              Par exemple :
+<screen>
+/setp charset.global.decode = ISO-8859-15
+/setp charset.global.encode = ISO-8859-15
+</screen>
+              Si le jeu de caractères de décodage global n'est pas renseigné
+              (par exemple pendant le premier chargement de Charset), il sera
+              renseigné automatiquement avec le jeu de caractères du terminal
+              (s'il est différent de UTF-8) ou par défaut à
+              "<literal>ISO-8859-1</literal>".
+              La valeur d'encodage par défaut est vide, donc WeeChat envoie par
+              défaut avec le jeu de caractères interne (UTF-8).
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Pour modifier le jeu de caractères d'un serveur, utilisez la
+              commande "<literal>/charset</literal>" sur le tampon serveur.
+              Si vous donnez seulement le jeu de caractères, alors vous
+              modifiez en même temps les valeurs de décodage et d'encodage.
+              Par exemple :
+              <screen>/charset ISO-8859-15</screen>
+              Ce qui est équivalent à :
+<screen>
+/charset decode ISO-8859-15
+/charset encode ISO-8859-15
+</screen>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Pour modifier le jeu de caractères d'un canal (ou d'une
+              conversation privée), utilisez la même commande que pour le
+              serveur, mais sur le tampon du canal (ou du privé).
+            </para>
+          </listitem>
+        </itemizedlist>
+              
+      </section>
+      
+      <section id="secCharsetFAQ">
+        <title>FAQ</title>
+        
+        <para>
+          Si vous avez des problèmes avec certains caractères ou les accents en
+          utilisant l'extension Charset :
+          <itemizedlist>
+            <listitem>
+              <para>
+                vérifiez que weechat-curses est lié avec libncursesw
+                (attention : nécessaire sur beaucoup de distributions, mais pas
+                toutes) : 
+                <screen>ldd /chemin/vers/weechat-curses</screen>
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                vérifiez la ligne charset (sur le tampon serveur), vous devriez
+                voir ISO-XXXXXX ou UTF-8 pour le charset du terminal. Si vous
+                voyez ANSI_X3.4-1968 ou d'autres valeurs, votre locale est
+                probablement erronée.
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                affectez la valeur pour le décodage global, par exemple :
+                <screen>/setp charset.global.decode = ISO-8859-15</screen>
+              </para>
+            </listitem>
+          </itemizedlist>
+        </para>
+        
+      </section>
+      
+    </section>
+    
     <section id="secExtensionsScripts">
       <title>Extensions pour scripts</title>
       
@@ -5266,6 +5520,10 @@ weechat.set_charset("ISO-8859-1")
               </listitem>
             </itemizedlist>
           </para>
+          <para>
+            Pour afficher du texte en couleur, voir
+            <xref linkend="secAPI_print" />.
+          </para>
           <para>
             Valeur renvoyée : 1 si succès, 0 si une erreur s'est produite.
           </para>
@@ -5276,6 +5534,7 @@ weechat.set_charset("ISO-8859-1")
 weechat::print("message");
 weechat::print("message", "#weechat");
 weechat::print("message", "#weechat", "freenode");
+weechat::print("test: \x0305 rouge \x0F normal");
 
 # python
 weechat.prnt("message")
@@ -5295,6 +5554,72 @@ weechat.print("message", "#weechat", "freenode")
           </para>
         </section>
         
+        <section id="secScript_print_server">
+          <title>print_server</title>
+          
+          <para>
+            Prototype Perl :
+            <command>
+              weechat::print_server(message)
+            </command>
+          </para>
+          <para>
+            Prototype Python :
+            <command>
+              weechat.print_server(message)
+            </command>
+          </para>
+          <para>
+            Prototype Ruby :
+            <command>
+              Weechat.print_server(message)
+            </command>
+          </para>
+          <para>
+            Prototype Lua :
+            <command>
+              weechat.print_server(message)
+            </command>
+          </para>
+          <para>
+            Affiche un message sur le tampon serveur.
+          </para>
+          <para>
+            Paramètres :
+            <itemizedlist>
+              <listitem>
+                <para>
+                  <option>message</option> : message à afficher
+                </para>
+              </listitem>
+            </itemizedlist>
+          </para>
+          <para>
+            Pour afficher du texte en couleur, voir
+            <xref linkend="secAPI_print" />.
+          </para>
+          <para>
+            Valeur renvoyée : 1 si succès, 0 si une erreur s'est produite.
+          </para>
+          <para>
+            Exemples :
+<screen>
+# perl
+weechat::print_server("message");
+weechat::print_server("test: \x0305 rouge \x0F normal");
+
+# python
+weechat.print_server("message")
+
+# ruby
+Weechat.print_server("message")
+
+-- lua
+weechat.print_server("message")
+</screen>
+          </para>
+        </section>
+        
         <section id="secScript_print_infobar">
           <title>print_infobar</title>
           

doc/fr/weechat_commands.xml

@@ -28,9 +28,22 @@ gestion des tampons
    list: liste les tampons ouverts (pas de paramètre affiche cette liste)
  notify: fixe le niveau de notification (0=jamais, 1=highlight, 2=1+msg, 3=2+join/part)
          (quand exécuté sur un tampon serveur, cela fixe le niveau de notification par défaut pour le serveur entier)
+ scroll: fait défiler l'historique (peut être relatif, et peut se terminer par une lettre: s=sec, m=min, h=heure, d=jour, M=mois, y=année); s'il y a seulement une lettre, alors fait défiler jusqu'au début de cet élément
+
+ nombre: saute au tampon qui a ce numéro
 serveur,
   canal: saute au tampon par serveur et/ou nom de canal
- nombre: saute au tampon qui a ce numéro
+
+Exemples :
+     déplacer tampon: /buffer move 5
+       fermer tampon: /buffer close c'est le message de départ
+    niveau de notif.: /buffer notify 2
+ défiler 1 jour haut: /buffer scroll 1d  ==  /buffer scroll -1d  ==  /buffer scroll -24h
+    défiler au début
+          de ce jour: /buffer scroll d
+  défiler 15 min bas: /buffer scroll +15m
+défiler 20 msgs haut: /buffer scroll -20
+  aller sur #weechat: /buffer #weechat
 
 </programlisting>
 <command>builtin  commande</command>
@@ -41,25 +54,32 @@ commande: commande
 
 
 </programlisting>
-<command>clear  [-all | nombre]</command>
+<command>clear  [-all | numéro [numéro ...]]</command>
 <programlisting>
 effacer la/les fenêtre(s)
 
   -all: effacer tous les tampons
-nombre: effacer un tampon par son numéro
+numéro: effacer un tampon par son numéro
 
 </programlisting>
-<command>connect  [nom_serveur]</command>
+<command>connect  [-all [-nojoin] | nom_serveur [nom_serveur ...] [-nojoin] | nom/IP [-port port] [-ipv6] [-ssl]]</command>
 <programlisting>
-se connecter à un serveur
+se connecter à un/plusieurs serveur(s)
 
+       -all: se reconnecter à tous les serveurs
 nom_serveur: nom du serveur pour se connecter
+    -nojoin: ne rejoindre aucun canal (même si l'autojoin est activé pour le serveur)
+     nom/IP: nom/IP pour se connecter, en créant un serveur temporaire
+       port: port pour le serveur (nombre entier, 6667 par défaut)
+       ipv6: utiliser le protocole IPv6
+        ssl: utiliser le protocole SSL
 
 </programlisting>
-<command>disconnect  [nom_serveur]</command>
+<command>disconnect  [-all | nom_serveur [nom_serveur...]]</command>
 <programlisting>
-se déconnecter d'un serveur
+se déconnecter d'un/plusieurs serveur(s)
 
+       -all: se déconnecter de tous les serveurs
 nom_serveur: nom du serveur pour se déconnecter
 
 </programlisting>
@@ -72,11 +92,12 @@ d
 fichier: nom du fichier (sur la machine locale)
 
 </programlisting>
-<command>debug  dump | windows</command>
+<command>debug  dump | buffer | windows</command>
 <programlisting>
 affiche des messages de debogage
 
    dump: affiche les variables mémoire WeeChat dans le fichier log (les mêmes messages sont affichés lorsque WeeChat plante)
+ buffer: affiche le contenu du tampon en valeurs hexadécimales dans le fichier log
 windows: affiche l'arbre des fenêtres
 
 </programlisting>
@@ -97,9 +118,9 @@ valeur: nombre d'entr
 </programlisting>
 <command>ignore  [masque [[type | commande] [canal [serveur]]]]</command>
 <programlisting>
-ignorer des messages IRC et/ou des masques
+ignorer des messages IRC et/ou des hôtes
 
-  masque: pseudo ou masque à ignorer
+  masque: pseudo ou hôte à ignorer
     type: type de message à ignorer (action, ctcp, dcc, pv)
 commande: commande IRC
    canal: nom du canal pour le ignore
@@ -134,13 +155,35 @@ autoload: charger automatiquement les extensions dans un r
 Sans paramètre, la commande /plugin liste les extensions chargées.
 
 </programlisting>
-<command>server  [nom_serveur] | [nom_serveur nom/IP port [-auto | -noauto] [-ipv6] [-ssl] [-pwd mot_de_passe] [-nicks pseudo1 pseudo2 pseudo3] [-username nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [del nom_serveur]</command>
+<command>reconnect  [-all [-nojoin] | nom_serveur [nom_serveur...] [-nojoin]]</command>
+<programlisting>
+se reconnecter à un/plusieurs serveur(s)
+
+       -all: se reconnecter à tous les serveurs
+nom_serveur: nom du serveur pour se reconnecter
+    -nojoin: ne rejoindre aucun canal (même si l'autojoin est activé pour le serveur)
+
+</programlisting>
+<command>save  [fichier]</command>
+<programlisting>
+sauvegarder la configuration sur disque
+
+fichier: fichier pour sauvegarder la configuration
+
+</programlisting>
+<command>server  [list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom/IP [-port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd mot_de_passe] [-nicks pseudo1 pseudo2 pseudo3] [-username nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [copy nom_serveur nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] | [keep nom_serveur] | [del nom_serveur]</command>
 <programlisting>
 liste, ajoute ou retire des serveurs
 
+           list: afficher les serveurs (pas de paramètre implique cette liste)
+       listfull: afficher les serveurs avec de l'info détaillée pour chaque
+            add: créer un nouveau serveur
     nom_serveur: nom du serveur, pour usage interne et affichage
          nom/IP: nom ou adresse IP du serveur
-           port: port pour le serveur (nombre entier)
+           port: port pour le serveur (nombre entier, 6667 par défaut)
+           temp: créer un serveur temporaire (non sauvé dans le fichier de configuration)
+           auto: se connecter automatiquement au serveur quand WeeChat démarre
+         noauto: ne pas se connecter au serveur quand WeeChat démarre (par défaut)
            ipv6: utiliser le protocole IPv6
             ssl: utiliser le protocole SSL
    mot_de_passe: mot de passe pour le serveur
@@ -149,13 +192,11 @@ liste, ajoute ou retire des serveurs
         pseudo3: second pseudo alternatif pour le serveur
 nom_utilisateur: nom d'utilisateur
        nom_réel: nom réel de l'utilisateur
-
-</programlisting>
-<command>save  [fichier]</command>
-<programlisting>
-sauvegarder la configuration sur disque
-
-fichier: fichier pour sauvegarder la configuration
+           copy: dupliquer un serveur
+         rename: renommer un serveur
+           keep: garder le serveur dans le fichier de configuration (pour les serveurs temporaires seulement)
+            del: supprimer un serveur
+        deloutq: supprimer la file d'attente des messages sortants pour tous les serveurs (tous les messages que WeeChat est actuellement en train d'envoyer)
 
 </programlisting>
 <command>set  [option [ = valeur]]</command>
@@ -187,10 +228,10 @@ nom_alias: nom de l'alias
 </programlisting>
 <command>unignore  [nombre | [masque [[type | commande] [canal [serveur]]]]]</command>
 <programlisting>
-supprimer le ignore des messages IRC et/ou des masques
+supprimer le ignore des messages IRC et/ou des hôtes
 
   nombre: numéro de ignore à supprimer (le nombre est affiché sur la liste des ignore)
-  masque: pseudo ou masque à ignorer
+  masque: pseudo ou hôte à ignorer
     type: type de message à ignorer (action, ctcp, dcc, pv)
 commande: commande IRC
    canal: nom du canal pour le ignore
@@ -200,11 +241,13 @@ Pour chaque param
 Sans paramètre, /ignore liste les ignore définis.
 
 </programlisting>
-<command>upgrade</command>
+<command>upgrade  [chemin_vers_binaire]</command>
 <programlisting>
 mettre à jour WeeChat sans se déconnecter des serveurs
 
-Cette commande lance à nouveau le binaire WeeChat, il doit donc avoir été compilé ou installé via un gestionnaire de paquet avant de lancer cette commande.
+chemin_vers_binaire: chemin vers le binaire WeeChat (par défaut le binaire courant)
+
+Cette commande lance à nouveau un binaire WeeChat, il doit donc avoir été compilé ou installé via un gestionnaire de paquet avant de lancer cette commande.
 
 </programlisting>
 <command>uptime  [-o]</command>

doc/pl/Makefile.am

@@ -2,7 +2,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 LANGCODE = pl

doc/ru/Makefile.am

@@ -2,7 +2,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 LANGCODE = ru

doc/sco/Makefile.am

@@ -2,7 +2,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 LANGCODE = sco

doc/sv/Makefile.am

@@ -0,0 +1,27 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+LANGCODE = sv
+QUICKSTART = weechat_quickstart.$(LANGCODE).txt
+
+EXTRA_DIST = $(QUICKSTART)
+
+docdir = $(datadir)/doc/$(PACKAGE)
+
+# install docs
+
+install-data-hook:
+	$(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/

doc/sv/weechat_quickstart.sv.txt

@@ -0,0 +1,109 @@
+WeeChat snabb start guide (svensk version)
+=========================
+
+1. Starta weechat
+
+     Beroende på vald GUI, måste du starta:
+     - weechat-curses för Curses GUI
+     - weechat-gtk för Gtk GUI (under utveckling)
+     - weechat-qt för Qt GUI (inte utvecklad)
+     - weechat-wxwidgets för WxWidgets GUI (inte utvecklad)
+
+2. Online hjälp / inställningar
+
+     WeeChat har hjälp för alla kommandon, skriv /help för mer information.
+     För att få hjälp med ett kommando, skriv /help kommando.
+
+     För att ställa in inställningarna, använd /set inställning = värde,
+     t ex. /set col_nick_self = white (ändrar ditt namn till färgen vit.)
+     Du kan använda /set inställning med partial namn (visar alla inställningar
+     som innehåller bokstäver), eller bara en inställning utan ett värde
+     (för att se mer information om den specifika inställningen, t ex. /set col_nick_self.)
+
+     Viktigt: inställningar sparas när WeeChat avlutas (eller med "/save"
+     kommando). Redigera INTE setup filen medans WeeChat körs, därför WeeChat
+     kan skriva i denna fil när som helst, och det är inte möjligt att ladda om den.
+     För att ändra inställingar, använd "/set" kommandot, WeeChat använder då
+     direkt de nya inställningarna.
+
+3. Skapa en server
+
+     Till exempel irc.quakenet.org, port 6667:
+       /server quakenet irc.quakenet.org 6667
+     (/help server för full kommando hjälp)
+
+4. Server inställningar
+
+     Smeknamn:
+       /set quakenet.server_nick1 = "mynick"
+       /set quakenet.server_nick2 = "mynick2"
+       /set quakenet.server_nick3 = "mynick3"
+
+     Användarnamn/Riktigt namn:
+       /set quakenet.server_username = "Mitt användarnamn"
+       /set quakenet.server_realname = "Mtt riktiga namn"
+
+     Automatiskt ansluta till server:
+       /set quakenet.server_autoconnect = on
+
+     Automatiskt joina en/flera kanaler:
+       /set quakenet.server_autojoin = "#chan1,#chan2"
+
+     Andra inställningar:
+       Du kan see server inställningar and värden med /set quakenet
+       För att ställa in en inställning, använd /set quakenet.server_inställning = värde
+
+5. Ansluta till en server och automatiskt joina kanaler:
+
+     /connect quakenet
+
+6. Joina/parta en kanal:
+
+     Joina en kanal:
+       /join #kanal
+     Parta en kanal:
+       /part [quit message]
+     Parta en kanal och stäng buffer:
+       /close [quit message]
+     (/close är ett alias av /buffer close)
+
+7. Buffer/fönster management
+
+     Du kan ta hand om buffers med "/buffer" kommandot och fönster
+     med "/window" kommandot.
+     Till exempel, För att dela fönstret till ett litet fönster (1/3 bred),
+     och ett stort (2/3), använd kommandot:
+       /window splitv 33
+
+8. Knapp 'binding'
+
+     Beroende på ditt tangentbord och/eller dina behov, kan du binda varje tangentknapp
+     med "/key" kommandot.
+
+     Till exempel, för att binda meta-y (alt-y) till kommandot "/buffer close":
+       /key (tryck meta-k) (tryck meta-y) /buffer close
+     Du borde ha en kommando rad som denna:
+       /key meta-y /buffer close
+
+9. Plugins/skripts
+
+     På vissa distributioner såsom Debian, är plugins tillgängliga via ett separat paket
+     (som weechat-plugins).
+     Plugins är automatiskt laddad när det har hittats.
+     Det finns många plugins/skripts tillgängliga för WeeChat, Kolla:
+       http://weechat.flashtux.org/plugins.php
+     Kolla även WeeChat's dokumentering för att ladda/'unloada' plugins eller skripts..
+
+10. Mer dokumentation
+
+     Du kan nu använda WeeChat och läsa FAQ/dokumentation för övriga frågor:
+       http://weechat.flashtux.org/faq.php
+       http://weechat.flashtux.org/doc.php
+
+     Njut av WeeChat!
+
+--
+(c) 2006-05-31, skrivet av FlashCode <flashcode@flashtux.org>
+    2007-08-09, översatt till svenska av Robin Karlsson <Robin--Karlsson@bredband.net>
+Det här dokumentet är en del av WeeChat och är distribuerad under GPL
+licens.

doc/weechat-curses.1

@@ -1,4 +1,4 @@
-.TH WEECHAT 1 "March 2007" "FlashCode"
+.TH WEECHAT 1 "September 2007" "FlashCode"
 
 .SH NAME
 weechat-curses \- Wee Enhanced Environment for Chat (Curses version)
@@ -14,7 +14,7 @@ or
 Fast, light and extensible IRC client for many operating systems.
 .br
 Everything can be done with a keyboard. It is customizable and extensible with scripts.
-Many GUIs are available (Curses, Gtk, Qt, and text).
+Many GUIs are or will be available (Curses, Gtk and Qt).
 It is compliant with RFCs 1459, 2810, 2811, 2812, and 2813.
 
 .SH OPTIONS
@@ -85,7 +85,7 @@ WeeChat is written by FlashCode <flashcode@flashtux.org>
 .br
 WeeChat on the web:
 .UR
-http://weechat.flashtux.org
+http://weechat.flashtux.org/
 .br
 Get support there:
 .UR

po/CMakeLists.txt

@@ -0,0 +1,76 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+SET(PO_FILES
+  fr.po
+  es.po
+  cs.po
+  hu.po
+  de.po
+  ru.po
+  )
+
+SET(COPYRIGHT_HOLDER "WeeChat Team")
+SET(BUGS_ADDRESS "flashcode@flashtux.org")
+SET(POT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pot)
+
+INCLUDE(srcfiles.cmake)
+
+# Looking for xgettext, msgmerge and msgfmt
+FIND_PROGRAM(XGETTEXT_EXECUTABLE xgettext)
+FIND_PROGRAM(MSGMERGE_EXECUTABLE msgmerge)
+FIND_PROGRAM(MSGFMT_EXECUTABLE msgfmt)
+
+IF(XGETTEXT_EXECUTABLE AND MSGMERGE_EXECUTABLE AND MSGFMT_EXECUTABLE)
+  
+  # Create PO template file weechat.pot
+  SET(SRC_FILES)
+  SET(POT_DEPENDS)
+
+  FOREACH(srcfile ${WEECHAT_SOURCES})
+    SET(SRC_FILES ${SRC_FILES} ${srcfile})
+    SET(POT_DEPENDS ${POT_DEPENDS} ${CMAKE_SOURCE_DIR}/${srcfile})
+  ENDFOREACH(srcfile ${WEECHAT_SOURCES})
+
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${POT_FILE}
+    COMMAND ${XGETTEXT_EXECUTABLE}
+    ARGS -o ${POT_FILE} --keyword='_' --keyword='N_' --directory=${CMAKE_SOURCE_DIR} --omit-header --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder=${COPYRIGHT_HOLDER} ${SRC_FILES}
+    DEPENDS ${POT_DEPENDS}
+    COMMENT "Generating PO template file"
+    )
+
+  # Update .po files and compile them to binary .gmo files
+
+  SET(GMO_FILES)
+  FOREACH(pofile ${PO_FILES})
+    GET_FILENAME_COMPONENT(polang ${pofile} NAME_WE)
+    
+    SET(gmofile ${CMAKE_CURRENT_BINARY_DIR}/${polang}.gmo)
+    ADD_CUSTOM_COMMAND(
+      OUTPUT ${gmofile}
+      COMMAND ${MSGMERGE_EXECUTABLE} ARGS --quiet -s -o ${CMAKE_CURRENT_BINARY_DIR}/${pofile} ${CMAKE_CURRENT_SOURCE_DIR}/${pofile} ${POT_FILE}
+      COMMAND ${MSGFMT_EXECUTABLE} ARGS -o ${gmofile} ${CMAKE_CURRENT_BINARY_DIR}/${pofile}
+      DEPENDS ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${pofile}
+      COMMENT "Compiling locales (${polang})"
+      )
+    
+    INSTALL(FILES ${gmofile} DESTINATION share/locale/${polang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
+    SET(GMO_FILES ${GMO_FILES} ${gmofile})
+  ENDFOREACH(pofile ${PO_FILES})
+  ADD_CUSTOM_TARGET(translations ALL DEPENDS ${GMO_FILES})
+
+ENDIF(XGETTEXT_EXECUTABLE AND MSGMERGE_EXECUTABLE AND MSGFMT_EXECUTABLE)

po/Makevars

@@ -1,7 +1,7 @@
 DOMAIN = $(PACKAGE)
 subdir = po
 top_builddir = ..
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=NG_:1,2
 COPYRIGHT_HOLDER = 
 EXTRA_LOCALE_CATEGORIES =
 MSGID_BUGS_ADDRESS = flashcode@flashtux.org

po/srcfiles.cmake

@@ -0,0 +1,82 @@
+SET(WEECHAT_SOURCES
+src/irc/irc-mode.c
+src/irc/irc-nick.c
+src/irc/irc-server.c
+src/irc/irc-channel.c
+src/irc/irc-commands.c
+src/irc/irc-display.c
+src/irc/irc-send.c
+src/irc/irc-recv.c
+src/irc/irc-dcc.c
+src/irc/irc-ignore.c
+src/irc/irc.h
+src/plugins/plugins.c
+src/plugins/plugins.h
+src/plugins/plugins-config.c
+src/plugins/plugins-config.h
+src/plugins/plugins-interface.c
+src/plugins/weechat-plugin.h
+src/gui/curses/gui-curses-chat.c
+src/gui/curses/gui-curses-color.c
+src/gui/curses/gui-curses-infobar.c
+src/gui/curses/gui-curses-input.c
+src/gui/curses/gui-curses-keyboard.c
+src/gui/curses/gui-curses-main.c
+src/gui/curses/gui-curses-nicklist.c
+src/gui/curses/gui-curses-panel.c
+src/gui/curses/gui-curses-status.c
+src/gui/curses/gui-curses-window.c
+src/gui/curses/gui-curses.h
+src/gui/gtk/gui-gtk-chat.c
+src/gui/gtk/gui-gtk-color.c
+src/gui/gtk/gui-gtk-infobar.c
+src/gui/gtk/gui-gtk-input.c
+src/gui/gtk/gui-gtk-keyboard.c
+src/gui/gtk/gui-gtk-main.c
+src/gui/gtk/gui-gtk-nicklist.c
+src/gui/gtk/gui-gtk-panel.c
+src/gui/gtk/gui-gtk-status.c
+src/gui/gtk/gui-gtk-window.c
+src/gui/gtk/gui-gtk.h
+src/gui/gui-action.c
+src/gui/gui-buffer.c
+src/gui/gui-common.c
+src/gui/gui-keyboard.c
+src/gui/gui-log.c
+src/gui/gui-panel.c
+src/gui/gui-window.c
+src/gui/gui.h
+src/gui/gui-buffer.h
+src/gui/gui-color.h
+src/gui/gui-keyboard.h
+src/gui/gui-panel.h
+src/gui/gui-window.h
+src/common/alias.c
+src/common/alias.h
+src/common/backtrace.c
+src/common/backtrace.h
+src/common/command.c
+src/common/command.h
+src/common/completion.c
+src/common/completion.h
+src/common/fifo.c
+src/common/fifo.h
+src/common/history.c
+src/common/history.h
+src/common/hotlist.c
+src/common/hotlist.h
+src/common/log.c
+src/common/log.h
+src/common/session.c
+src/common/session.h
+src/common/utf8.c
+src/common/utf8.h
+src/common/util.c
+src/common/util.h
+src/common/weechat.c
+src/common/weechat.h
+src/common/weeconfig.c
+src/common/weeconfig.h
+src/common/weelist.c
+src/common/weelist.h
+)

scripts/perl/beep.pl

@@ -1,9 +1,9 @@
 #
-# Copyright (c) 2006 by FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2006-2007 by FlashCode <flashcode@flashtux.org>
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,22 +12,22 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #
 # Speaker beep on highlight/private msg.
 #
 # History:
-#
+# 2007-08-10, FlashCode <flashcode@flashtux.org>:
+#     version 0.2: upgraded licence to GPL 3
 # 2006-09-02, FlashCode <flashcode@flashtux.org>:
-#     initial release
+#     version 0.1: initial release
 #
 
 use strict;
 
-my $version = "0.1";
+my $version = "0.2";
 my $beep_command = "echo -n \a";
 
 # default values in setup file (~/.weechat/plugins.rc)

scripts/perl/bufsave.pl

@@ -1,9 +1,9 @@
 #
-# Copyright (c) 2006 by FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2006-2007 by FlashCode <flashcode@flashtux.org>
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #
@@ -21,20 +20,24 @@
 #
 # History:
 #
+# 2007-08-10, FlashCode <flashcode@flashtux.org>:
+#     version 0.3: upgraded licence to GPL 3
+# 2007-06-12, FlashCode <flashcode@flashtux.org>:
+#     version 0.2: added filename completion
 # 2006-10-27, FlashCode <flashcode@flashtux.org>:
-#     initial release
+#     version 0.1: initial release
 #
 
 use strict;
 
-my $version = "0.1";
+my $version = "0.3";
 
 weechat::register("bufsave", $version, "", "Save buffer content to a file");
 weechat::add_command_handler("bufsave", "bufsave_cmd",
                              "save current buffer to a file",
                              "filename",
                              "filename: target file (must not exist)",
-                             "");
+                             "%f");
 
 sub bufsave_cmd
 {

scripts/perl/fete.pl

@@ -1,123 +1,123 @@
-# =============================================================================
-#  Copyright (c) 2003-2005 by FlashCode <flashcode@flashtux.org>
 #
-#  This program 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 2 of the License, or
-#  (at your option) any later version.
+# Copyright (c) 2003-2007 by FlashCode <flashcode@flashtux.org>
 #
-#  This program 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.
+# This program 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.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# This program 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.
 #
-#  fete.pl (c) Décembre 2003 par FlashCode <flashcode@flashtux.org>
-#  Mis à jour le 04/06/2005, FlashCode <flashcode@flashtux.org>
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# fete.pl (c) December 2003 by FlashCode <flashcode@flashtux.org>
+# Updated on  2007-08-10    by FlashCode <flashcode@flashtux.org>
+#
+# Manages french calendat feasts with "/fete" command
+# Syntax: /fete            - display today's and tomorrow's feast
+#         /fete firstname  - search for name in calendar
 #
-#  Gestion des fêtes du calendrier français avec la commande "/fete"
-#  Syntaxe: /fete          - affiche la fête du jour et du lendemain
-#           /fete prenom   - cherche un prénom dans le calendrier
-# =============================================================================
 
 use locale;
 
-my $version = "0.4";
-weechat::register ("Fete", $version, "", "Gestion des fêtes du calendrier français");
-weechat::print ("Script 'Fete' $version chargé");
+my $version = "0.7";
+
+weechat::register ("Fete", $version, "", "Gestion des fêtes du calendrier français", "UTF-8");
+weechat::print ("Script 'Fete' $version chargé");
 weechat::add_command_handler ("fete", fete);
 
 @noms_jours = qw(Dimanche Lundi Mardi Mercredi Jeudi Vendredi Samedi);
-@noms_mois = qw(Janvier Février Mars Avril Mai Juin Juillet Août Septembre Octobre Novembre Décembre);
+@noms_mois = qw(Janvier Février Mars Avril Mai Juin Juillet Août Septembre Octobre Novembre Décembre);
 @fetes = (
     # janvier
-    [ '!Marie - JOUR de l\'AN', '&Basile', '!Geneviève', '&Odilon', '&Edouard',
-      '&Mélaine', '&Raymond', '&Lucien', '!Alix', '&Guillaume', '&Paulin',
-      '!Tatiana', '!Yvette', '!Nina', '&Rémi', '&Marcel', '!Roseline',
-      '!Prisca', '&Marius', '&Sébastien', '!Agnès', '&Vincent', '&Barnard',
-      '&François de Sales', '-Conversion de St Paul', '!Paule', '!Angèle',
+    [ '!Marie - JOUR de l\'AN', '&Basile', '!Geneviève', '&Odilon', '&Edouard',
+      '&Mélaine', '&Raymond', '&Lucien', '!Alix', '&Guillaume', '&Paulin',
+      '!Tatiana', '!Yvette', '!Nina', '&Rémi', '&Marcel', '!Roseline',
+      '!Prisca', '&Marius', '&Sébastien', '!Agnès', '&Vincent', '&Barnard',
+      '&François de Sales', '-Conversion de St Paul', '!Paule', '!Angèle',
       '&Thomas d\'Aquin', '&Gildas', '!Martine', '!Marcelle' ],
-    # février
-    [ '!Ella', '-Présentation', '&Blaise', '!Véronique', '!Agathe',
-      '&Gaston', '!Eugénie', '!Jacqueline', '!Apolline', '&Arnaud',
-      '-Notre-Dame de Lourdes', '&Félix', '!Béatrice', '&Valentin', '&Claude',
-      '!Julienne', '&Alexis', '!Bernadette', '&Gabin', '!Aimée',
-      '&Pierre Damien', '!Isabelle', '&Lazare', '&Modeste', '&Roméo', '&Nestor',
+    # février
+    [ '!Ella', '-Présentation', '&Blaise', '!Véronique', '!Agathe',
+      '&Gaston', '!Eugénie', '!Jacqueline', '!Apolline', '&Arnaud',
+      '-Notre-Dame de Lourdes', '&Félix', '!Béatrice', '&Valentin', '&Claude',
+      '!Julienne', '&Alexis', '!Bernadette', '&Gabin', '!Aimée',
+      '&Pierre Damien', '!Isabelle', '&Lazare', '&Modeste', '&Roméo', '&Nestor',
       '!Honorine', '&Romain', '&Auguste' ],
     # mars
-    [ '&Aubin', '&Charles le Bon', '&Guénolé', '&Casimir', '&Olive', '&Colette',
-      '!Félicité', '&Jean de Dieu', '!Françoise', '&Vivien', '!Rosine',
-      '!Justine', '&Rodrigue', '!Mathilde', '!Louise de Marillac', '!Bénédicte',
-      '&Patrice', '&Cyrille', '&Joseph', '&Herbert', '!Clémence', '!Léa',
-      '&Victorien', '!Catherine de Suède', '-Annonciation', '!Larissa',
-      '&Habib', '&Gontran', '!Gwladys', '&Amédée', '&Benjamin' ],
+    [ '&Aubin', '&Charles le Bon', '&Guénolé', '&Casimir', '&Olive', '&Colette',
+      '!Félicité', '&Jean de Dieu', '!Françoise', '&Vivien', '!Rosine',
+      '!Justine', '&Rodrigue', '!Mathilde', '!Louise de Marillac', '!Bénédicte',
+      '&Patrice', '&Cyrille', '&Joseph', '&Herbert', '!Clémence', '!Léa',
+      '&Victorien', '!Catherine de Suède', '-Annonciation', '!Larissa',
+      '&Habib', '&Gontran', '!Gwladys', '&Amédée', '&Benjamin' ],
     # avril
-    [ '&Hugues', '!Sandrine', '&Richard', '&Isodore', '!Irène', '&Marcellin',
+    [ '&Hugues', '!Sandrine', '&Richard', '&Isodore', '!Irène', '&Marcellin',
       '&Jean-Baptiste de la Salle', '!Julie', '&Gautier', '&Fulbert',
       '&Stanislas', '&Jules', '!Ida', '&Maxime', '&Paterne',
-      '&Benoît-Joseph Labre', '&Anicet', '&Parfait', '!Emma', '!Odette',
-      '&Anselme', '&Alexandre', '&Georges', '&Fidèle', '&Marc', '!Alida',
-      '!Zita', '!Valérie', '!Catherine de Sienne', '&Robert' ],
+      '&Benoît-Joseph Labre', '&Anicet', '&Parfait', '!Emma', '!Odette',
+      '&Anselme', '&Alexandre', '&Georges', '&Fidèle', '&Marc', '!Alida',
+      '!Zita', '!Valérie', '!Catherine de Sienne', '&Robert' ],
     # mai
-    [ '&Jérémie - FETE du TRAVAIL', '&Boris', '&Philippe / Jacques', '&Sylvain',
-      '!Judith', '!Prudence', '!Gisèle', '&Désiré - ANNIVERSAIRE 1945',
-      '&Pacôme', '!Solange', '!Estelle', '&Achille', '!Rolande', '&Mathias',
-      '!Denise', '&Honoré', '&Pascal', '&Eric', '&Yves', '&Bernardin',
-      '&Constantin', '&Emile', '&Didier', '&Donatien', '!Sophie', '&Bérenger',
+    [ '&Jérémie - FETE du TRAVAIL', '&Boris', '&Philippe / Jacques', '&Sylvain',
+      '!Judith', '!Prudence', '!Gisèle', '&Désiré - ANNIVERSAIRE 1945',
+      '&Pacôme', '!Solange', '!Estelle', '&Achille', '!Rolande', '&Mathias',
+      '!Denise', '&Honoré', '&Pascal', '&Eric', '&Yves', '&Bernardin',
+      '&Constantin', '&Emile', '&Didier', '&Donatien', '!Sophie', '&Bérenger',
       '&Augustin', '&Germain', '&Aymar', '&Ferdinand', '-Visitation' ],
     # juin
-    [ '&Justin', '!Blandine', '&Kévin', '!Clotilde', '&Igor', '&Norbert',
-      '&Gilbert', '&Médard', '!Diane', '&Landry', '&Barnabé', '&Guy',
-      '&Antoine de Padoue', '&Elisée', '!Germaine', '&Jean-François Régis',
-      '&Hervé', '&Léonce', '&Romuald', '&Silvère', '&Rodolphe', '&Alban',
+    [ '&Justin', '!Blandine', '&Kévin', '!Clotilde', '&Igor', '&Norbert',
+      '&Gilbert', '&Médard', '!Diane', '&Landry', '&Barnabé', '&Guy',
+      '&Antoine de Padoue', '&Elisée', '!Germaine', '&Jean-François Régis',
+      '&Hervé', '&Léonce', '&Romuald', '&Silvère', '&Rodolphe', '&Alban',
       '!Audrey', '&Jean-Baptiste', '&Salomon', '&Anthelme', '&Fernand',
-      '&Irénée', '&Pierre / Paul', '&Martial' ],
+      '&Irénée', '&Pierre / Paul', '&Martial' ],
     # juillet
     [ '&Thierry', '&Martinien', '&Thomas', '&Florent', '&Antoine', '!Mariette',
-      '&Raoul', '&Thibaut', '!Amandine', '&Ulrich', '&Benoît', '&Olivier',
-      '&Henri / Joël', '!Camille - FETE NATIONALE', '&Donald',
-      '-N.D. du Mont Carmel', '!Charlotte', '&Frédéric', '&Arsène', '!Marina',
+      '&Raoul', '&Thibaut', '!Amandine', '&Ulrich', '&Benoît', '&Olivier',
+      '&Henri / Joël', '!Camille - FETE NATIONALE', '&Donald',
+      '-N.D. du Mont Carmel', '!Charlotte', '&Frédéric', '&Arsène', '!Marina',
       '&Victor', '!Marie-Madeleine', '!Brigitte', '!Christine', '&Jacques',
       '&Anne', '!Nathalie', '&Samson', '!Marthe', '!Juliette',
       '&Ignace de Loyola' ],
-    # août
+    # août
     [ '&Alphonse', '&Julien', '!Lydie', '&Jean-Marie Vianney', '&Abel',
-      '-Transfiguration', '&Gaëtan', '&Dominique', '&Amour', '&Laurent',
+      '-Transfiguration', '&Gaëtan', '&Dominique', '&Amour', '&Laurent',
       '!Claire', '!Clarisse', '&Hippolyte', '&Evrard',
-      '!Marie - ASSOMPTION', '&Armel', '&Hyacinthe', '!Hélène', '&Jean Eudes',
-      '&Bernard', '&Christophe', '&Fabrice', '!Rose de Lima', '&Barthélémy',
+      '!Marie - ASSOMPTION', '&Armel', '&Hyacinthe', '!Hélène', '&Jean Eudes',
+      '&Bernard', '&Christophe', '&Fabrice', '!Rose de Lima', '&Barthélémy',
       '&Louis', '!Natacha', '!Monique', '&Augustin', '!Sabine', '&Fiacre',
       '&Aristide' ],
     # septembre
-    [ '&Gilles', '!Ingrid', '&Grégoire', '!Rosalie', '!Raïssa', '&Bertrand',
-      '!Reine', '-Nativité de Marie', '&Alain', '!Inès', '&Adelphe',
-      '&Apollinaire', '&Aimé', '-La Ste Croix', '&Roland', '!Edith', '&Renaud',
-      '!Nadège', '!Emilie', '&Davy', '&Matthieu', '&Maurice', '&Constant',
-      '!Thècle', '&Hermann', '&Côme / Damien', '&Vincent de Paul', '&Venceslas',
-      '&Michel / Gabriel', '&Jérôme' ],
+    [ '&Gilles', '!Ingrid', '&Grégoire', '!Rosalie', '!Raïssa', '&Bertrand',
+      '!Reine', '-Nativité de Marie', '&Alain', '!Inès', '&Adelphe',
+      '&Apollinaire', '&Aimé', '-La Ste Croix', '&Roland', '!Edith', '&Renaud',
+      '!Nadège', '!Emilie', '&Davy', '&Matthieu', '&Maurice', '&Constant',
+      '!Thècle', '&Hermann', '&Côme / Damien', '&Vincent de Paul', '&Venceslas',
+      '&Michel / Gabriel', '&Jérôme' ],
     # octobre
-    [ '!Thérèse de l\'Enfant Jésus', '&Léger', '&Gérard', '&François d\'Assise',
-      '!Fleur', '&Bruno', '&Serge', '!Pélagie', '&Denis', '&Ghislain', '&Firmin',
-      '&Wilfried', '&Géraud', '&Juste', '!Thérèse d\'Avila', '!Edwige',
-      '&Baudouin', '&Luc', '&René', '!Adeline', '!Céline', '!Elodie',
-      '&Jean de Capistran', '&Florentin', '&Crépin', '&Dimitri', '!Emeline',
+    [ '!Thérèse de l\'Enfant Jésus', '&Léger', '&Gérard', '&François d\'Assise',
+      '!Fleur', '&Bruno', '&Serge', '!Pélagie', '&Denis', '&Ghislain', '&Firmin',
+      '&Wilfried', '&Géraud', '&Juste', '!Thérèse d\'Avila', '!Edwige',
+      '&Baudouin', '&Luc', '&René', '!Adeline', '!Céline', '!Elodie',
+      '&Jean de Capistran', '&Florentin', '&Crépin', '&Dimitri', '!Emeline',
       '&Simon / Jude', '&Narcisse', '!Bienvenue', '&Quentin' ],
     # novembre
-    [ '&Harold - TOUSSAINT', '-Défunts', '&Hubert', '&Charles', '!Sylvie',
-      '!Bertille', '!Carine', '&Geoffroy', '&Théodore', '&Léon',
+    [ '&Harold - TOUSSAINT', '-Défunts', '&Hubert', '&Charles', '!Sylvie',
+      '!Bertille', '!Carine', '&Geoffroy', '&Théodore', '&Léon',
       '&Martin - ARMISTICE 1918', '&Christian', '&Brice', '&Sidoine', '&Albert',
       '!Marguerite', '!Elisabeth', '!Aude', '&Tanguy', '&Edmond',
-      '-Présentation de Marie', '!Cécile', '&Clément', '!Flora', '!Catherine',
-      '!Delphine', '&Séverin', '&Jacques de la Marche', '&Saturnin', '&André' ],
-    # décembre
-    [ '!Florence', '!Viviane', '&Xavier', '!Barbara', '&Gérald', '&Nicolas',
-      '&Ambroise', '-Immaculée Conception', '&Pierre Fourier', '&Romaric',
+      '-Présentation de Marie', '!Cécile', '&Clément', '!Flora', '!Catherine',
+      '!Delphine', '&Séverin', '&Jacques de la Marche', '&Saturnin', '&André' ],
+    # décembre
+    [ '!Florence', '!Viviane', '&Xavier', '!Barbara', '&Gérald', '&Nicolas',
+      '&Ambroise', '-Immaculée Conception', '&Pierre Fourier', '&Romaric',
       '&Daniel', '!Jeanne de Chantal', '!Lucie', '!Odile', '!Ninon', '!Alice',
-      '&Gaël', '&Gatien', '&Urbain', '&Abraham', '&Pierre Canisius',
-      '!Françoise-Xavier', '&Armand', '!Adèle', '&Emmanuel - NOEL', '&Etienne',
+      '&Gaël', '&Gatien', '&Urbain', '&Abraham', '&Pierre Canisius',
+      '!Françoise-Xavier', '&Armand', '!Adèle', '&Emmanuel - NOEL', '&Etienne',
       '&Jean', '-Sts Innocents', '&David', '&Roger', '&Sylvestre' ],
 );
 

scripts/perl/growl-notify.pl

@@ -0,0 +1,94 @@
+# growl-notify.pl -- Have Weechat send notifications thru Mac::Growl
+# Copyright (c) 2007 Zak B. Elep <zakame@spunge.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+use strict;
+
+use Mac::Growl;
+
+my $app = 'Weechat (Curses)';
+my @messages_events = (
+	[ nick => 'Changed Nick', '$nick has changed nick to $text' ],
+	[ join => 'Joined Room', '$nick has joined $text' ],
+	[ part => 'Left Room', '$nick has left $channel($text)' ],
+	[ quit => 'Quit', '$nick has quit($text)' ],
+	[ topic => 'Set Topic', '$nick has set topic to \'$text\'' ],
+	[ weechat_highlight => 'Highlight Mentioned', '$text in $channel' ],
+	[ weechat_pv => 'Private Message', '$nick: $text' ],
+);
+my $notes;
+push @$notes, $_->[1] foreach @messages_events;
+
+Mac::Growl::RegisterNotifications $app, $notes, $notes;
+
+my $version = '0.2';
+weechat::register 'growl-notify', $version, '',
+	'Send Weechat notifications thru Mac::Growl';
+
+for my $message (@messages_events) {
+	no strict 'refs';	# access symbol table
+	my $subname = join '', __PACKAGE__, '::handler_', $message->[0];
+	*{$subname} = sub
+	{
+		my($server, $args) = @_;
+		# weechat::print $args;
+		my($mask, $nick, $channel, $text);
+		(undef, $channel, $text) = split /:/, $args, 3;
+		($mask, undef, $channel) = split / /, $channel;
+		($nick, undef) = split /!/, $mask;
+		Mac::Growl::PostNotification $app, $message->[1],
+			$message->[1], eval qq("$message->[2]"),
+			($message->[0] =~ /(pv|highlight)/ ? 1 : 0);
+		return weechat::PLUGIN_RC_OK;
+	};
+	weechat::add_message_handler $message->[0], $subname;
+}
+
+__END__
+
+=head1 NAME
+
+growl-notify.pl - Send Weechat notifications thru the Growl framework for Mac
+
+=head1 SYNOPSIS
+
+	# in Weechat console, do
+	/perl load /path/to/growl-notify.pl
+
+	# or put script in .weechat/perl/autoload/
+
+=head1 DESCRIPTION
+
+growl-notify is a script plugin for Weechat that sends notifications of common
+IRC events (such as joins, highlights, and private messages) to the Growl
+notification framework for the Macintosh.  It uses the perl module L<Mac::Growl>
+to do its magic, even allowing the ncurses version of Weechat to generate
+graphical or audible event notifications.
+
+=head1 SEE ALSO
+
+L<http://growl.info>, L<Mac::Growl>, L<http://weechat.flashtux.org>
+
+=head1 AUTHORS
+
+Zak B. Elep, C<< zakame at spunge.org >>
+
+=cut
+

scripts/perl/layout.pl

@@ -0,0 +1,216 @@
+#
+# Copyright (c) 2007 by FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+#
+# Save/restore buffers layout.
+#
+# History:
+#
+# 2007-08-10, FlashCode <flashcode@flashtux.org>:
+#     version 0.2, minor changes in script description
+# 2007-08-10, FlashCode <flashcode@flashtux.org>:
+#     version 0.1, initial release
+#
+
+use strict;
+
+my $version = "0.2";
+
+# default values in setup file (~/.weechat/plugins.rc)
+my $default_auto_save = "on";
+
+weechat::register("layout", $version, "unload_layout", "Save/restore buffers layout");
+weechat::set_plugin_config("auto_save", $default_auto_save) if (weechat::get_plugin_config("auto_save") eq "");
+
+weechat::add_command_handler("layout", "layout",
+                             "save/restore buffers layout",
+                             "[save]",
+                             "save: save buffers order",
+                             "save");
+weechat::add_event_handler("buffer_open", "buffer_open");
+
+
+# get buffer name, depending on type of buffer
+
+sub get_buffer_name
+{
+    # DCC type ?
+    return "<DCC>" if ($_[0] eq "1");
+    
+    # RAW IRC type ?
+    return "<RAW>" if ($_[0] eq "2");
+    
+    # no channel ?
+    if ($_[2] eq "")
+    {
+        return "<servers>" if (weechat::get_config("look_one_server_buffer") eq "on");
+        return "<empty>" if ($_[1] eq "");
+        return $_[1];
+    }
+    
+    # return server/channel
+    return $_[1]."/".$_[2];
+}
+
+# get buffer list and build a hash:  number => name
+
+sub get_layout_hash
+{
+    my %buflist;
+    my $bufinfo = weechat::get_buffer_info();
+    if ($bufinfo)
+    {
+        while (my ($nobuf, $binfos) = each %$bufinfo)
+        {
+            $buflist{$nobuf}{"server"} = $$binfos{"server"};
+            $buflist{$nobuf}{"channel"} = $$binfos{"channel"};
+            $buflist{$nobuf}{"name"} = get_buffer_name($$binfos{"type"},
+                                                       $$binfos{"server"},
+                                                       $$binfos{"channel"});
+        }
+    }
+    return %buflist;
+}
+
+# get buffet list and build a hash:  name => number
+
+sub get_layout_hash_by_name
+{
+    my %buflist;
+    my $bufinfo = weechat::get_buffer_info();
+    if ($bufinfo)
+    {
+        while (my ($nobuf, $binfos) = each %$bufinfo)
+        {
+            my $name = get_buffer_name($$binfos{"type"},
+                                       $$binfos{"server"},
+                                       $$binfos{"channel"});
+            $buflist{$name} = $nobuf;
+        }
+    }
+    return %buflist;
+}
+
+# build a string with buffer list hash
+
+sub get_layout_string
+{
+    my $layout = "";
+    my %buflist = get_layout_hash();
+    my @keys = sort { $a <=> $b } (keys %buflist);
+    foreach my $key (@keys)
+    {
+        $layout .= ",".$key.":".$buflist{$key}{"name"};
+    }
+    $layout = substr($layout, 1);
+    return $layout;
+}
+
+# build a hash (name => number) from config string
+
+sub get_hash_from_string
+{
+    my %buflist;
+    my @fields = split(/,/, $_[0]);
+    foreach my $field (@fields)
+    {
+        $buflist{$2} = $1 if ($field =~ /([0-9]+):(.*)/);
+    }
+    return %buflist;
+}
+
+# save layout to plugin option
+
+sub save_layout
+{
+    my $layout = get_layout_string();
+    if ($layout ne "")
+    {
+        weechat::print_server("Layout: saving buffers order: $layout");
+        weechat::set_plugin_config("buffers", $layout);
+    }
+}
+
+# the /layout command
+
+sub layout
+{
+    if ($_[1] eq "save")
+    {
+        save_layout();
+    }
+    else
+    {
+        weechat::command("/help layout");
+    }
+    return weechat::PLUGIN_RC_OK;
+}
+
+# event handler called when a buffer is open
+
+sub buffer_open
+{
+    # retrieve current layout and config layout
+    my %buflist = get_layout_hash();
+    my %buflist_name = get_layout_hash_by_name();
+    my %config = get_hash_from_string(weechat::get_plugin_config("buffers"));
+    
+    my $name = $buflist{$_[0]}{"name"};
+    
+    # scan open buffers and look for correct position
+    my $pos = $config{$name};
+    if ($pos ne "")
+    {
+        my @keys = sort { $b <=> $a } (keys %buflist);
+        my $nbbuf = $#keys + 1;
+        
+        # find best position (move to last known buffer + 1)
+        my ($best_pos, $best_pos2) = (-1, -1);
+        my $config_seen = 0;
+        foreach my $key (@keys)
+        {
+            $config_seen = 1 if (($name ne $buflist{$key}{"name"})
+                                 && ($config{$buflist{$key}{"name"}} ne ""));
+            $best_pos = scalar($key) if ($config_seen == 0);
+        }
+        foreach my $key (@keys)
+        {
+            $best_pos2 = scalar($key) if (($best_pos2 == -1)
+                                          && ($name ne $buflist{$key}{"name"})
+                                          && ($config{$buflist{$key}{"name"}} ne "")
+                                          && (scalar($config{$name}) < scalar($config{$buflist{$key}{"name"}})));
+        }
+        $best_pos = $best_pos2 if (($best_pos2 != -1) && ($best_pos2 < $best_pos));
+        
+        if (($best_pos != -1) && ($best_pos != scalar($buflist_name{$name})))
+        {
+            weechat::command("/buffer move $best_pos",
+                             $buflist{$_[0]}{"channel"},
+                             $buflist{$_[0]}{"server"});
+        }
+    }
+    
+    return weechat::PLUGIN_RC_OK;
+}
+
+# function called when unloading script (save layout if auto_save is on)
+
+sub unload_layout
+{
+    my $auto_save = weechat::get_plugin_config("auto_save");
+    save_layout() if (lc($auto_save) eq "on");
+}

scripts/perl/logsearch.pl

@@ -1,9 +1,9 @@
 #
-# Copyright (c) 2006 by FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2006-2007 by FlashCode <flashcode@flashtux.org>
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,27 +12,30 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #
 # Search for text in WeeChat disk log files.
 #
 # History:
+# 2007-08-10, FlashCode <flashcode@flashtux.org>:
+#     version 0.2: upgraded licence to GPL 3
 # 2006-04-17, FlashCode <flashcode@flashtux.org>:
-#     initial release
+#     version 0.1: initial release
 #
 
 use strict;
 
+my $version = "0.2";
+
 # default values in setup file (~/.weechat/plugins.rc)
 my $default_max          = "8";
 my $default_server       = "off";
 my $default_grep_options = "-i";
 
 # init script
-weechat::register("logsearch", "0.1", "", "Search for text in WeeChat disk log files");
+weechat::register("logsearch", $version, "", "Search for text in WeeChat disk log files");
 weechat::set_plugin_config("max", $default_max) if (weechat::get_plugin_config("max") eq "");
 weechat::set_plugin_config("server", $default_server) if (weechat::get_plugin_config("server") eq "");
 weechat::set_plugin_config("grep_options", $default_grep_options) if (weechat::get_plugin_config("grep_options") eq "");

scripts/perl/oldtopic.pl

@@ -3,7 +3,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,21 +12,22 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #
 # Display old topics for a channel.
 #
 # History:
+# 2007-08-10, FlashCode <flashcode@flashtux.org>:
+#     version 0.2: upgraded licence to GPL 3
 # 2007-03-29, FlashCode <flashcode@flashtux.org>:
-#     initial release
+#     version 0.1: initial release
 #
 
 use strict;
 
-my $version = "0.1";
+my $version = "0.2";
 
 my $plugin_help_options = "Plugins options (set with /setp):\n"
     ."  - perl.oldtopic.log_server: if on, displays all topic changes on server buffer\n"

scripts/perl/sound.pl

@@ -1,9 +1,9 @@
 #
-# Copyright (c) 2006 by FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2006-2007 by FlashCode <flashcode@flashtux.org>
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #
@@ -21,6 +20,8 @@
 #
 # History:
 #
+# 2007-08-10, FlashCode <flashcode@flashtux.org>:
+#     version 0.4: upgraded licence to GPL 3
 # 2006-05-30, FlashCode <flashcode@flashtux.org>:
 #     added plugin options for commands
 # 2004-10-01, FlashCode <flashcode@flashtux.org>:
@@ -29,7 +30,7 @@
 
 use strict;
 
-my $version = "0.3";
+my $version = "0.4";
 my $command_suffix = " >/dev/null 2>&1 &";
 
 # default values in setup file (~/.weechat/plugins.rc)

scripts/perl/translate.pl

@@ -1,9 +1,9 @@
 #
-# Copyright (c) 2006 by FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2006-2007 by FlashCode <flashcode@flashtux.org>
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -12,20 +12,23 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #
 # Translate words and display result in infobar, local buffer or channel
 #
 # History:
+# 2007-08-10, FlashCode <flashcode@flashtux.org>:
+#     version 0.2: upgraded licence to GPL 3
 # 2006-07-03, FlashCode <flashcode@flashtux.org>:
-#     initial release
+#     version 0.1: initial release
 #
 
 use strict;
 
+my $version = "0.2";
+
 # default values in setup file (~/.weechat/plugins.rc)
 my $default_output_infobar = "on";
 my $default_timeout = "2";
@@ -34,7 +37,7 @@ my $default_timeout = "2";
 my $languages = "de|el|en|es|fr|it|ja|ko|nl|pt|ru|zh|zt";
 
 # init script
-weechat::register("translate", "0.1", "", "Translation script");
+weechat::register("translate", $version, "", "Translation script");
 weechat::set_plugin_config("output_infobar", $default_output_infobar) if (weechat::get_plugin_config("output_infobar") eq "");
 weechat::set_plugin_config("timeout", $default_timeout) if (weechat::get_plugin_config("timeout") eq "");
 

scripts/perl/weeter.pl

@@ -0,0 +1,78 @@
+# weeter.pl -- Send CTCP ACTION messages as Twitter status updates
+# Copyright (c) 2007 Zak B. Elep <zakame@spunge.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+use strict;
+
+use Net::Twitter;
+
+my $version = '0.1';
+weechat::register 'weeter', $version, '',
+	'Send CTCP ACTION messages as Twitter status updates';
+
+my %credentials;
+for(qw(username password)){
+	$credentials{$_} = weechat::get_plugin_config $_;
+}
+my $twitter = new Net::Twitter %credentials;
+
+weechat::add_modifier 'irc_user', 'privmsg', 'twitter_update';
+sub twitter_update
+{
+	my $message = $_[1];
+	(my $status = $message) =~ s#^/me\s+##;
+	update $twitter $status unless $status eq $message;
+	return $message;
+}
+
+__END__
+
+=head1 NAME
+
+weeter.pl - Send Weechat CTCP ACTION messages to Twitter as status updates
+
+=head1 SYNOPSIS
+
+	# in Weechat console, do
+	/setp perl.weeter.username = 'your-twitter-username'
+	/setp perl.weeter.password = 'your-twitter-password'
+	/perl load /path/to/weeter.pl
+
+	# or do the /setp and put script in .weechat/perl/autoload
+
+=head1 DESCRIPTION
+
+weeter is a script plugin for Weechat that enables CTCP ACTION messages (aka
+C</me> actions) to be sent to the Twitter web service as user status updates.
+It uses the L<Net::Twitter> plugin from CPAN to do its work.
+
+weeter requires the variables C<perl.weeter.username> and 
+C<perl.weeter.password> defined prior to use.
+
+=head1 SEE ALSO
+
+L<http://twitter.com>, L<Net::Twitter>, L<http://weechat.flashtux.org>
+
+=head1 AUTHORS
+
+Zak B. Elep, C<< zakame at spunge.org >>
+
+=cut
+

scripts/python/awl.py

@@ -5,22 +5,42 @@
   The script is in the public domain.
   Leonid Evdokimov (weechat at darkk dot net dot ru)
   http://darkk.net.ru/weechat/awl.py
+
+0.1 - initial commit
+0.2 - added `show_servers` option
+0.3 - infobar is actually redrawed only if that's necessary
 """
 
 #######################################################################
 
 import weechat
+from itertools import ifilter
 
-version = "0.1"
+VERSION = "0.3"
+NAME = "awl"
 # how often to refresh infobar
 timer_interval = 1
+blist = ()
 
 def cleanup():
     weechat.remove_infobar(-1)
     return weechat.PLUGIN_RC_OK
 
+def cfg_boolean(key, default = False):
+    map = {True: 'ON', False: 'OFF'}
+    value = weechat.get_plugin_config(key).upper()
+    if not value in map.values():
+        if value:
+            weechat.prnt("[%s]: invalid %s value (%s), resetting to %s" % (NAME, key, value, map[default]))
+        weechat.set_plugin_config(key, map[default])
+        value = default
+    else:
+        value = ifilter(lambda p: p[1] == value, map.iteritems()).next()[0]
+    return value
+
 def update_channels():
-    the_string = [];
+    global blist
+    names = ()
     buffers = weechat.get_buffer_info()
     if buffers != None:
         for index, buffer in buffers.iteritems():
@@ -29,19 +49,28 @@ def update_channels():
             if len(buffer['channel']):
                 name = buffer['channel']
             elif len(buffer['server']):
-                name = "[" + buffer['server'] + "]"
+                if cfg_boolean('show_servers'):
+                    name = "[" + buffer['server'] + "]"
+                else:
+                    continue
             else:
                 name = "?"
-            the_string.append("%i:%s" % (index, name))
-    the_string = " ".join(the_string)
-    weechat.remove_infobar(-1)
-    weechat.print_infobar(0, the_string);
+            names += ("%i:%s" % (index, name), )
+    if (names != blist):
+        the_string = " ".join(names)
+        blist = names
+        weechat.remove_infobar(-1)
+        weechat.print_infobar(0, the_string);
 
 def on_timer():
     update_channels()
     return weechat.PLUGIN_RC_OK
 
-if weechat.register("awl", version, "cleanup", "bufferlist in infobar"):
+if weechat.register(NAME, VERSION, "cleanup", "bufferlist in infobar"):
     #message handlers are called __before__ buflist is changed, so we don't use them
     weechat.add_timer_handler(timer_interval, "on_timer")
+    cfg_boolean('show_servers', False)
     update_channels()
+
+# vim:set tabstop=4 softtabstop=4 shiftwidth=4:
+# vim:set expandtab:

scripts/python/catapult.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #   Catapult v0.2 - less ordinary abuse generator
 #   Copyright (C) 2007  Pavel Shevchuk <stlwrt@gmail.com>
 

scripts/python/ctcp.py

@@ -18,7 +18,7 @@
     -- Leonid Evdokimov (weechat at darkk dot net one more dot ru)
 """
 
-version = "0.9"
+version = "0.10"
 history = """
   0.1 initial
   0.2
@@ -38,6 +38,8 @@ history = """
     - fixed on_msg (occasionally caused a minor fault)
   0.9
     - added dump_to_servchan and dump_to_current setting
+  0.10
+    - added SILENT (asmanian)
 """
 
 short_syntax = """[REQUEST ANSWER]"""
@@ -46,7 +48,8 @@ syntax = """  Examples:
 
     /set_ctcp 
       show settings for common CTCP-Requests.
-      where "OFF" means "use weechat default behaviour.
+      where "OFF" means "use weechat default behaviour,
+      "SILENT" means: "dont answer at all".
 
     /set_ctcp VERSION I prefer using weechat $version
       Reply with a fancy message.
@@ -121,6 +124,9 @@ def on_msg(server, args):
       if not ans or ans == "OFF":
         raise ValueError
 
+      if ans == "SILENT":
+        return wc.PLUGIN_RC_OK_IGNORE_ALL
+
       info = {
         "version": wc.get_info("version"),
         "nick": wc.get_info("nick"),

scripts/python/mpd.py

@@ -0,0 +1,66 @@
+# Author: Skippy the Kangoo <Skippythekangoo AT yahoo DOT fr>
+# This script manages basic controls of mpd (play/pause, next song, previous song, increase volume, decrease volume, display current song) 
+# Usage: /mpd toggle|next|prev|volume_up|volume_down|status
+# Released under GNU GPL v2 or newer
+
+import weechat
+from os import popen
+
+weechat.register ('mpd', '0.0.2', '', 'mpd control script')
+
+weechat.add_command_handler('mpd', 'mpd', 'mpd control', 'toggle|next|prev|volume_up|volume_down|status', '', 'toggle|next|prev|volume_up|volume_down|status')
+
+def toggle (server, args,):
+	popen('mpc toggle')
+	return weechat.PLUGIN_RC_OK
+
+def next (server, args,):
+	popen('mpc next')
+	return weechat.PLUGIN_RC_OK
+
+def prev (server, args,):
+	popen('mpc prev')
+	return weechat.PLUGIN_RC_OK
+
+def volume_up (server, args,):
+	popen('mpc volume +10')
+	return weechat.PLUGIN_RC_OK
+
+def volume_down (server, args,):
+	volume_down = popen('mpc volume -10')
+	return weechat.PLUGIN_RC_OK
+
+def status (server, args,):
+	status = popen('mpc').readline().rstrip()
+	weechat.print_infobar(3, status)
+	return weechat.PLUGIN_RC_OK
+
+def mpd(server, args):
+
+	largs = args.split(" ")    
+
+	#strip spaces
+	while '' in largs:
+		largs.remove('')
+	while ' ' in largs:
+		largs.remove(' ')
+
+	if len(largs) ==  0:
+		weechat.command("/help mpd")
+		return weechat.PLUGIN_RC_OK
+	else:
+		inchan = False
+
+	if largs[0] == 'toggle':
+		toggle(" ".join(largs[1:]), inchan)
+	elif largs[0] == 'next':
+		next(" ".join(largs[1:]), inchan)
+	elif largs[0] == 'prev':
+		prev(' '.join(largs[1:]), inchan)
+	elif largs[0] == 'volume_up':
+		volume_up(' '.join(largs[1:]), inchan)
+	elif largs[0] == 'volume_down':
+		volume_down(' '.join(largs[1:]), inchan)
+	elif largs[0] == 'status':
+		status(" ".join(largs[1:]), inchan)
+	return weechat.PLUGIN_RC_OK

scripts/python/theme.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 Theme manager for WeeChat. 
 It loads configuration parameters from file 

scripts/python/tinyurl.py

@@ -1,4 +1,3 @@
-#!/bin/env python
 #
 # TinyUrl, version 3.3, for weechat version 0.1.9
 #

scripts/python/urlgrab.py

@@ -1,5 +1,5 @@
 #
-# UrlGrab, version 1.0, for weechat version 0.1.6
+# UrlGrab, version 1.1, for weechat version 0.2.4
 #
 #   Listens to all channels for URLs, collects them in a list, and launches
 #   them in your favourite web server on the local host or a remote server.
@@ -59,9 +59,13 @@
 #     The file where the command output (if any) is saved.  Overwritten
 #     each time you launch a new URL.  Default is ~/.weechat/urllaunch.log
 #
+#   default
+#     The command that will be run if no arguemnts to /url are given.
+#     Default is help
+#
 # Requirements:
 #
-#  - Designed to run with weechat version 1.0.6 or better.
+#  - Designed to run with weechat version 0.2.4 or better.
 #      http://weechat.flashtux.org/
 #
 # Acknowlegements:
@@ -70,6 +74,13 @@
 #    irc.freenode.net/#weechat Honestly, I just cleaned up the code a bit and
 #    made the settings a little more useful (to me).
 #
+#  - With changes by Leonid Evdokimov (weechat at darkk dot net another dot ru):
+#    http://darkk.net.ru/weechat/urlgrab.py
+#    v1.1:  added better handling of dead zombie-childs
+#           added parsing of private messages
+#           added default command setting
+#           added parsing of scrollback buffers on load
+#
 # Copyright (C) 2005 Jim Ramsay <i.am@jimramsay.com>
 #
 # This program is free software; you can redistribute it and/or
@@ -88,16 +99,13 @@
 # USA.
 #
 
+import sys
 import os
 import weechat
+import subprocess
 
 UC_NAME="UrlGrab"
-UC_VERSION="1.0"
-
-weechat.register (UC_NAME, UC_VERSION, "", "Url collector/launcher for weechat")
-weechat.add_message_handler("privmsg", "urlGrabCheck")
-weechat.add_command_handler("url", "urlGrabMain", 
-  "Controls UrlGrab -> '/url help' for usage")
+UC_VERSION="1.1"
 
 def urlGrabPrint(message):
     weechat.prnt("-[%s]- %s" % ( UC_NAME, message ) )
@@ -114,6 +122,8 @@ class WeechatSetting:
 class UrlGrabSettings:
     def __init__(self):
         self.settings = {
+            'default':WeechatSetting('default', 'help',
+                "default command to /url to run if none given" ),
             'historysize':WeechatSetting('historysize', '10',
                 "Number of URLs to keep per channel" ),
             'method':WeechatSetting('method', 'local',
@@ -276,15 +286,22 @@ class UrlGrabber:
         if not found:
             urlGrabPrint(channel + "@" +  server + ": no entries")
 
-def urlGrabParsemsg(command):
-    infos = command.split(" ")
-    chan = infos[2]
-    message = " ".join(infos[3:])[1:]
-    return (chan, message)
+def urlGrabParsemsg(server, command):
+    # :nick!ident@host PRIVMSG dest :foobarbaz
+    l = command.split(' ')
+    mask = l[0][1:]
+    dest = l[2]
+    message = ' '.join(l[3:])[1:]
+    ###########################################
+    #nothing, info, message = command.split(":", 2)
+    #info = info.split(' ')
+    if dest == weechat.get_info('nick', server):
+        source = mask.split("!")[0]
+    else:
+        source = dest
+    return (source, message)
 
-def urlGrabCheck(server, args):
-    global urlGrab
-    chan, message = urlGrabParsemsg(args)
+def urlGrabCheckMsgline(server, chan, message):
     # Ignore output from 'tinyurl.py'
     if message.startswith( "[AKA] http://tinyurl.com" ):
         return weechat.PLUGIN_RC_OK
@@ -294,17 +311,20 @@ def urlGrabCheck(server, args):
            word[0:8] == "https://" or \
            word[0:6] == "ftp://":
             urlGrab.addUrl(word, chan, server)
-    # check for any dead children and clean them up
-    while True:
-        try:
-            mypid, status = os.waitpid(0, os.WNOHANG)        
-        except:
-            break
-        else:
-            if mypid <= 0:
-                break
+
+def urlGrabCheck(server, args):
+    global urlGrab
+    chan, message = urlGrabParsemsg(server, args)
+    urlGrabCheckMsgline(server, chan, message)
     return weechat.PLUGIN_RC_OK
 
+def urlGrabCheckOnload():
+    for buf in weechat.get_buffer_info().itervalues():
+        if len(buf['channel']):
+            lines = weechat.get_buffer_data(buf['server'], buf['channel'])
+            for line in reversed(lines):
+                urlGrabCheckMsgline(buf['server'], buf['channel'], line['data'])
+
 def urlGrabOpen(index, channel = None):
     global urlGrab, urlGrabSettings
 
@@ -336,30 +356,22 @@ def urlGrabOpen(index, channel = None):
             except:
                 urlGrabPrint("Fork failed!")
             if childpid == 0:
-                # in the child- Detach from tty and Exec the command
                 logfile = os.path.expanduser( urlGrabSettings.get( 'cmdlog' ) )
-                din = open("/dev/null", "r")
-                dout = open(logfile, "a")
                 try:
-                    # Redirect IO for the child
-                    os.dup2(din.fileno(), 0)
-                    os.dup2(dout.fileno(), 1)
-                    os.dup2(dout.fileno(), 2)
+                    subprocess.Popen(
+                            argl, 
+                            stdin  = open('/dev/null', 'r'),
+                            stdout = open(logfile, 'a'),
+                            stderr = subprocess.STDOUT)
                 except:
-                    dout.write( "UrlGrab: IO Redirection failed\n" )
-                    dout.close()
-                    din.close()
-                    sys.exit(1)
-                try:
-                    # Actually run the command
-                    os.execvp( argl[0], argl )
-                except:
-                    dout.write( "UrlGrab: Exec failed" )
-                    dout.close()
-                    din.close()
-                    sys.exit(1)
+                    urlGrabPrint(traceback.format_exc(None))
+                sys.exit(0)
             else:
-                # In the parent - Don't wait now, wait later.
+                # In the parent - we may wait for stub to fork again and let the init kill grand-child
+                try:
+                    os.waitpid(childpid, 0)        
+                except:
+                    pass
                 return
 
 def urlGrabList( args ):
@@ -398,50 +410,53 @@ def urlGrabMain(server, args):
     while ' ' in largs:
         largs.remove(' ')
     if len(largs) == 0:
+        largs = [urlGrabSettings.get('default')]
+    if largs[0] == 'help':
         urlGrabHelp()
-    else:
-        if largs[0] == 'help':
-            urlGrabHelp()
-        elif largs[0] == 'list':
-            urlGrabList( largs[1:] )
-        elif largs[0] == 'set':
-            try:
-                if (len(largs) == 1):
-                    urlGrabPrint( "Available settings:" )
-                    urlGrabSettings.prntall()
-                elif (len(largs) == 2):
-                    name = largs[1]
-                    urlGrabPrint( "Get %s" % name )
-                    urlGrabSettings.prnt( name )
-                elif (len(largs) > 2):
-                    name = largs[1]
-                    value = None
-                    if( largs[2] != "="):
-                        value = " ".join(largs[2:])
-                    elif( largs > 3 and largs[2] == "=" ):
-                        value = " ".join(largs[3:])
-                    urlGrabPrint( "set %s = \'%s\'" % (name, value) )
-                    if value is not None:
-                        try:
-                            urlGrabSettings.set( name, value )
-                            urlGrabSettings.prnt( name, verbose=False )
-                        except ValueError, msg:
-                            weechat.prnt( "  Failed: %s" % msg )
-                    else:
-                        weechat.prnt( "  Failed: No value given" )
-            except KeyError:
-                weechat.prnt( "  Failed: Unrecognized parameter '%s'" % name )
-        else:
-            try:
-                no = int(largs[0])
-                if len(largs) > 1:
-                    urlGrabOpen(no, largs[1])
+    elif largs[0] == 'list':
+        urlGrabList( largs[1:] )
+    elif largs[0] == 'set':
+        try:
+            if (len(largs) == 1):
+                urlGrabPrint( "Available settings:" )
+                urlGrabSettings.prntall()
+            elif (len(largs) == 2):
+                name = largs[1]
+                urlGrabPrint( "Get %s" % name )
+                urlGrabSettings.prnt( name )
+            elif (len(largs) > 2):
+                name = largs[1]
+                value = None
+                if( largs[2] != "="):
+                    value = " ".join(largs[2:])
+                elif( largs > 3 and largs[2] == "=" ):
+                    value = " ".join(largs[3:])
+                urlGrabPrint( "set %s = \'%s\'" % (name, value) )
+                if value is not None:
+                    try:
+                        urlGrabSettings.set( name, value )
+                        urlGrabSettings.prnt( name, verbose=False )
+                    except ValueError, msg:
+                        weechat.prnt( "  Failed: %s" % msg )
                 else:
-                    urlGrabOpen(no)
-            except ValueError:
-                urlGrabPrint( "Unknown command '%s'.  Try '/url help' for usage" % largs[0])
+                    weechat.prnt( "  Failed: No value given" )
+        except KeyError:
+            weechat.prnt( "  Failed: Unrecognized parameter '%s'" % name )
+    else:
+        try:
+            no = int(largs[0])
+            if len(largs) > 1:
+                urlGrabOpen(no, largs[1])
+            else:
+                urlGrabOpen(no)
+        except ValueError:
+            urlGrabPrint( "Unknown command '%s'.  Try '/url help' for usage" % largs[0])
     return weechat.PLUGIN_RC_OK
 
-# Initialize global variables
-urlGrabSettings = UrlGrabSettings()
-urlGrab = UrlGrabber( urlGrabSettings.get('historysize') )
+if weechat.register (UC_NAME, UC_VERSION, "", "Url collector/launcher for weechat"):
+    urlGrabSettings = UrlGrabSettings()
+    urlGrab = UrlGrabber( urlGrabSettings.get('historysize') )
+    urlGrabCheckOnload()
+    weechat.add_message_handler("privmsg", "urlGrabCheck")
+    weechat.add_command_handler("url", "urlGrabMain", "Controls UrlGrab -> '/url help' for usage")
+

scripts/ruby/browse.rb

@@ -0,0 +1,127 @@
+# Copyright (c) 2007 by Javier Valencia <jvalencia@log01.org>
+#
+# This program 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 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+def weechat_init
+	Weechat.register("browse", "0.1", "", "Fast url browsing for Weechat.")
+	
+	Weechat.add_command_handler(
+		"browse", 
+		"do_browse", 
+		"Use your preferred browser to navigate an url.", 
+		"[number of url] (-1 to browse all) (leave empty to browse first one)")
+	Weechat.add_command_handler(
+		"webbrowser", 
+		"set_browser", 
+		"Get/Set browser command", 
+		"[command] (leavy empty to get current command)")
+	Weechat.add_command_handler(
+		"urls", 
+		"get_url_list", 
+		"Get a list of urls in a channel.")
+		
+	Weechat.print("")
+	Weechat.print("See help for 'browse', 'webbrowser' and 'urls' commands.")
+	if Weechat.get_plugin_config("webbrowser").empty?
+		Weechat.print("")
+		Weechat.print("WARNING: you must define a web browser with the command /webbrowser.")
+	end
+	return Weechat::PLUGIN_RC_OK
+end
+
+def set_browser(server, args)
+	if args.empty?
+		Weechat.print("current web browser -> #{Weechat.get_plugin_config('webbrowser')}")
+	else
+		Weechat.set_plugin_config("webbrowser", args)
+		Weechat.print("web browser set to -> #{args}")
+	end
+	return Weechat::PLUGIN_RC_OK
+end
+
+def get_url_array(buffer_data)
+	urls = Array.new
+	buffer_data.each do |line|
+		line["data"].split.each do |word|
+			if word =~ /^http\:\/\/.*/
+				urls << word
+			end
+		end
+	end
+	return urls.uniq.reverse
+end
+
+def get_url_list(server,args)
+	channel = Weechat.get_info("channel")
+	if channel.empty?
+		Weechat.print("You must be inside a channel.")
+		return Weechat::PLUGIN_RC_KO
+	end
+	buffer = Weechat.get_buffer_data(server, channel)
+	unless buffer
+		Weechat.print("Error retrieving window buffer, may be a bug?.")
+		return Weechat::PLUGIN_RC_KO
+	end
+	Weechat.print("")
+	Weechat.print("URL listing:")
+	pos = 0
+	get_url_array(buffer).each do |url|
+		Weechat.print("#{pos}) #{url}")
+		pos += 1
+	end
+	return Weechat::PLUGIN_RC_OK
+end
+
+def do_browse(server, args)
+	num = args.to_i
+	channel = Weechat.get_info("channel")
+	if channel.empty?
+		Weechat.print("You must be inside a channel.")
+		return Weechat::PLUGIN_RC_KO
+	end
+	buffer = Weechat.get_buffer_data(server, channel)
+	unless buffer
+		Weechat.print("Error retrieving window buffer, may be a bug?.")
+		return Weechat::PLUGIN_RC_KO
+	end
+	browser = Weechat.get_plugin_config("webbrowser")
+	if browser.empty?
+		Weechat.print("")
+		Weechat.print("WARNING: you must define a web browser with the command /webbrowser.")
+		return Weechat::PLUGIN_RC_KO
+	end
+	urls = get_url_array(buffer)
+	if urls.empty?
+		Weechat.print("No urls in current channel.")
+	else
+		if num == -1
+			Weechat.print("Starting browser...")
+			fork do	# only for unix/posix
+				exec("#{browser} #{urls.join(' ')} &> /dev/null")
+			end
+		else
+			if urls[num]
+				Weechat.print("Starting browser...")
+				fork do	# only for unix/posix
+					exec("#{browser} #{urls[num]} &> /dev/null")
+				end
+			else
+				Weechat.print("Invalid url number.")
+			end
+		end
+	end
+	return Weechat::PLUGIN_RC_OK
+end

scripts/ruby/forcenick.rb

@@ -0,0 +1,35 @@
+#   Forcenick v1.0 - forces your original nickname
+#   Copyright (C) 2007  Pavel Shevchuk <stlwrt@gmail.com>
+
+#   This program 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 2 of the License, or
+#   (at your option) any later version.
+
+#   This program 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, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+def weechat_init
+	Weechat.register("forcenick", "1.0", "", "Forces your original nickname, wipes out ghosts and nick stealers")
+	Weechat.add_command_handler("forcenick", "forcenick", "Forces server_nick1, identifies to nickserv using server_password. Useful to call from server_command if your connection is unstable")
+end
+
+def forcenick(server, args)
+	server_info = Weechat.get_server_info[server]
+	cur_nick = server_info['nick']
+	forced_nick = server_info['nick1']
+	password = server_info['password']
+	if cur_nick != forced_nick
+		Weechat.command("/msg nickserv ghost #{forced_nick} #{password}", "", server)
+		Weechat.command("/nick #{forced_nick}", "", server)
+		Weechat.command("/msg nickserv identify #{password}", "", server)
+	end
+	return Weechat::PLUGIN_RC_OK
+end
+

src/CMakeLists.txt

@@ -0,0 +1,116 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+
+INCLUDE(CheckIncludeFiles)
+INCLUDE(CheckFunctionExists)
+
+CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
+CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
+CHECK_INCLUDE_FILES("locale.h" HAVE_LOCALE_H)
+CHECK_INCLUDE_FILES("netdb.h" HAVE_NETDB_H)
+CHECK_INCLUDE_FILES("netinet/in.h" HAVE_NETINET_IN_H)
+CHECK_INCLUDE_FILES("stdlib.h" HAVE_STDLIB_H)
+CHECK_INCLUDE_FILES("string.h" HAVE_STRING_H)
+CHECK_INCLUDE_FILES("sys/socket.h" HAVE_SYS_SOCKET_H)
+CHECK_INCLUDE_FILES("sys/time.h" HAVE_SYS_TIME_H)
+CHECK_INCLUDE_FILES("sys/types.h" HAVE_SYS_TYPES_H)
+CHECK_INCLUDE_FILES("unistd.h" HAVE_UNISTD_H)
+CHECK_INCLUDE_FILES("pwd.h" HAVE_PWD_H)
+CHECK_INCLUDE_FILES("errno.h" HAVE_ERRNO_H)
+CHECK_INCLUDE_FILES("wchar.h" HAVE_WCHAR_H)
+CHECK_INCLUDE_FILES("langinfo.h" HAVE_LANGINFO_CODESET)
+IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+  CHECK_INCLUDE_FILES("utf8/wchar.h" HAVE_UTF8_WCHAR_H)
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+
+CHECK_FUNCTION_EXISTS(gethostbyname HAVE_GETHOSTBYNAME)
+CHECK_FUNCTION_EXISTS(gethostname HAVE_GETHOSTNAME)
+CHECK_FUNCTION_EXISTS(getsockname HAVE_GETSOCKNAME)
+CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
+CHECK_FUNCTION_EXISTS(inet_ntoa HAVE_INET_NTOA)
+CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET)
+CHECK_FUNCTION_EXISTS(mkdir HAVE_MKDIR)
+CHECK_FUNCTION_EXISTS(select HAVE_SELECT)
+CHECK_FUNCTION_EXISTS(setlocale HAVE_SETLOCALE)
+CHECK_FUNCTION_EXISTS(socket HAVE_SOCKET)
+CHECK_FUNCTION_EXISTS(strcasecmp HAVE_STRCASECMP)
+CHECK_FUNCTION_EXISTS(strchr HAVE_STRCHR)
+CHECK_FUNCTION_EXISTS(strdup HAVE_STRDUP)
+CHECK_FUNCTION_EXISTS(strndup HAVE_STRNDUP)
+CHECK_FUNCTION_EXISTS(strncasecmp HAVE_STRNCASECMP)
+CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK)
+CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR)
+CHECK_FUNCTION_EXISTS(strstr HAVE_STRSTR)
+
+
+#needs to be splitted in subdirectories
+# FIXME: weechat_gui_common MUST be the first lib in the list
+SET(STATIC_LIBS weechat_gui_common)
+
+# Check for Gettext
+IF(NOT DISABLE_NLS)
+  FIND_PACKAGE(Gettext)
+  IF(GETTEXT_FOUND)
+    ADD_DEFINITIONS(-DENABLE_NLS)
+  ENDIF(GETTEXT_FOUND)
+ENDIF(NOT DISABLE_NLS)
+
+# Check for GnuTLS
+IF(NOT DISABLE_GNUTLS)
+  FIND_PACKAGE(GnuTLS)
+  
+  IF(GNUTLS_FOUND)
+    STRING(REGEX REPLACE "/[^/]*$" "" GNUTLS_LIBRARY_PATH "${GNUTLS_LIBRARY}")
+    ADD_DEFINITIONS(-DHAVE_GNUTLS)
+    INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_PATH})
+    SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${GNUTLS_LIBRARY_PATH}")
+    LIST(APPEND EXTRA_LIBS gnutls)
+  ENDIF(GNUTLS_FOUND)
+ENDIF(NOT DISABLE_GNUTLS)
+
+# Check for iconv
+FIND_PACKAGE(Iconv)
+IF(ICONV_FOUND)
+  ADD_DEFINITIONS( -DHAVE_ICONV )
+ENDIF(ICONV_FOUND)
+
+IF(NOT DISABLE_PLUGINS)
+  FIND_LIBRARY(DL_LIBRARY
+    NAMES dl
+    PATHS /lib /usr/lib /usr/libexec /usr/local/lib /usr/local/libexec
+  )
+  ADD_DEFINITIONS(-DPLUGINS)
+  LIST(APPEND STATIC_LIBS weechat_plugins)
+  IF(DL_LIBRARY)
+    STRING(REGEX REPLACE "/[^/]*$" "" DL_LIBRARY_PATH "${DL_LIBRARY}")
+    SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${DL_LIBRARY_PATH}")
+    LIST(APPEND EXTRA_LIBS dl)
+  ENDIF(DL_LIBRARY)
+ENDIF(NOT DISABLE_PLUGINS)
+
+ADD_SUBDIRECTORY( common )
+List(APPEND STATIC_LIBS weechat_main)
+
+ADD_SUBDIRECTORY( irc )
+LIST(APPEND STATIC_LIBS weechat_irc)
+
+IF(NOT DISABLE_PLUGINS)
+  ADD_SUBDIRECTORY( plugins )
+ENDIF(NOT DISABLE_PLUGINS)
+
+ADD_SUBDIRECTORY( gui )

src/Makefile.am

@@ -2,7 +2,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 SUBDIRS = common irc plugins gui

src/common/CMakeLists.txt

@@ -0,0 +1,28 @@
+# Copyright (c) 2003-2007 FlashCode <flashcode@flashtux.org>
+#
+# This program 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.
+#
+# This program 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 <http://www.gnu.org/licenses/>.
+#
+
+SET(LIB_MAIN_SRC weechat.c weechat.h alias.c alias.h backtrace.c backtrace.h
+command.c command.h completion.c completion.h weelist.c weelist.h weeconfig.c
+weeconfig.h history.c history.h hotlist.c hotlist.h log.c log.h fifo.c fifo.h
+session.c session.h utf8.c utf8.h util.c util.h)
+
+# Check for flock support
+INCLUDE(CheckSymbolExists)
+CHECK_INCLUDE_FILES("sys/file.h" HAVE_SYS_FILE_H)
+CHECK_SYMBOL_EXISTS(flock "sys/file.h" HAVE_FLOCK)
+
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
+ADD_LIBRARY(weechat_main STATIC ${LIB_MAIN_SRC})

src/common/Makefile.am

@@ -2,7 +2,7 @@
 #
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GNUTLS_CFLAGS)

src/common/alias.c

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* alias.c: WeeChat alias */
@@ -165,7 +164,7 @@ alias_get_final_command (t_weechat_alias *alias)
     
     if (alias->running)
     {
-        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, GUI_PREFIX_ERROR);
         gui_printf (NULL,
                     _("%s circular reference when calling alias \"/%s\"\n"),
                     WEECHAT_ERROR, alias->alias_name);
@@ -299,40 +298,36 @@ alias_replace_args (char *alias_args, char *user_args)
  */
 
 char *
-alias_replace_vars (char *string)
+alias_replace_vars (t_irc_server *server, t_irc_channel *channel, char *string)
 {
-    char *nick, *channel, *server;
+    char *var_nick, *var_channel, *var_server;
     char empty_string[1] = { '\0' };
     char *res, *temp;
     
-    nick = (SERVER(gui_current_window->buffer)
-            && SERVER(gui_current_window->buffer)->nick) ?
-        SERVER(gui_current_window->buffer)->nick : empty_string;
-    channel = (CHANNEL(gui_current_window->buffer)) ?
-        CHANNEL(gui_current_window->buffer)->name : empty_string;
-    server = (SERVER(gui_current_window->buffer)) ?
-        SERVER(gui_current_window->buffer)->name : empty_string;
-
+    var_nick = (server && server->nick) ? server->nick : empty_string;
+    var_channel = (channel) ? channel->name : empty_string;
+    var_server = (server) ? server->name : empty_string;
+    
     /* replace nick */
-    temp = weechat_strreplace (string, "$nick", nick);
+    temp = weechat_strreplace (string, "$nick", var_nick);
     if (!temp)
         return NULL;
     res = temp;
-
+    
     /* replace channel */
-    temp = weechat_strreplace (res, "$channel", channel);
+    temp = weechat_strreplace (res, "$channel", var_channel);
     free (res);
     if (!temp)
         return NULL;
     res = temp;
-
+    
     /* replace server */
-    temp = weechat_strreplace (res, "$server", server);
+    temp = weechat_strreplace (res, "$server", var_server);
     free (res);
     if (!temp)
         return NULL;
     res = temp;
-
+    
     /* return result */
     return res;
 }

src/common/alias.h

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,14 +13,15 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
 #ifndef __WEECHAT_ALIAS_H
 #define __WEECHAT_ALIAS_H 1
 
+#include "../irc/irc.h"
+
 typedef struct t_weechat_alias t_weechat_alias;
 
 struct t_weechat_alias
@@ -39,7 +40,7 @@ extern t_weechat_alias *alias_search (char *);
 extern t_weechat_alias *alias_new (char *, char *);
 extern char *alias_get_final_command (t_weechat_alias *);
 extern char *alias_replace_args (char *, char *);
-extern char *alias_replace_vars (char *);
+extern char *alias_replace_vars (t_irc_server *, t_irc_channel *, char *);
 extern void alias_free (t_weechat_alias *);
 extern void alias_free_all ();
 

src/common/backtrace.c

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* backtrace.c: display backtrace after a segfault */

src/common/backtrace.h

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 

src/common/command.h

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -73,6 +72,7 @@ extern int weechat_cmd_ignore (t_irc_server *, t_irc_channel *, int, char **);
 extern int weechat_cmd_key (t_irc_server *, t_irc_channel *, char *);
 extern int weechat_cmd_panel (t_irc_server *, t_irc_channel *, int, char **);
 extern int weechat_cmd_plugin (t_irc_server *, t_irc_channel *, int, char **);
+extern int weechat_cmd_reconnect (t_irc_server *, t_irc_channel *, int, char **);
 extern int weechat_cmd_save (t_irc_server *, t_irc_channel *, int, char **);
 extern int weechat_cmd_server (t_irc_server *, t_irc_channel *, int, char **);
 extern int weechat_cmd_set (t_irc_server *, t_irc_channel *, char *);

src/common/completion.c

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* completion.c: completes words according to context (cmd/nick) */
@@ -95,12 +94,14 @@ completion_free (t_completion *completion)
         free (completion->args);
     completion->args = NULL;
     
-    while (completion->completion_list)
-        weelist_remove (&completion->completion_list,
-                        &completion->last_completion,
-                        completion->completion_list);
+    weelist_remove_all (&completion->completion_list,
+                        &completion->last_completion);
     completion->completion_list = NULL;
     completion->last_completion = NULL;
+
+    if (completion->word_found)
+        free (completion->word_found);
+    completion->word_found = NULL;
 }
 
 /*
@@ -203,20 +204,96 @@ completion_get_command_infos (t_completion *completion,
     return;
 }
 
+/*
+ * completion_is_only_alphanum: return 1 if there is only alpha/num chars
+ *                              in a string
+ */
+
+int
+completion_is_only_alphanum (char *string)
+{
+    while (string[0])
+    {
+        if (strchr (cfg_look_nick_completion_ignore, string[0]))
+            return 0;
+        string++;
+    }
+    return 1;
+}
+
+/*
+ * completion_strdup_alphanum: duplicate alpha/num chars in a string
+ */
+
+char *
+completion_strdup_alphanum (char *string)
+{
+    char *result, *pos;
+    
+    result = (char *)malloc (strlen (string) + 1);
+    pos = result;
+    while (string[0])
+    {
+        if (!strchr (cfg_look_nick_completion_ignore, string[0]))
+        {
+            pos[0] = string[0];
+            pos++;
+        }
+        string++;
+    }
+    pos[0] = '\0';
+    return result;
+}
+
+/*
+ * completion_nickncmp: locale and case independent string comparison
+ *                      with max length for nicks (alpha or digits only)
+ */
+
+int
+completion_nickncmp (char *base_word, char *nick, int max)
+{
+    char *base_word2, *nick2;
+    int return_cmp;
+    
+    if (!cfg_look_nick_completion_ignore
+        || !cfg_look_nick_completion_ignore[0]
+        || !base_word || !nick || !base_word[0] || !nick[0]
+        || (!completion_is_only_alphanum (base_word)))
+        return ascii_strncasecmp (base_word, nick, max);
+    
+    base_word2 = completion_strdup_alphanum (base_word);
+    nick2 = completion_strdup_alphanum (nick);
+    
+    return_cmp = ascii_strncasecmp (base_word2, nick2, strlen (base_word2));
+    
+    free (base_word2);
+    free (nick2);
+    
+    return return_cmp;
+}
+
 /*
  * completion_list_add: add a word to completion word list
  */
 
 void
-completion_list_add (t_completion *completion, char *word)
+completion_list_add (t_completion *completion, char *word,
+                     int nick_completion, int position)
 {
+    if (!word || !word[0])
+        return;
+    
     if (!completion->base_word || !completion->base_word[0]
-        || (ascii_strncasecmp (completion->base_word, word,
-                               strlen (completion->base_word)) == 0))
+        || (nick_completion && (completion_nickncmp (completion->base_word, word,
+                                                            strlen (completion->base_word)) == 0))
+        || (!nick_completion && (ascii_strncasecmp (completion->base_word, word,
+                                                          strlen (completion->base_word)) == 0)))
     {
         weelist_add (&completion->completion_list,
                      &completion->last_completion,
-                     word);
+                     word,
+                     position);
     }
 }
 
@@ -231,7 +308,8 @@ completion_list_add_alias (t_completion *completion)
     
     for (ptr_alias = weechat_alias; ptr_alias; ptr_alias = ptr_alias->next_alias)
     {
-        completion_list_add (completion, ptr_alias->alias_name);
+        completion_list_add (completion, ptr_alias->alias_name,
+                             0, WEELIST_POS_SORT);
     }
 }
 
@@ -246,7 +324,7 @@ completion_list_add_alias_cmd (t_completion *completion)
     
     for (ptr_list = index_commands; ptr_list; ptr_list = ptr_list->next_weelist)
     {
-        completion_list_add (completion, ptr_list->data);
+        completion_list_add (completion, ptr_list->data, 0, WEELIST_POS_SORT);
     }
 }
 
@@ -259,24 +337,31 @@ completion_list_add_channel (t_completion *completion)
 {
     if (completion->channel)
         completion_list_add (completion,
-                             ((t_irc_channel *)(completion->channel))->name);
+                             ((t_irc_channel *)(completion->channel))->name,
+                             0, WEELIST_POS_SORT);
 }
 
 /*
- * completion_list_add_server_channels: add server channels to completion list
+ * completion_list_add_channels: add server channels to completion list
  */
 
 void
-completion_list_add_server_channels (t_completion *completion)
+completion_list_add_channels (t_completion *completion)
 {
+    t_irc_server *ptr_server;
     t_irc_channel *ptr_channel;
     
     if (completion->server)
     {
-        for (ptr_channel = ((t_irc_server *)(completion->server))->channels;
-             ptr_channel; ptr_channel = ptr_channel->next_channel)
+        for (ptr_server = irc_servers; ptr_server;
+             ptr_server = ptr_server->next_server)
         {
-            completion_list_add (completion, ptr_channel->name);
+            for (ptr_channel = ptr_server->channels;
+                 ptr_channel; ptr_channel = ptr_channel->next_channel)
+            {
+                completion_list_add (completion, ptr_channel->name,
+                                     0, WEELIST_POS_SORT);
+            }
         }
     }
 }
@@ -361,7 +446,8 @@ completion_list_add_filename (t_completion *completion)
 			 entry->d_name, 
 			 S_ISDIR(statbuf.st_mode) ? DIR_SEPARATOR : "");
 		
-		completion_list_add (completion, buffer);
+		completion_list_add (completion, buffer,
+                                     0, WEELIST_POS_SORT);
 	    }
 	}
     }
@@ -392,7 +478,8 @@ completion_list_add_plugin_cmd (t_completion *completion)
              ptr_handler; ptr_handler = ptr_handler->next_handler)
         {
             if (ptr_handler->type == PLUGIN_HANDLER_COMMAND)
-                completion_list_add (completion, ptr_handler->command);
+                completion_list_add (completion, ptr_handler->command,
+                                     0, WEELIST_POS_SORT);
         }
     }
 #else
@@ -413,7 +500,8 @@ completion_list_add_irc_cmd_sent (t_completion *completion)
     for (i = 0; irc_commands[i].command_name; i++)
     {
         if (irc_commands[i].cmd_function_args || irc_commands[i].cmd_function_1arg)
-            completion_list_add (completion, irc_commands[i].command_name);
+            completion_list_add (completion, irc_commands[i].command_name,
+                                 0, WEELIST_POS_SORT);
     }
 }
 
@@ -429,7 +517,8 @@ completion_list_add_irc_cmd_recv (t_completion *completion)
     for (i = 0; irc_commands[i].command_name; i++)
     {
         if (irc_commands[i].recv_function)
-            completion_list_add(completion, irc_commands[i].command_name);
+            completion_list_add(completion, irc_commands[i].command_name,
+                                0, WEELIST_POS_SORT);
     }
 }
 
@@ -444,7 +533,8 @@ completion_list_add_key_cmd (t_completion *completion)
     
     for (i = 0; gui_key_functions[i].function_name; i++)
     {
-        completion_list_add (completion, gui_key_functions[i].function_name);
+        completion_list_add (completion, gui_key_functions[i].function_name,
+                             0, WEELIST_POS_SORT);
     }
 }
 
@@ -455,9 +545,62 @@ completion_list_add_key_cmd (t_completion *completion)
 void
 completion_list_add_self_nick (t_completion *completion)
 {
+    if (completion->server)
+        completion_list_add (completion,
+                             ((t_irc_server *)(completion->server))->nick,
+                             0, WEELIST_POS_SORT);
+}
+
+/*
+ * completion_list_add_server_nicks: add server nicks to completion list
+ */
+
+void
+completion_list_add_server_nicks (t_completion *completion)
+{
+    t_irc_server *ptr_server;
+    t_irc_channel *ptr_channel;
+    t_irc_nick *ptr_nick;
+    
     if (completion->server)
     {
-        completion_list_add (completion, ((t_irc_server *)(completion->server))->nick);
+        for (ptr_server = (t_irc_server *)(completion->server); ptr_server;
+             ptr_server = ptr_server->next_server)
+        {
+            for (ptr_channel = ptr_server->channels; ptr_channel;
+                 ptr_channel = ptr_channel->next_channel)
+            {
+                if ((!completion->channel || (t_irc_channel *)(completion->channel) != ptr_channel)
+                    && (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL))
+                {
+                    for (ptr_nick = ptr_channel->nicks; ptr_nick;
+                         ptr_nick = ptr_nick->next_nick)
+                    {
+                        completion_list_add (completion, ptr_nick->nick,
+                                             1, WEELIST_POS_SORT);
+                    }
+                }
+            }
+        }
+        
+        /* add current channel nicks at beginning */
+        if (completion->channel && (((t_irc_channel *)(completion->channel))->type == IRC_CHANNEL_TYPE_CHANNEL))
+        {
+            for (ptr_nick = ((t_irc_channel *)(completion->channel))->nicks;
+                 ptr_nick; ptr_nick = ptr_nick->next_nick)
+            {
+                completion_list_add (completion, ptr_nick->nick,
+                                     1, WEELIST_POS_BEGINNING);
+            }
+        }
+        
+        /* add self nick at the end */
+        if (completion->server)
+            completion_list_add (completion,
+                                 ((t_irc_server *)(completion->server))->nick,
+                                 1, WEELIST_POS_END);
+        
+        completion->arg_is_nick = 1;
     }
 }
 
@@ -469,22 +612,45 @@ void
 completion_list_add_channel_nicks (t_completion *completion)
 {
     t_irc_nick *ptr_nick;
+    t_weelist *ptr_weelist;
     
     if (completion->channel)
     {
-        if (((t_irc_channel *)(completion->channel))->type == CHANNEL_TYPE_CHANNEL)
+        if (((t_irc_channel *)(completion->channel))->type == IRC_CHANNEL_TYPE_CHANNEL)
         {
+            /* add channel nicks */
             for (ptr_nick = ((t_irc_channel *)(completion->channel))->nicks;
                  ptr_nick; ptr_nick = ptr_nick->next_nick)
             {
-                completion_list_add (completion, ptr_nick->nick);
+                completion_list_add (completion, ptr_nick->nick,
+                                     1, WEELIST_POS_SORT);
             }
+            
+            /* add nicks speaking recently on this channel */
+            if (cfg_look_nick_completion_smart)
+            {
+                for (ptr_weelist = ((t_irc_channel *)(completion->channel))->nicks_speaking;
+                     ptr_weelist; ptr_weelist = ptr_weelist->next_weelist)
+                {
+                    if (irc_nick_search ((t_irc_channel *)(completion->channel),
+                                         ptr_weelist->data))
+                        completion_list_add (completion, ptr_weelist->data,
+                                             1, WEELIST_POS_BEGINNING);
+                }
+            }
+            
+            /* add self nick at the end */
+            if (completion->server)
+                completion_list_add (completion,
+                                     ((t_irc_server *)(completion->server))->nick,
+                                     1, WEELIST_POS_END);
         }
-        if ((((t_irc_channel *)(completion->channel))->type == CHANNEL_TYPE_PRIVATE)
-            || (((t_irc_channel *)(completion->channel))->type == CHANNEL_TYPE_DCC_CHAT))
+        if ((((t_irc_channel *)(completion->channel))->type == IRC_CHANNEL_TYPE_PRIVATE)
+            || (((t_irc_channel *)(completion->channel))->type == IRC_CHANNEL_TYPE_DCC_CHAT))
         {
             completion_list_add (completion,
-                                 ((t_irc_channel *)(completion->channel))->name);
+                                 ((t_irc_channel *)(completion->channel))->name,
+                                 1, WEELIST_POS_SORT);
         }
         completion->arg_is_nick = 1;
     }
@@ -503,12 +669,13 @@ completion_list_add_channel_nicks_hosts (t_completion *completion)
     
     if (completion->channel)
     {
-        if (((t_irc_channel *)(completion->channel))->type == CHANNEL_TYPE_CHANNEL)
+        if (((t_irc_channel *)(completion->channel))->type == IRC_CHANNEL_TYPE_CHANNEL)
         {
             for (ptr_nick = ((t_irc_channel *)(completion->channel))->nicks;
                  ptr_nick; ptr_nick = ptr_nick->next_nick)
             {
-                completion_list_add (completion, ptr_nick->nick);
+                completion_list_add (completion, ptr_nick->nick,
+                                     1, WEELIST_POS_SORT);
                 if (ptr_nick->host)
                 {
                     length = strlen (ptr_nick->nick) + 1 +
@@ -518,17 +685,19 @@ completion_list_add_channel_nicks_hosts (t_completion *completion)
                     {
                         snprintf (buf, length, "%s!%s",
                                   ptr_nick->nick, ptr_nick->host);
-                        completion_list_add (completion, buf);
+                        completion_list_add (completion, buf,
+                                             1, WEELIST_POS_SORT);
                         free (buf);
                     }
                 }
             }
         }
-        if ((((t_irc_channel *)(completion->channel))->type == CHANNEL_TYPE_PRIVATE)
-             || (((t_irc_channel *)(completion->channel))->type == CHANNEL_TYPE_PRIVATE))
+        if ((((t_irc_channel *)(completion->channel))->type == IRC_CHANNEL_TYPE_PRIVATE)
+             || (((t_irc_channel *)(completion->channel))->type == IRC_CHANNEL_TYPE_PRIVATE))
         {
             completion_list_add (completion,
-                                 ((t_irc_channel *)(completion->channel))->name);
+                                 ((t_irc_channel *)(completion->channel))->name,
+                                 1, WEELIST_POS_SORT);
         }
         completion->arg_is_nick = 1;
     }
@@ -553,7 +722,8 @@ completion_list_add_option (t_completion *completion)
             for (j = 0; weechat_options[i][j].option_name; j++)
             {
                 completion_list_add (completion,
-                                     weechat_options[i][j].option_name);
+                                     weechat_options[i][j].option_name,
+                                     0, WEELIST_POS_SORT);
             }
         }
     }
@@ -565,7 +735,7 @@ completion_list_add_option (t_completion *completion)
             snprintf (option_name, sizeof (option_name), "%s.%s",
                       ptr_server->name, 
                       weechat_options[CONFIG_SECTION_SERVER][i].option_name);
-            completion_list_add (completion, option_name);
+            completion_list_add (completion, option_name, 0, WEELIST_POS_SORT);
         }
     }
 }
@@ -583,7 +753,7 @@ completion_list_add_plugin_option (t_completion *completion)
     for (ptr_option = plugin_options; ptr_option;
          ptr_option = ptr_option->next_option)
     {
-        completion_list_add (completion, ptr_option->name);
+        completion_list_add (completion, ptr_option->name, 0, WEELIST_POS_SORT);
     }
 #else
     /* make C compiler happy */
@@ -599,7 +769,8 @@ void
 completion_list_add_part (t_completion *completion)
 {
     if (cfg_irc_default_msg_part && cfg_irc_default_msg_part[0])
-        completion_list_add (completion, cfg_irc_default_msg_part);
+        completion_list_add (completion, cfg_irc_default_msg_part,
+                             0, WEELIST_POS_SORT);
 }
 
 /*
@@ -615,7 +786,8 @@ completion_list_add_plugin (t_completion *completion)
     for (ptr_plugin = weechat_plugins; ptr_plugin;
          ptr_plugin = ptr_plugin->next_plugin)
     {
-        completion_list_add (completion, ptr_plugin->name);
+        completion_list_add (completion, ptr_plugin->name,
+                             0, WEELIST_POS_SORT);
     }
 #else
     /* make C compiler happy */
@@ -631,7 +803,8 @@ void
 completion_list_add_quit (t_completion *completion)
 {
     if (cfg_irc_default_msg_quit && cfg_irc_default_msg_quit[0])
-        completion_list_add (completion, cfg_irc_default_msg_quit);
+        completion_list_add (completion, cfg_irc_default_msg_quit,
+                             0, WEELIST_POS_SORT);
 }
 
 /*
@@ -643,7 +816,8 @@ completion_list_add_server (t_completion *completion)
 {
     if (completion->server)
         completion_list_add (completion,
-                             ((t_irc_server *)(completion->server))->name);
+                             ((t_irc_server *)(completion->server))->name,
+                             0, WEELIST_POS_SORT);
 }
 
 /*
@@ -658,7 +832,8 @@ completion_list_add_servers (t_completion *completion)
     for (ptr_server = irc_servers; ptr_server;
          ptr_server = ptr_server->next_server)
     {
-        completion_list_add (completion, ptr_server->name);
+        completion_list_add (completion, ptr_server->name,
+                             0, WEELIST_POS_SORT);
     }
 }
 
@@ -678,10 +853,11 @@ completion_list_add_topic (t_completion *completion)
         if (cfg_irc_colors_send)
             string = (char *)gui_color_decode_for_user_entry ((unsigned char *)((t_irc_channel *)(completion->channel))->topic);
         else
-            string = (char *)gui_color_decode ((unsigned char *)((t_irc_channel *)(completion->channel))->topic, 0);
+            string = (char *)gui_color_decode ((unsigned char *)((t_irc_channel *)(completion->channel))->topic, 0, 0);
         completion_list_add (completion,
                              (string) ?
-                             string : ((t_irc_channel *)(completion->channel))->topic);
+                             string : ((t_irc_channel *)(completion->channel))->topic,
+                             0, WEELIST_POS_SORT);
         if (string)
             free (string);
     }
@@ -713,26 +889,31 @@ completion_list_add_option_value (t_completion *completion)
             {
                 case OPTION_TYPE_BOOLEAN:
                     if (option_value && (*((int *)(option_value))))
-                        completion_list_add (completion, "on");
+                        completion_list_add (completion, "on",
+                                             0, WEELIST_POS_SORT);
                     else
-                        completion_list_add (completion, "off");
+                        completion_list_add (completion, "off",
+                                             0, WEELIST_POS_SORT);
                     break;
                 case OPTION_TYPE_INT:
                     snprintf (option_string, sizeof (option_string) - 1,
                               "%d", (option_value) ? *((int *)(option_value)) : option->default_int);
-                    completion_list_add (completion, option_string);
+                    completion_list_add (completion, option_string,
+                                         0, WEELIST_POS_SORT);
                     break;
                 case OPTION_TYPE_INT_WITH_STRING:
                     completion_list_add (completion,
                                          (option_value) ?
                                          option->array_values[*((int *)(option_value))] :
-                                         option->array_values[option->default_int]);
+                                         option->array_values[option->default_int],
+                                         0, WEELIST_POS_SORT);
                     break;
                 case OPTION_TYPE_COLOR:
                     completion_list_add (completion,
                                          (option_value) ?
                                          gui_color_get_name (*((int *)(option_value))) :
-                                         option->default_string);
+                                         option->default_string,
+                                         0, WEELIST_POS_SORT);
                     break;
                 case OPTION_TYPE_STRING:
                     snprintf (option_string, sizeof (option_string) - 1,
@@ -740,7 +921,8 @@ completion_list_add_option_value (t_completion *completion)
                               ((option_value) && (*((char **)(option_value)))) ?
                               *((char **)(option_value)) :
                               option->default_string);
-                    completion_list_add (completion, option_string);
+                    completion_list_add (completion, option_string,
+                                         0, WEELIST_POS_SORT);
                     break;
             }
         }
@@ -768,7 +950,8 @@ completion_list_add_plugin_option_value (t_completion *completion)
         
         ptr_option = plugin_config_search_internal (completion->args);
         if (ptr_option)
-            completion_list_add (completion, ptr_option->value);
+            completion_list_add (completion, ptr_option->value,
+                                 0, WEELIST_POS_SORT);
         
         if (pos)
             pos[0] = ' ';
@@ -790,7 +973,8 @@ completion_list_add_weechat_cmd (t_completion *completion)
     
     for (i = 0; weechat_commands[i].command_name; i++)
     {
-        completion_list_add (completion, weechat_commands[i].command_name);
+        completion_list_add (completion, weechat_commands[i].command_name,
+                             0, WEELIST_POS_SORT);
     }
 }
 
@@ -819,7 +1003,8 @@ completion_build_list_template (t_completion *completion, char *template)
                     word[word_offset] = '\0';
                     weelist_add (&completion->completion_list,
                                  &completion->last_completion,
-                                 word);
+                                 word,
+                                 WEELIST_POS_SORT);
                 }
                 word_offset = 0;
                 break;
@@ -834,6 +1019,8 @@ completion_build_list_template (t_completion *completion, char *template)
                             free (word);
                             return;
                             break;
+                        case '*': /* repeat last completion (do nothing there) */
+                            break;
                         case 'a': /* alias */
                             completion_list_add_alias (completion);
                             break;
@@ -844,7 +1031,7 @@ completion_build_list_template (t_completion *completion, char *template)
                             completion_list_add_channel (completion);
                             break;
                         case 'C': /* all channels */
-                            completion_list_add_server_channels (completion);
+                            completion_list_add_channels (completion);
                             break;
                         case 'f': /* filename */
                             completion_list_add_filename (completion);
@@ -864,6 +1051,9 @@ completion_build_list_template (t_completion *completion, char *template)
                         case 'm': /* self nickname */
                             completion_list_add_self_nick (completion);
                             break;
+                        case 'M': /* nicks of current server (all open channels) */
+                            completion_list_add_server_nicks (completion);
+                            break;
                         case 'n': /* channel nicks */
                             completion_list_add_channel_nicks (completion);
                             completion->context = COMPLETION_NICK;
@@ -926,8 +1116,10 @@ completion_build_list_template (t_completion *completion, char *template)
 void
 completion_build_list (t_completion *completion)
 {
-    char *template, *pos_space;
-    int max_arg, i;
+    char *template, *pos_template, *pos_space;
+    int repeat_last, max_arg, i, length;
+
+    repeat_last = 0;
     
     completion_get_command_infos (completion, &template, &max_arg);
     if (!template || (strcmp (template, "-") == 0) ||
@@ -936,25 +1128,40 @@ completion_build_list (t_completion *completion)
         completion_stop (completion);
         return;
     }
-    i = 1;
-    while (template && template[0])
+
+    length = strlen (template);
+    if (length >= 2)
     {
-        pos_space = strchr (template, ' ');
+        if (strcmp (template + length - 2, "%*") == 0)
+            repeat_last = 1;
+    }
+    
+    i = 1;
+    pos_template = template;
+    while (pos_template && pos_template[0])
+    {
+        pos_space = strchr (pos_template, ' ');
         if (i == completion->base_command_arg)
         {
-            completion_build_list_template (completion, template);
+            completion_build_list_template (completion, pos_template);
             return;
         }
         if (pos_space)
         {
-            template = pos_space;
-            while (template[0] == ' ')
-                template++;
+            pos_template = pos_space;
+            while (pos_template[0] == ' ')
+                pos_template++;
         }
         else
-            template = NULL;
+            pos_template = NULL;
         i++;
     }
+    if (repeat_last)
+    {
+        pos_space = rindex (template, ' ');
+        completion_build_list_template (completion,
+                                        (pos_space) ? pos_space + 1 : template);
+    }
 }
 
 /*
@@ -1105,7 +1312,9 @@ completion_command (t_completion *completion)
         {
             if ((!completion->word_found) || word_found_seen)
             {
-                completion->word_found = ptr_weelist->data;
+                if (completion->word_found)
+                    free (completion->word_found);
+                completion->word_found = strdup (ptr_weelist->data);
 
                 if (completion->direction < 0)
                     ptr_weelist2 = ptr_weelist->prev_weelist;
@@ -1144,80 +1353,12 @@ completion_command (t_completion *completion)
     }
     if (completion->word_found)
     {
+        free (completion->word_found);
         completion->word_found = NULL;
         completion_command (completion);
     }
 }
 
-/*
- * completion_is_only_alphanum: return 1 if there is only alpha/num chars
- *                              in a string
- */
-
-int
-completion_is_only_alphanum (char *string)
-{
-    while (string[0])
-    {
-        if (strchr (cfg_look_nick_completion_ignore, string[0]))
-            return 0;
-        string++;
-    }
-    return 1;
-}
-
-/*
- * completion_strdup_alphanum: duplicate alpha/num chars in a string
- */
-
-char *
-completion_strdup_alphanum (char *string)
-{
-    char *result, *pos;
-    
-    result = (char *)malloc (strlen (string) + 1);
-    pos = result;
-    while (string[0])
-    {
-        if (!strchr (cfg_look_nick_completion_ignore, string[0]))
-        {
-            pos[0] = string[0];
-            pos++;
-        }
-        string++;
-    }
-    pos[0] = '\0';
-    return result;
-}
-
-/*
- * completion_nickncmp: locale and case independent string comparison
- *                      with max length for nicks (alpha or digits only)
- */
-
-int
-completion_nickncmp (char *base_word, char *nick, int max)
-{
-    char *base_word2, *nick2;
-    int return_cmp;
-    
-    if (!cfg_look_nick_completion_ignore
-        || !cfg_look_nick_completion_ignore[0]
-        || !base_word || !nick || !base_word[0] || !nick[0]
-        || (!completion_is_only_alphanum (base_word)))
-        return ascii_strncasecmp (base_word, nick, max);
-    
-    base_word2 = completion_strdup_alphanum (base_word);
-    nick2 = completion_strdup_alphanum (nick);
-    
-    return_cmp = ascii_strncasecmp (base_word2, nick2, strlen (base_word2));
-    
-    free (base_word2);
-    free (nick2);
-    
-    return return_cmp;
-}
-
 /*
  * completion_command_arg: complete a command argument
  */
@@ -1243,7 +1384,9 @@ completion_command_arg (t_completion *completion, int nick_completion)
         {
             if ((!completion->word_found) || word_found_seen)
             {
-                completion->word_found = ptr_weelist->data;
+                if (completion->word_found)
+                    free (completion->word_found);
+                completion->word_found = strdup (ptr_weelist->data);
                 
                 if (completion->direction < 0)
                     ptr_weelist2 = ptr_weelist->prev_weelist;
@@ -1284,6 +1427,7 @@ completion_command_arg (t_completion *completion, int nick_completion)
     }
     if (completion->word_found)
     {
+        free (completion->word_found);
         completion->word_found = NULL;
         completion_command_arg (completion, nick_completion);
     }
@@ -1297,45 +1441,98 @@ void
 completion_nick (t_completion *completion)
 {
     int length, word_found_seen, other_completion;
-    t_irc_nick *ptr_nick, *ptr_nick2;
+    t_irc_nick *ptr_nick;
+    t_weelist *ptr_weelist, *ptr_weelist2;
 
     if (!completion->channel)
         return;
     
     completion->context = COMPLETION_NICK;
     
-    if ((((t_irc_channel *)(completion->channel))->type == CHANNEL_TYPE_PRIVATE)
-        || (((t_irc_channel *)(completion->channel))->type == CHANNEL_TYPE_DCC_CHAT))
+    if ((((t_irc_channel *)(completion->channel))->type == IRC_CHANNEL_TYPE_PRIVATE)
+        || (((t_irc_channel *)(completion->channel))->type == IRC_CHANNEL_TYPE_DCC_CHAT))
     {
         if (!(completion->completion_list))
         {
             weelist_add (&completion->completion_list,
                          &completion->last_completion,
-                         ((t_irc_channel *)(completion->channel))->name);
+                         ((t_irc_channel *)(completion->channel))->name,
+                         WEELIST_POS_SORT);
             weelist_add (&completion->completion_list,
                          &completion->last_completion,
-                         ((t_irc_server *)(completion->server))->nick);
+                         ((t_irc_server *)(completion->server))->nick,
+                         WEELIST_POS_SORT);
         }
         completion_command_arg (completion, 1);
         return;
     }
+
+    /* rebuild nick list for completion, with nicks speaking at beginning of list */
+    if ((((t_irc_channel *)(completion->channel))->nick_completion_reset)
+        || (!(completion->completion_list)))
+    {
+        /* empty completion list */
+        if (completion->completion_list)
+        {
+            weelist_remove_all (&(completion->completion_list),
+                                &(completion->last_completion));
+            completion->completion_list = NULL;
+            completion->last_completion = NULL;
+        }
+        
+        /* add channel nicks */
+        for (ptr_nick = ((t_irc_channel *)(completion->channel))->nicks;
+             ptr_nick; ptr_nick = ptr_nick->next_nick)
+        {
+            weelist_add (&(completion->completion_list),
+                         &(completion->last_completion),
+                         ptr_nick->nick,
+                         WEELIST_POS_SORT);
+        }
+        
+        /* add nicks speaking recently on this channel */
+        if (cfg_look_nick_completion_smart)
+        {
+            for (ptr_weelist = ((t_irc_channel *)(completion->channel))->nicks_speaking;
+                 ptr_weelist; ptr_weelist = ptr_weelist->next_weelist)
+            {
+                if (irc_nick_search ((t_irc_channel *)(completion->channel),
+                                     ptr_weelist->data))
+                    weelist_add (&(completion->completion_list),
+                                 &(completion->last_completion),
+                                 ptr_weelist->data,
+                                 WEELIST_POS_BEGINNING);
+            }
+        }
+        
+        /* add self nick at the end */
+        if (completion->server)
+            weelist_add (&(completion->completion_list),
+                         &(completion->last_completion),
+                         ((t_irc_server *)(completion->server))->nick,
+                         WEELIST_POS_END);
+        
+        ((t_irc_channel *)(completion->channel))->nick_completion_reset = 0;
+    }
     
     length = strlen (completion->base_word);
     word_found_seen = 0;
     other_completion = 0;
-
-    if (completion->direction < 0)
-        ptr_nick = ((t_irc_channel *)(completion->channel))->last_nick;
-    else
-        ptr_nick = ((t_irc_channel *)(completion->channel))->nicks;
     
-    while (ptr_nick)
+    if (completion->direction < 0)
+        ptr_weelist = completion->last_completion;
+    else
+        ptr_weelist = completion->completion_list;
+    
+    while (ptr_weelist)
     {
-        if (completion_nickncmp (completion->base_word, ptr_nick->nick, length) == 0)
+        if (completion_nickncmp (completion->base_word, ptr_weelist->data, length) == 0)
         {
             if ((!completion->word_found) || word_found_seen)
             {
-                completion->word_found = ptr_nick->nick;
+                if (completion->word_found)
+                    free (completion->word_found);
+                completion->word_found = strdup (ptr_weelist->data);
                 if (cfg_look_nick_complete_first)
                 {
                     completion->position = -1;
@@ -1343,21 +1540,21 @@ completion_nick (t_completion *completion)
                 }
 
                 if (completion->direction < 0)
-                    ptr_nick2 = ptr_nick->prev_nick;
+                    ptr_weelist2 = ptr_weelist->prev_weelist;
                 else
-                    ptr_nick2 = ptr_nick->next_nick;
+                    ptr_weelist2 = ptr_weelist->next_weelist;
                 
-                while (ptr_nick2)
+                while (ptr_weelist2)
                 {
                     if (completion_nickncmp (completion->base_word,
-                                             ptr_nick2->nick,
+                                             ptr_weelist2->data,
                                              length) == 0)
                         other_completion++;
-
+                    
                     if (completion->direction < 0)
-                        ptr_nick2 = ptr_nick2->prev_nick;
+                        ptr_weelist2 = ptr_weelist2->prev_weelist;
                     else
-                        ptr_nick2 = ptr_nick2->next_nick;
+                        ptr_weelist2 = ptr_weelist2->next_weelist;
                 }
                 
                 if (other_completion == 0)
@@ -1372,16 +1569,17 @@ completion_nick (t_completion *completion)
             other_completion++;
         }
         if (completion->word_found &&
-            (ascii_strcasecmp (ptr_nick->nick, completion->word_found) == 0))
+            (ascii_strcasecmp (ptr_weelist->data, completion->word_found) == 0))
             word_found_seen = 1;
-
+        
         if (completion->direction < 0)
-            ptr_nick = ptr_nick->prev_nick;
+            ptr_weelist = ptr_weelist->prev_weelist;
         else
-            ptr_nick = ptr_nick->next_nick;
+            ptr_weelist = ptr_weelist->next_weelist;
     }
     if (completion->word_found)
     {
+        free (completion->word_found);
         completion->word_found = NULL;
         completion_nick (completion);
     }
@@ -1405,10 +1603,10 @@ completion_auto (t_completion *completion)
     }
     
     /* channel completion */
-    if (string_is_channel (completion->base_word))
+    if (irc_channel_is_channel (completion->base_word))
     {
         if (!completion->completion_list)
-            completion_list_add_server_channels (completion);
+            completion_list_add_channels (completion);
         completion_command_arg (completion, 0);
         return;
     }
@@ -1435,12 +1633,15 @@ completion_search (t_completion *completion, int direction,
     /* if new completion => look for base word */
     if (pos != completion->position)
     {
+        if (completion->word_found)
+            free (completion->word_found);
         completion->word_found = NULL;
         completion_find_context (completion, buffer, size, pos);
     }
     
     /* completion */
-    old_word_found = completion->word_found;
+    old_word_found = (completion->word_found) ?
+        strdup (completion->word_found) : NULL;
     switch (completion->context)
     {
         case COMPLETION_NULL:
@@ -1487,6 +1688,8 @@ completion_search (t_completion *completion, int direction,
             }
         }
     }
+    if (old_word_found)
+        free (old_word_found);
 }
 
 /*

src/common/completion.h

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 

src/common/fifo.c

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* fifo.c: FIFO pipe for WeeChat remote control */
@@ -114,12 +113,12 @@ fifo_exec (char *text)
         pos_msg = text + 1;
         if (gui_current_window->buffer->has_input)
         {
-            ptr_server = SERVER(gui_current_window->buffer);
-            ptr_channel = CHANNEL(gui_current_window->buffer);
+            ptr_server = GUI_SERVER(gui_current_window->buffer);
+            ptr_channel = GUI_CHANNEL(gui_current_window->buffer);
         }
         else
         {
-            ptr_server = SERVER(gui_buffers);
+            ptr_server = GUI_SERVER(gui_buffers);
             ptr_channel = NULL;
         }
     }
@@ -128,7 +127,7 @@ fifo_exec (char *text)
         pos_msg = strstr (text, " *");
         if (!pos_msg)
         {
-            irc_display_prefix (NULL, NULL, PREFIX_ERROR);
+            irc_display_prefix (NULL, NULL, GUI_PREFIX_ERROR);
             gui_printf (NULL, _("%s invalid text received on FIFO pipe\n"),
                         WEECHAT_WARNING);
             return;
@@ -147,20 +146,20 @@ fifo_exec (char *text)
             pos = strchr (text, ',');
             if (pos)
                 pos[0] = '\0';
-            ptr_server = server_search (text);
+            ptr_server = irc_server_search (text);
             if (!ptr_server || !ptr_server->buffer)
             {
-                irc_display_prefix (NULL, NULL, PREFIX_ERROR);
+                irc_display_prefix (NULL, NULL, GUI_PREFIX_ERROR);
                 gui_printf (NULL, _("%s server \"%s\" not found (FIFO pipe data)\n"),
                             WEECHAT_WARNING, text);
                 return;
             }
             if (ptr_server && pos)
             {
-                ptr_channel = channel_search_any (ptr_server, pos + 1);
+                ptr_channel = irc_channel_search_any (ptr_server, pos + 1);
                 if (!ptr_channel)
                 {
-                    irc_display_prefix (NULL, NULL, PREFIX_ERROR);
+                    irc_display_prefix (NULL, NULL, GUI_PREFIX_ERROR);
                     gui_printf (NULL,
                                 _("%s channel \"%s\" not found (FIFO pipe data)\n"),
                                 WEECHAT_WARNING, pos + 1);

src/common/fifo.h

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 

src/common/history.c

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* history.c: memorize commands or text */
@@ -62,7 +61,7 @@ history_buffer_add (void *buffer, char *string)
 	{
 	    new_history->text = strdup (string);
 	    if (cfg_log_hide_nickserv_pwd)
-                irc_hide_password (new_history->text, 1);
+                irc_display_hide_password (new_history->text, 1);
 	    
 	    if (((t_gui_buffer *)(buffer))->history)
 		((t_gui_buffer *)(buffer))->history->prev_history = new_history;
@@ -112,7 +111,7 @@ history_global_add (char *string)
 	{
 	    new_history->text = strdup (string);
 	    if (cfg_log_hide_nickserv_pwd)
-		irc_hide_password (new_history->text, 1);
+		irc_display_hide_password (new_history->text, 1);
 	    
 	    if (history_global)
 		history_global->prev_history = new_history;

src/common/history.h

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 

src/common/hotlist.c

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* hotlist.c: WeeChat hotlist (buffers with activity) */
@@ -25,15 +24,19 @@
 #endif
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "weechat.h"
 #include "hotlist.h"
+#include "log.h"
+#include "util.h"
+#include "weeconfig.h"
 #include "../irc/irc.h"
 #include "../gui/gui.h"
 
 
-t_weechat_hotlist *hotlist = NULL;
-t_weechat_hotlist *last_hotlist = NULL;
+t_weechat_hotlist *weechat_hotlist = NULL;
+t_weechat_hotlist *last_weechat_hotlist = NULL;
 t_gui_buffer *hotlist_initial_buffer = NULL;
 
 
@@ -42,7 +45,7 @@ t_gui_buffer *hotlist_initial_buffer = NULL;
  */
 
 t_weechat_hotlist *
-hotlist_search (t_gui_buffer *buffer)
+hotlist_search (t_weechat_hotlist *hotlist, t_gui_buffer *buffer)
 {
     t_weechat_hotlist *ptr_hotlist;
     
@@ -59,27 +62,128 @@ hotlist_search (t_gui_buffer *buffer)
  */
 
 t_weechat_hotlist *
-hotlist_find_pos (t_weechat_hotlist *new_hotlist)
+hotlist_find_pos (t_weechat_hotlist *hotlist, t_weechat_hotlist *new_hotlist)
 {
     t_weechat_hotlist *ptr_hotlist;
     
-    for (ptr_hotlist = hotlist; ptr_hotlist; ptr_hotlist = ptr_hotlist->next_hotlist)
+    switch (cfg_look_hotlist_sort)
     {
-        if (new_hotlist->priority > ptr_hotlist->priority)
-            return ptr_hotlist;
+        case CFG_LOOK_HOTLIST_SORT_GROUP_TIME_ASC:
+            for (ptr_hotlist = hotlist; ptr_hotlist;
+                 ptr_hotlist = ptr_hotlist->next_hotlist)
+            {
+                if ((new_hotlist->priority > ptr_hotlist->priority)
+                    || ((new_hotlist->priority == ptr_hotlist->priority)
+                        && (get_timeval_diff (&(new_hotlist->creation_time),
+                                              &(ptr_hotlist->creation_time)) > 0)))
+                    return ptr_hotlist;
+            }
+            break;
+        case CFG_LOOK_HOTLIST_SORT_GROUP_TIME_DESC:
+            for (ptr_hotlist = hotlist; ptr_hotlist;
+                 ptr_hotlist = ptr_hotlist->next_hotlist)
+            {
+                if ((new_hotlist->priority > ptr_hotlist->priority)
+                    || ((new_hotlist->priority == ptr_hotlist->priority)
+                        && (get_timeval_diff (&(new_hotlist->creation_time),
+                                              &(ptr_hotlist->creation_time)) < 0)))
+                    return ptr_hotlist;
+            }
+            break;
+        case CFG_LOOK_HOTLIST_SORT_GROUP_NUMBER_ASC:
+            for (ptr_hotlist = hotlist; ptr_hotlist;
+                 ptr_hotlist = ptr_hotlist->next_hotlist)
+            {
+                if ((new_hotlist->priority > ptr_hotlist->priority)
+                    || ((new_hotlist->priority == ptr_hotlist->priority)
+                        && (new_hotlist->buffer->number < ptr_hotlist->buffer->number)))
+                    return ptr_hotlist;
+            }
+            break;
+        case CFG_LOOK_HOTLIST_SORT_GROUP_NUMBER_DESC:
+            for (ptr_hotlist = hotlist; ptr_hotlist;
+                 ptr_hotlist = ptr_hotlist->next_hotlist)
+            {
+                if ((new_hotlist->priority > ptr_hotlist->priority)
+                    || ((new_hotlist->priority == ptr_hotlist->priority)
+                        && (new_hotlist->buffer->number > ptr_hotlist->buffer->number)))
+                    return ptr_hotlist;
+            }
+            break;
+        case CFG_LOOK_HOTLIST_SORT_NUMBER_ASC:
+            for (ptr_hotlist = hotlist; ptr_hotlist;
+                 ptr_hotlist = ptr_hotlist->next_hotlist)
+            {
+                if (new_hotlist->buffer->number < ptr_hotlist->buffer->number)
+                    return ptr_hotlist;
+            }
+            break;
+        case CFG_LOOK_HOTLIST_SORT_NUMBER_DESC:
+            for (ptr_hotlist = hotlist; ptr_hotlist;
+                 ptr_hotlist = ptr_hotlist->next_hotlist)
+            {
+                if (new_hotlist->buffer->number > ptr_hotlist->buffer->number)
+                    return ptr_hotlist;
+            }
+            break;
     }
     return NULL;
 }
 
 /*
- * hotlist_add: add a buffer to hotlist, with priority
+ * hotlist_add_hotlist: add new hotlist in list
  */
 
 void
-hotlist_add (int priority, t_irc_server *server, t_gui_buffer *buffer,
+hotlist_add_hotlist (t_weechat_hotlist **hotlist, t_weechat_hotlist **last_hotlist,
+                     t_weechat_hotlist *new_hotlist)
+{
+    t_weechat_hotlist *pos_hotlist;
+    
+    if (*hotlist)
+    {
+        pos_hotlist = hotlist_find_pos (*hotlist, new_hotlist);
+        
+        if (pos_hotlist)
+        {
+            /* insert hotlist into the hotlist (before hotlist found) */
+            new_hotlist->prev_hotlist = pos_hotlist->prev_hotlist;
+            new_hotlist->next_hotlist = pos_hotlist;
+            if (pos_hotlist->prev_hotlist)
+                pos_hotlist->prev_hotlist->next_hotlist = new_hotlist;
+            else
+                *hotlist = new_hotlist;
+            pos_hotlist->prev_hotlist = new_hotlist;
+        }
+        else
+        {
+            /* add hotlist to the end */
+            new_hotlist->prev_hotlist = *last_hotlist;
+            new_hotlist->next_hotlist = NULL;
+            (*last_hotlist)->next_hotlist = new_hotlist;
+            *last_hotlist = new_hotlist;
+        }
+    }
+    else
+    {
+        new_hotlist->prev_hotlist = NULL;
+        new_hotlist->next_hotlist = NULL;
+        *hotlist = new_hotlist;
+        *last_hotlist = new_hotlist;
+    }
+}
+
+/*
+ * hotlist_add: add a buffer to hotlist, with priority
+ *              if creation_time is NULL, current time is used
+ */
+
+void
+hotlist_add (int priority, struct timeval *creation_time,
+             t_irc_server *server, t_gui_buffer *buffer,
              int allow_current_buffer)
 {
-    t_weechat_hotlist *new_hotlist, *pos_hotlist;
+    t_weechat_hotlist *new_hotlist, *ptr_hotlist;
     
     if (!buffer)
         return;
@@ -89,13 +193,13 @@ hotlist_add (int priority, t_irc_server *server, t_gui_buffer *buffer,
         && (!allow_current_buffer) && (!gui_buffer_is_scrolled (buffer)))
         return;
     
-    if ((pos_hotlist = hotlist_search (buffer)))
+    if ((ptr_hotlist = hotlist_search (weechat_hotlist, buffer)))
     {
         /* return if priority is greater or equal than the one to add */
-        if (pos_hotlist->priority >= priority)
+        if (ptr_hotlist->priority >= priority)
             return;
         /* remove buffer if present with lower priority and go on */
-        hotlist_free (pos_hotlist);
+        hotlist_free (&weechat_hotlist, &last_weechat_hotlist, ptr_hotlist);
     }
     
     if ((new_hotlist = (t_weechat_hotlist *) malloc (sizeof (t_weechat_hotlist))) == NULL)
@@ -106,40 +210,66 @@ hotlist_add (int priority, t_irc_server *server, t_gui_buffer *buffer,
     }
     
     new_hotlist->priority = priority;
+    if (creation_time)
+        memcpy (&(new_hotlist->creation_time),
+                creation_time, sizeof (creation_time));
+    else
+        gettimeofday (&(new_hotlist->creation_time), NULL);
     new_hotlist->server = server;
     new_hotlist->buffer = buffer;
+    new_hotlist->next_hotlist = NULL;
+    new_hotlist->prev_hotlist = NULL;
     
-    if (hotlist)
-    {
-        pos_hotlist = hotlist_find_pos (new_hotlist);
-        
-        if (pos_hotlist)
-        {
-            /* insert hotlist into the hotlist (before hotlist found) */
-            new_hotlist->prev_hotlist = pos_hotlist->prev_hotlist;
-            new_hotlist->next_hotlist = pos_hotlist;
-            if (pos_hotlist->prev_hotlist)
-                pos_hotlist->prev_hotlist->next_hotlist = new_hotlist;
-            else
-                hotlist = new_hotlist;
-            pos_hotlist->prev_hotlist = new_hotlist;
-        }
-        else
-        {
-            /* add hotlist to the end */
-            new_hotlist->prev_hotlist = last_hotlist;
-            new_hotlist->next_hotlist = NULL;
-            last_hotlist->next_hotlist = new_hotlist;
-            last_hotlist = new_hotlist;
-        }
-    }
-    else
+    hotlist_add_hotlist (&weechat_hotlist, &last_weechat_hotlist, new_hotlist);
+}
+
+/*
+ * hotlist_dup: duplicate hotlist element
+ */
+
+t_weechat_hotlist *
+hotlist_dup (t_weechat_hotlist *hotlist)
+{
+    t_weechat_hotlist *new_hotlist;
+    
+    if ((new_hotlist = (t_weechat_hotlist *) malloc (sizeof (t_weechat_hotlist))))
     {
+        new_hotlist->priority = hotlist->priority;
+        memcpy (&(new_hotlist->creation_time), &(hotlist->creation_time),
+                sizeof (new_hotlist->creation_time));
+        new_hotlist->server = hotlist->server;
+        new_hotlist->buffer = hotlist->buffer;
         new_hotlist->prev_hotlist = NULL;
         new_hotlist->next_hotlist = NULL;
-        hotlist = new_hotlist;
-        last_hotlist = new_hotlist;
+        return new_hotlist;
     }
+    return NULL;
+}
+
+/*
+ * hotlist_resort: resort hotlist with new sort type
+ */
+
+void
+hotlist_resort ()
+{
+    t_weechat_hotlist *new_hotlist, *last_new_hotlist;
+    t_weechat_hotlist *ptr_hotlist, *element;
+    
+    /* copy and resort hotlist in new linked list */
+    new_hotlist = NULL;
+    last_new_hotlist = NULL;
+    for (ptr_hotlist = weechat_hotlist; ptr_hotlist;
+         ptr_hotlist = ptr_hotlist->next_hotlist)
+    {
+        element = hotlist_dup (ptr_hotlist);
+        hotlist_add_hotlist (&new_hotlist, &last_new_hotlist, element);
+    }
+
+    hotlist_free_all (&weechat_hotlist, &last_weechat_hotlist);
+
+    weechat_hotlist = new_hotlist;
+    last_weechat_hotlist = last_new_hotlist;
 }
 
 /*
@@ -147,17 +277,18 @@ hotlist_add (int priority, t_irc_server *server, t_gui_buffer *buffer,
  */
 
 void
-hotlist_free (t_weechat_hotlist *ptr_hotlist)
+hotlist_free (t_weechat_hotlist **hotlist, t_weechat_hotlist **last_hotlist,
+              t_weechat_hotlist *ptr_hotlist)
 {
     t_weechat_hotlist *new_hotlist;
 
     /* remove hotlist from queue */
-    if (last_hotlist == ptr_hotlist)
-        last_hotlist = ptr_hotlist->prev_hotlist;
+    if (*last_hotlist == ptr_hotlist)
+        *last_hotlist = ptr_hotlist->prev_hotlist;
     if (ptr_hotlist->prev_hotlist)
     {
         (ptr_hotlist->prev_hotlist)->next_hotlist = ptr_hotlist->next_hotlist;
-        new_hotlist = hotlist;
+        new_hotlist = *hotlist;
     }
     else
         new_hotlist = ptr_hotlist->next_hotlist;
@@ -166,7 +297,7 @@ hotlist_free (t_weechat_hotlist *ptr_hotlist)
         (ptr_hotlist->next_hotlist)->prev_hotlist = ptr_hotlist->prev_hotlist;
     
     free (ptr_hotlist);
-    hotlist = new_hotlist;
+    *hotlist = new_hotlist;
 }
 
 /*
@@ -174,11 +305,11 @@ hotlist_free (t_weechat_hotlist *ptr_hotlist)
  */
 
 void
-hotlist_free_all ()
+hotlist_free_all (t_weechat_hotlist **hotlist, t_weechat_hotlist **last_hotlist)
 {
     /* remove all hotlists */
-    while (hotlist)
-        hotlist_free (hotlist);
+    while (*hotlist)
+        hotlist_free (hotlist, last_hotlist, *hotlist);
 }
 
 /*
@@ -190,7 +321,31 @@ hotlist_remove_buffer (t_gui_buffer *buffer)
 {
     t_weechat_hotlist *pos_hotlist;
 
-    pos_hotlist = hotlist_search (buffer);
+    pos_hotlist = hotlist_search (weechat_hotlist, buffer);
     if (pos_hotlist)
-        hotlist_free (pos_hotlist);
+        hotlist_free (&weechat_hotlist, &last_weechat_hotlist, pos_hotlist);
+}
+
+/*
+ * hotlist_print_log: print hotlist in log (usually for crash dump)
+ */
+
+void
+hotlist_print_log ()
+{
+    t_weechat_hotlist *ptr_hotlist;
+    
+    for (ptr_hotlist = weechat_hotlist; ptr_hotlist;
+         ptr_hotlist = ptr_hotlist->next_hotlist)
+    {
+        weechat_log_printf ("[hotlist (addr:0x%X)]\n", ptr_hotlist);
+        weechat_log_printf ("  priority . . . . . . . : %d\n",   ptr_hotlist->priority);
+        weechat_log_printf ("  creation_time. . . . . : tv_sec:%d, tv_usec:%d\n",
+                            ptr_hotlist->creation_time.tv_sec,
+                            ptr_hotlist->creation_time.tv_usec);
+        weechat_log_printf ("  server . . . . . . . . : 0x%X\n", ptr_hotlist->server);
+        weechat_log_printf ("  buffer . . . . . . . . : 0x%X\n", ptr_hotlist->buffer);
+        weechat_log_printf ("  prev_hotlist . . . . . : 0x%X\n", ptr_hotlist->prev_hotlist);
+        weechat_log_printf ("  next_hotlist . . . . . : 0x%X\n", ptr_hotlist->next_hotlist);
+    }
 }

src/common/hotlist.h

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -34,18 +33,22 @@ struct t_weechat_hotlist
 {
     int priority;                       /* 0=crappy msg (join/part), 1=msg, */
                                         /* 2=pv, 3=nick highlight           */
+    struct timeval creation_time;       /* time when entry was added        */
     t_irc_server *server;               /* associated server                */
     t_gui_buffer *buffer;               /* associated buffer                */
     t_weechat_hotlist *prev_hotlist;    /* link to previous hotlist         */
     t_weechat_hotlist *next_hotlist;    /* link to next hotlist             */
 };
 
-extern t_weechat_hotlist *hotlist;
+extern t_weechat_hotlist *weechat_hotlist;
+extern t_weechat_hotlist *last_weechat_hotlist;
 extern t_gui_buffer *hotlist_initial_buffer;
 
-extern void hotlist_add (int, t_irc_server *, t_gui_buffer *, int);
-extern void hotlist_free (t_weechat_hotlist *);
-extern void hotlist_free_all ();
+extern void hotlist_add (int, struct timeval *, t_irc_server *, t_gui_buffer *, int);
+extern void hotlist_resort ();
+extern void hotlist_free (t_weechat_hotlist **, t_weechat_hotlist **, t_weechat_hotlist *);
+extern void hotlist_free_all (t_weechat_hotlist **, t_weechat_hotlist **);
 extern void hotlist_remove_buffer (t_gui_buffer *);
+extern void hotlist_print_log ();
 
 #endif /* hotlist.h */

src/common/log.c

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* log.c: WeeChat log file */
@@ -28,6 +27,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdarg.h>
+#include <errno.h>
 
 #ifdef HAVE_FLOCK
 #include <sys/file.h>
@@ -80,11 +80,14 @@ weechat_log_open (char *filename, char *mode)
 #ifdef HAVE_FLOCK
     if ((flock (fileno (weechat_log_file), LOCK_EX | LOCK_NB) != 0))
     {
-        fclose (weechat_log_file);
-        weechat_log_file = NULL;
-        free (weechat_log_filename);
-        weechat_log_filename = NULL;
-        return 0;
+        if (errno == EWOULDBLOCK)
+        {
+            fclose (weechat_log_file);
+            weechat_log_file = NULL;
+            free (weechat_log_filename);
+            weechat_log_filename = NULL;
+            return 0;
+        }
     }
 #endif
 
@@ -101,7 +104,7 @@ weechat_log_init ()
     if (!weechat_log_open (NULL, "w"))
     {
         weechat_iconv_fprintf (stderr,
-                               _("%s unable to create/append to log file\n"
+                               _("%s unable to create/append to log file (weechat.log)\n"
                                  "If another WeeChat process is using this file, try to run WeeChat\n"
                                  "with another home using \"--dir\" command line option.\n"),
                                WEECHAT_ERROR);

src/common/log.h

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 

src/common/session.c

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* session.c: save/restore session data */
@@ -220,7 +219,7 @@ session_save_servers (FILE *file)
         rc = rc && (session_write_int (file, SESSION_SERV_AUTOCONNECT, ptr_server->autoconnect));
         rc = rc && (session_write_int (file, SESSION_SERV_AUTORECONNECT, ptr_server->autoreconnect));
         rc = rc && (session_write_int (file, SESSION_SERV_AUTORECONNECT_DELAY, ptr_server->autoreconnect_delay));
-        rc = rc && (session_write_int (file, SESSION_SERV_COMMAND_LINE, ptr_server->command_line));
+        rc = rc && (session_write_int (file, SESSION_SERV_TEMP_SERVER, ptr_server->temp_server));
         rc = rc && (session_write_str (file, SESSION_SERV_ADDRESS, ptr_server->address));
         rc = rc && (session_write_int (file, SESSION_SERV_PORT, ptr_server->port));
         rc = rc && (session_write_int (file, SESSION_SERV_IPV6, ptr_server->ipv6));
@@ -259,7 +258,9 @@ session_save_servers (FILE *file)
         rc = rc && (session_write_str (file, SESSION_SERV_UNTERMINATED_MESSAGE, ptr_server->unterminated_message));
         rc = rc && (session_write_str (file, SESSION_SERV_NICK, ptr_server->nick));
         rc = rc && (session_write_str (file, SESSION_SERV_NICK_MODES, ptr_server->nick_modes));
+        rc = rc && (session_write_str (file, SESSION_SERV_PREFIX, ptr_server->prefix));
         rc = rc && (session_write_buf (file, SESSION_SERV_RECONNECT_START, &(ptr_server->reconnect_start), sizeof (time_t)));
+        rc = rc && (session_write_buf (file, SESSION_SERV_COMMAND_TIME, &(ptr_server->command_time), sizeof (time_t)));
         rc = rc && (session_write_int (file, SESSION_SERV_RECONNECT_JOIN, ptr_server->reconnect_join));
         rc = rc && (session_write_int (file, SESSION_SERV_IS_AWAY, ptr_server->is_away));
         rc = rc && (session_write_str (file, SESSION_SERV_AWAY_MESSAGE, ptr_server->away_message));
@@ -294,7 +295,7 @@ session_save_dcc (FILE *file)
     
     rc = 1;
     
-    for (ptr_dcc = last_dcc; ptr_dcc;
+    for (ptr_dcc = irc_last_dcc; ptr_dcc;
          ptr_dcc = ptr_dcc->prev_dcc)
     {
         rc = rc && (session_write_id  (file, SESSION_OBJ_DCC));
@@ -398,8 +399,8 @@ session_save_buffers (FILE *file)
          ptr_buffer = ptr_buffer->next_buffer)
     {
         rc = rc && (session_write_id  (file, SESSION_OBJ_BUFFER));
-        rc = rc && (session_write_str (file, SESSION_BUFF_SERVER, SERVER(ptr_buffer) ? SERVER(ptr_buffer)->name : NULL));
-        rc = rc && (session_write_str (file, SESSION_BUFF_CHANNEL, CHANNEL(ptr_buffer) ? CHANNEL(ptr_buffer)->name : NULL));
+        rc = rc && (session_write_str (file, SESSION_BUFF_SERVER, GUI_SERVER(ptr_buffer) ? GUI_SERVER(ptr_buffer)->name : NULL));
+        rc = rc && (session_write_str (file, SESSION_BUFF_CHANNEL, GUI_CHANNEL(ptr_buffer) ? GUI_CHANNEL(ptr_buffer)->name : NULL));
         rc = rc && (session_write_int (file, SESSION_BUFF_TYPE, ptr_buffer->type));
         rc = rc && (session_write_int (file, SESSION_BUFF_ALL_SERVERS, ptr_buffer->all_servers));
         rc = rc && (session_write_id  (file, SESSION_BUFF_END));
@@ -449,13 +450,14 @@ session_save_hotlist (FILE *file)
     
     rc = 1;
     
-    for (ptr_hotlist = hotlist; ptr_hotlist;
+    for (ptr_hotlist = weechat_hotlist; ptr_hotlist;
          ptr_hotlist = ptr_hotlist->next_hotlist)
     {
         rc = rc && (session_write_id  (file, SESSION_OBJ_HOTLIST));
         rc = rc && (session_write_int (file, SESSION_HOTL_PRIORITY, ptr_hotlist->priority));
         rc = rc && (session_write_str (file, SESSION_HOTL_SERVER, (ptr_hotlist->server) ? ptr_hotlist->server->name : NULL));
         rc = rc && (session_write_int (file, SESSION_HOTL_BUFFER_NUMBER, ptr_hotlist->buffer->number));
+        rc = rc && (session_write_buf (file, SESSION_HOTL_CREATION_TIME, &(ptr_hotlist->creation_time), sizeof (struct timeval)));
         rc = rc && (session_write_id  (file, SESSION_HOTL_END));
         
         if (!rc)
@@ -825,7 +827,6 @@ session_load_server (FILE *file)
     void *session_data;
     size_t session_size;
     int session_size_int;
-    const int cert_type_prio[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
 #endif
     
     /* read server name */
@@ -839,20 +840,20 @@ session_load_server (FILE *file)
     /* use or allocate server */
     weechat_log_printf (_("session: loading server \"%s\"\n"),
                         server_name);
-    session_current_server = server_search (server_name);
+    session_current_server = irc_server_search (server_name);
     if (session_current_server)
         weechat_log_printf (_("server found, updating values\n"));
     else
     {
         weechat_log_printf (_("server not found, creating new one\n"));
-        session_current_server = server_alloc ();
+        session_current_server = irc_server_alloc ();
         if (!session_current_server)
         {
             free (server_name);
             session_crash (file, _("can't create new server"));
             return 0;
         }
-        server_init (session_current_server);
+        irc_server_init (session_current_server);
         session_current_server->name = strdup (server_name);
     }
     free (server_name);
@@ -881,8 +882,8 @@ session_load_server (FILE *file)
             case SESSION_SERV_AUTORECONNECT_DELAY:
                 rc = rc && (session_read_int (file, &(session_current_server->autoreconnect_delay)));
                 break;
-            case SESSION_SERV_COMMAND_LINE:
-                rc = rc && (session_read_int (file, &(session_current_server->command_line)));
+            case SESSION_SERV_TEMP_SERVER:
+                rc = rc && (session_read_int (file, &(session_current_server->temp_server)));
                 break;
             case SESSION_SERV_ADDRESS:
                 rc = rc && (session_read_str (file, &(session_current_server->address)));
@@ -958,7 +959,8 @@ session_load_server (FILE *file)
                     return 0;
                 }
                 gnutls_set_default_priority (session_current_server->gnutls_sess);
-                gnutls_certificate_type_set_priority (session_current_server->gnutls_sess, cert_type_prio);
+                gnutls_certificate_type_set_priority (session_current_server->gnutls_sess, gnutls_cert_type_prio);
+                gnutls_protocol_set_priority (session_current_server->gnutls_sess, gnutls_prot_prio);
                 gnutls_credentials_set (session_current_server->gnutls_sess, GNUTLS_CRD_CERTIFICATE, gnutls_xcred);
                 session_data = NULL;
                 rc = rc && (session_read_buf_alloc (file, &session_data, &session_size_int));
@@ -986,9 +988,15 @@ session_load_server (FILE *file)
             case SESSION_SERV_NICK_MODES:
                 rc = rc && (session_read_str (file, &(session_current_server->nick_modes)));
                 break;
+            case SESSION_SERV_PREFIX:
+                rc = rc && (session_read_str (file, &(session_current_server->prefix)));
+                break;
             case SESSION_SERV_RECONNECT_START:
                 rc = rc && (session_read_buf (file, &(session_current_server->reconnect_start), sizeof (time_t)));
                 break;
+            case SESSION_SERV_COMMAND_TIME:
+                rc = rc && (session_read_buf (file, &(session_current_server->command_time), sizeof (time_t)));
+                break;
             case SESSION_SERV_RECONNECT_JOIN:
                 rc = rc && (session_read_int (file, &(session_current_server->reconnect_join)));
                 break;
@@ -1065,9 +1073,9 @@ session_load_channel (FILE *file)
     /* allocate channel */
     weechat_log_printf (_("session: loading channel \"%s\"\n"),
                         channel_name);
-    session_current_channel = channel_new (session_current_server,
-                                           channel_type,
-                                           channel_name);
+    session_current_channel = irc_channel_new (session_current_server,
+                                               channel_type,
+                                               channel_name);
     free (channel_name);
     if (!session_current_channel)
     {
@@ -1160,8 +1168,8 @@ session_load_nick (FILE *file)
     }
     
     /* allocate nick */
-    nick = nick_new (session_current_server, session_current_channel,
-                     nick_name, 0, 0, 0, 0, 0);
+    nick = irc_nick_new (session_current_server, session_current_channel,
+                         nick_name, 0, 0, 0, 0, 0, 0, 0);
     free (nick_name);
     if (!nick)
     {
@@ -1218,7 +1226,7 @@ session_load_dcc (FILE *file)
     t_irc_channel *ptr_channel;
     
     /* allocate DCC */
-    dcc = dcc_alloc ();
+    dcc = irc_dcc_alloc ();
     if (!dcc)
     {
         session_crash (file, _("can't create new DCC"));
@@ -1251,7 +1259,7 @@ session_load_dcc (FILE *file)
                     return 0;
                 if (string && string[0])
                 {
-                    ptr_server = server_search (string);
+                    ptr_server = irc_server_search (string);
                     if (!ptr_server)
                     {
                         session_crash (file, _("server not found for DCC"));
@@ -1272,7 +1280,7 @@ session_load_dcc (FILE *file)
                     return 0;
                 if (string && string[0])
                 {
-                    ptr_channel = channel_search_any (ptr_server, string);
+                    ptr_channel = irc_channel_search_any (ptr_server, string);
                     if (!ptr_channel)
                     {
                         session_crash (file, _("channel not found for DCC"));
@@ -1464,7 +1472,7 @@ session_load_buffer (FILE *file)
     ptr_channel = NULL;
     if (server_name)
     {
-        ptr_server = server_search (server_name);
+        ptr_server = irc_server_search (server_name);
         if (!ptr_server)
         {
             session_crash (file, _("server not found for buffer"));
@@ -1474,7 +1482,7 @@ session_load_buffer (FILE *file)
     
     if (channel_name)
     {
-        ptr_channel = channel_search_any_without_buffer (ptr_server, channel_name);
+        ptr_channel = irc_channel_search_any_without_buffer (ptr_server, channel_name);
         if (!ptr_channel)
         {
             session_crash (file, _("channel not found for buffer"));
@@ -1650,12 +1658,15 @@ session_load_hotlist (FILE *file)
 {
     int object_id, rc;
     int priority;
+    struct timeval creation_time;
     char *server_name;
     t_irc_server *ptr_server;
     int buffer_number;
     t_gui_buffer *ptr_buffer;
 
     priority = 0;
+    creation_time.tv_sec = 0;
+    creation_time.tv_usec = 0;
     ptr_server = NULL;
     ptr_buffer = NULL;
     
@@ -1673,7 +1684,7 @@ session_load_hotlist (FILE *file)
         switch (object_id)
         {
             case SESSION_HOTL_END:
-                hotlist_add (priority, ptr_server, ptr_buffer, 1);
+                hotlist_add (priority, &creation_time, ptr_server, ptr_buffer, 1);
                 return 1;
             case SESSION_HOTL_PRIORITY:
                 rc = rc && (session_read_int (file, &priority));
@@ -1682,13 +1693,16 @@ session_load_hotlist (FILE *file)
                 server_name = NULL;
                 if (!session_read_str (file, &server_name))
                     return 0;
-                ptr_server = server_search (server_name);
+                ptr_server = irc_server_search (server_name);
                 free (server_name);
                 break;
             case SESSION_HOTL_BUFFER_NUMBER:
                 rc = rc && (session_read_int (file, &buffer_number));
                 ptr_buffer = gui_buffer_search_by_number (buffer_number);
                 break;
+            case SESSION_HOTL_CREATION_TIME:
+                rc = rc && (session_read_buf (file, &creation_time, sizeof (struct timeval)));
+                break;
             default:
                 weechat_log_printf (_("session: warning: ignoring value from "
                                       "history (object id: %d)\n"),
@@ -1839,13 +1853,13 @@ session_load (char *filename)
     
     if (unlink (filename) < 0)
     {
-        irc_display_prefix (NULL, gui_current_window->buffer, PREFIX_ERROR);
+        irc_display_prefix (NULL, gui_current_window->buffer, GUI_PREFIX_ERROR);
         gui_printf_nolog (gui_current_window->buffer,
                           _("%s can't delete session file (%s)\n"),
                           WEECHAT_ERROR, filename);
     }
     
-    irc_display_prefix (NULL, gui_current_window->buffer, PREFIX_INFO);
+    irc_display_prefix (NULL, gui_current_window->buffer, GUI_PREFIX_INFO);
     gui_printf_nolog (gui_current_window->buffer,
                       _("Upgrade completed successfully\n"));
     

src/common/session.h

@@ -4,7 +4,7 @@
  *
  * This program 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 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -55,7 +54,7 @@ enum t_session_server
     SESSION_SERV_AUTOCONNECT,
     SESSION_SERV_AUTORECONNECT,
     SESSION_SERV_AUTORECONNECT_DELAY,
-    SESSION_SERV_COMMAND_LINE,
+    SESSION_SERV_TEMP_SERVER,
     SESSION_SERV_ADDRESS,
     SESSION_SERV_PORT,
     SESSION_SERV_IPV6,
@@ -92,7 +91,9 @@ enum t_session_server
     SESSION_SERV_CHARSET_ENCODE__UNUSED,
     SESSION_SERV_HOSTNAME,
     SESSION_SERV_NICK_MODES,
-    SESSION_SERV_AWAY_MESSAGE
+    SESSION_SERV_AWAY_MESSAGE,
+    SESSION_SERV_PREFIX,
+    SESSION_SERV_COMMAND_TIME
 };
 
 enum t_session_channel
@@ -194,7 +195,8 @@ enum t_session_hotlist
     SESSION_HOTL_END = 0,
     SESSION_HOTL_PRIORITY,
     SESSION_HOTL_SERVER,
-    SESSION_HOTL_BUFFER_NUMBER
+    SESSION_HOTL_BUFFER_NUMBER,
+    SESSION_HOTL_CREATION_TIME
 };
 
 int session_save (char *filename);