1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00

Merge branch 'elinks-0.12' into master

Conflicts:
	NEWS (merged)
	configure.in (merged)
	doc/man/man1/elinks.1.in (regenerated)
	doc/man/man5/elinks.conf.5 (regenerated)
	doc/man/man5/elinkskeys.5 (regenerated)
	po/af.po (used elinks-0.12)
	po/be.po (used elinks-0.12)
	po/bg.po (used elinks-0.12)
	po/ca.po (used elinks-0.12)
	po/cs.po (used elinks-0.12)
	po/da.po (used elinks-0.12)
	po/de.po (used elinks-0.12)
	po/el.po (used elinks-0.12)
	po/es.po (used elinks-0.12)
	po/et.po (used elinks-0.12)
	po/fi.po (used elinks-0.12)
	po/fr.po (used master)
	po/gl.po (used elinks-0.12)
	po/hr.po (used elinks-0.12)
	po/hu.po (used elinks-0.12)
	po/id.po (used elinks-0.12)
	po/is.po (used elinks-0.12)
	po/it.po (used elinks-0.12)
	po/lt.po (used elinks-0.12)
	po/nb.po (used elinks-0.12)
	po/nl.po (used elinks-0.12)
	po/pl.po (used master)
	po/pt.po (used elinks-0.12)
	po/pt_BR.po (used elinks-0.12)
	po/ro.po (used elinks-0.12)
	po/ru.po (used elinks-0.12)
	po/sk.po (used elinks-0.12)
	po/sr.po (used elinks-0.12)
	po/sv.po (used elinks-0.12)
	po/tr.po (used elinks-0.12)
	po/uk.po (used elinks-0.12)
This commit is contained in:
Kalle Olavi Niemitalo 2009-03-29 18:26:20 +03:00 committed by Kalle Olavi Niemitalo
commit 34f8f6a58f
49 changed files with 47029 additions and 44873 deletions

19
NEWS
View File

@ -40,8 +40,6 @@ Miscellaneous:
``Background and Notify'' via the download manager in some terminal,
reassociate the download with that terminal. These changes do not
apply to downloads to external handlers.
* Don't crash when the search-toggle-regex action is used and no regular
expression support is compiled in.
* Really retry forever when connection.retries = 0.
* enhancement: Session-specific options. Any options changed with
toggle-* actions no longer affect other tabs or other terminals.
@ -53,7 +51,6 @@ Miscellaneous:
* enhancement 824: Experimental support for combining characters.
See features.conf for details.
* enhancement: Add a new entry Link Info under Link main menu.
* enhancement: New option protocol.http.compression.
* enhancement: Indicate backgrounded downloads using an unused led.
* enhancement: Display the number of ECMAScript interpreters that have
been allocated for documents in the Resources dialog.
@ -72,11 +69,11 @@ have already been considered.
(mostly reverted)
//////////////////////////////////////////////////////////////////////
ELinks 0.12pre2.GIT now:
------------------------
ELinks 0.12pre3:
----------------
To be released as 0.12pre3, 0.12rc1, or even 0.12.0. This branch also
includes the changes listed under ``ELinks 0.11.5.GIT'' below.
Released on 2009-03-29. This release also included the changes listed
under ``ELinks 0.11.6'' below.
Incompatibilities:
@ -334,10 +331,10 @@ Changes in the experimental SGML/DOM implementation:
* enhancement: incremental parsing
* and more.
ELinks 0.11.5.GIT now:
----------------------
ELinks 0.11.6:
--------------
To be released as 0.11.6.
Released on 2009-03-21.
* critical: fix double-free crash if EOF immediately follows </MAP>
* critical bug 1053: fix crash if a download finishes after ELinks has
@ -347,6 +344,8 @@ To be released as 0.11.6.
Turkish locale
* minor: clicking a link with the mouse activates that link, rather
than the one selected with move-cursor-* actions
* build bug 1047: attempt to make inline functions satisfy C99 6.7.4p3
so that ELinks can be built on OpenSolaris
ELinks 0.11.5:
--------------

View File

@ -225,6 +225,29 @@ AC_SUBST(CONFIG_INTERLINK)
AC_STRUCT_TM
AC_C_CONST
AC_C_INLINE
AC_MSG_CHECKING([[C99-conforming inline]])
AC_COMPILE_IFELSE([[
int add(int x);
static int sum;
inline int
add(int change)
{
sum += change;
return sum;
}
int
sub(int change)
{
return add(-change);
}]],
[AC_MSG_RESULT([[yes]])
AC_DEFINE([NONSTATIC_INLINE], [inline],
[Define as inline if the compiler lets you declare a function without inline, then define it with inline, and have that definition refer to identifiers with internal linkage. This is allowed by C99 6.7.4p6 and 6.7.4p3 together. Otherwise define as nothing.])],
[AC_MSG_RESULT([[no]])
AC_DEFINE([NONSTATIC_INLINE], [])])
EL_CHECK_CODE(typeof, HAVE_TYPEOF, [], [int a; typeof(a) b;])
AC_SYS_LARGEFILE
@ -557,7 +580,7 @@ AC_ARG_WITH(see, [ --with-see enable Simple Ecmascript Engine (SEE
[ if test "x$withval" != xno; then enable_see=yes; fi ])
# The following is probably bad, ugly and so on. Stolen from Guile's (1.4)
# SEE_FLAGS but I really don't want to require people to have Guile in order
# GUILE_FLAGS but I really don't want to require people to have Guile in order
# to compile CVS. Also, the macro seems to be really stupid regarding searching
# for Guile in $PATH etc. --pasky

View File

@ -246,6 +246,51 @@ remarkable implication of no C99 are no C++ (//) comments and declarations
at the start of block only.
Inline functions
----------------
Various standards and compilers set restrictions on inline functions:
- C89 doesn't support them at all.
- According to C99 6.7.4p6, if a translation unit declares a function
as inline and not static, then it must also define that function.
- According to C99 6.7.4p3, an inline definition of a non-static
function must not contain any non-const static variables, and must
not refer to anything static outside of it. According to C99
6.7.4p6 however, if the function is ever declared without inline or
with extern, then its definition is not an inline definition even if
the definition includes the inline keyword.
- Sun Studio 11 on Solaris 9 does not let non-static inline functions
refer to static identifiers. Unlike C99 6.7.4p3, this seems to
apply to all definitions of inline functions, not only inline
definitions. See ELinks bug 1047.
- GCC 4.3.1 warns if a function is declared inline after being called.
Perhaps it means such calls cannot be inlined.
- In C99, a function definition with extern inline means the compiler
should inline calls to that function and must also emit out-of-line
code that other translation units can call. In GCC 4.3.1, it
instead means the out-of-line definition is elsewhere.
So to be portable to all of those, we use inline functions in only
these ways:
- Define as static inline in a *.c file. Perhaps declare in that same
file. On C89, we #define inline to nothing.
- Define as static inline in a *.h file. Perhaps declare in that same
file. On C89, we #define inline to nothing, and extra copies of the
function may then get emitted but anyway it'll work.
- Declare without inline in a *.h file, and define with NONSTATIC_INLINE
in a *.c file. Perhaps also declare with NONSTATIC_INLINE in the same
*.c file. On Sun Studio 11, we #define NONSTATIC_INLINE to nothing.
Comments
--------
@ -661,7 +706,7 @@ diff -ru elinks/ elinks+mysuperfeature/ >elinks-mysuperfeature.patch
Please manually remove any bloat like changes in ./configure, whitespace
changes etc. ;-).
We also accept output from `cvs diff -u` :). The statement about bloat
We also accept output from `git diff` :). The statement about bloat
removing above still applies.
Big patches are hard to review so if your feature involves a lot of changes

View File

@ -1,11 +1,11 @@
.\" Title: elinks
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
.\" Date: 09/27/2008
.\" Date: 03/29/2009
.\" Manual: The Elinks text-browser
.\" Source: ELinks 0.13.GIT
.\"
.TH "ELINKS" "1" "09/27/2008" "ELinks 0\&.13\&.GIT" "The Elinks text\-browser"
.TH "ELINKS" "1" "03/29/2009" "ELinks 0\&.13\&.GIT" "The Elinks text\-browser"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
@ -156,13 +156,17 @@ Disables creation and use of files in the user specific home configuration direc
.PP
\fB\-no\-numbering\fR (alias for document\&.dump\&.numbering)
.RS 4
Prevents printing of link number in dump output\&. Note that this really affects only
Prevents printing of link number in dump output\&.
.sp
Note that this really affects only
\-dump, nothing else\&.
.RE
.PP
\fB\-no\-references\fR (alias for document\&.dump\&.references)
.RS 4
Prevents printing of references (URIs) of document links in dump output\&. Note that this really affects only
Prevents printing of references (URIs) of document links in dump output\&.
.sp
Note that this really affects only
\-dump, nothing else\&.
.RE
.PP
@ -170,7 +174,9 @@ Prevents printing of references (URIs) of document links in dump output\&. Note
.RS 4
Control a remote
ELinks
instance by passing commands to it\&. The option takes an additional argument containing the method which should be invoked and any parameters that should be passed to it\&. For ease of use, the additional method argument can be omitted in which case any URL arguments will be opened in new tabs in the remote instance\&. Following is a list of the supported methods:
instance by passing commands to it\&. The option takes an additional argument containing the method which should be invoked and any parameters that should be passed to it\&. For ease of use, the additional method argument can be omitted in which case any URL arguments will be opened in new tabs in the remote instance\&.
.sp
Following is a list of the supported methods:
.sp
.RS 4
\h'-04'\(bu\h'+03'\fBping()\fR: look for a remote instance
@ -217,7 +223,9 @@ are interconnected and share state (cache, bookmarks, cookies, and so on)\&. By
ELinks
instances connect to session ring 0\&. You can change that behaviour with this switch and form as many session rings as you want\&. Obviously, if the session\-ring with this number doesn\'t exist yet, it\'s created and this
ELinks
instance will become the master instance (that usually doesn\'t matter for you as a user much)\&. Note that you usually don\'t want to use this unless you\'re a developer and you want to do some testing \- if you want the
instance will become the master instance (that usually doesn\'t matter for you as a user much)\&.
.sp
Note that you usually don\'t want to use this unless you\'re a developer and you want to do some testing \- if you want the
ELinks
instances each running standalone, rather use the
\-no\-connect

View File

@ -1,11 +1,11 @@
.\" Title: elinks.conf
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
.\" Date: 09/27/2008
.\" Date: 03/29/2009
.\" Manual: ELinks configuration file
.\" Source: ELinks 0.13.GIT
.\"
.TH "ELINKS\&.CONF" "5" "09/27/2008" "ELinks 0\&.13\&.GIT" "ELinks configuration file"
.TH "ELINKS\&.CONF" "5" "03/29/2009" "ELinks 0\&.13\&.GIT" "ELinks configuration file"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
@ -66,7 +66,7 @@ format
.RE
.sp
.RS 4
\h'-04'\(bu\h'+03'1 is XBEL universal XML bookmarks format (\fIELinks bug 153\fR\&[1]: NO NATIONAL CHARS SUPPORT!)
\h'-04'\(bu\h'+03'1 is XBEL universal XML bookmarks format
.RE
.RE
.PP
@ -178,13 +178,17 @@ connection\&.try_ipv4 \fB[0|1]\fR (default: 1)
.RS 4
Whether to try to connect to a host over IPv4\&. Note that if
connection\&.try_ipv6
is enabled too, it takes precedence\&. And better do not touch this at all unless you are sure what are you doing\&. Note that you can also force a given protocol to be used on a per\-connection basis by using a URL in the style of e\&.g\&.
is enabled too, it takes precedence\&. And better do not touch this at all unless you are sure what are you doing\&.
.sp
Note that you can also force a given protocol to be used on a per\-connection basis by using a URL in the style of e\&.g\&.
\fIhttp4://elinks\&.cz/\fR\&.
.RE
.PP
connection\&.try_ipv6 \fB[0|1]\fR (default: 1)
.RS 4
Whether to try to connect to a host over IPv6\&. Note that you can also force a given protocol to be used on a per\-connection basis by using a URL in the style of e\&.g\&.
Whether to try to connect to a host over IPv6\&.
.sp
Note that you can also force a given protocol to be used on a per\-connection basis by using a URL in the style of e\&.g\&.
\fIhttp6://elinks\&.cz/\fR\&.
.RE
.PP
@ -277,7 +281,9 @@ Horizontal text margin\&.
.PP
document\&.browse\&.refresh \fB[0|1]\fR (default: 1)
.RS 4
Automatically follow document\-specified refresh directives (\'<meta> refresh\' tags)\&. Web\-page authors use these to instruct the browser to reload a document at a given interval or to load another page\&. Regardless of the value the refresh URI is accessible as a link\&. Use the
Automatically follow document\-specified refresh directives (\'<meta> refresh\' tags)\&. Web\-page authors use these to instruct the browser to reload a document at a given interval or to load another page\&. Regardless of the value the refresh URI is accessible as a link\&.
.sp
Use the
document\&.browse\&.minimum_refresh_time
to control the minimum number of seconds a refresh will wait\&.
.RE
@ -347,7 +353,9 @@ document\&.browse\&.forms\&.editor \fB<str>\fR (default: "")
.RS 4
Path to the executable that
ELinks
should launch when the user requests to edit a textarea with an external editor\&. If this is blank,
should launch when the user requests to edit a textarea with an external editor\&.
.sp
If this is blank,
ELinks
will use the value of the environmental variable
\fB$EDITOR\fR\&. If
@ -575,7 +583,7 @@ Whether to allow horizontal scrolling when the document does not extend off the
.PP
document\&.browse\&.scrolling\&.horizontal_step \fB<num>\fR (default: 8)
.RS 4
Number of columns to scroll when a key bound to scroll\-left or scroll\- right is pressed and no prefix was given\&.
Number of columns to scroll when a key bound to scroll\-left or scroll\-right is pressed and no prefix was given\&.
.RE
.PP
document\&.browse\&.scrolling\&.margin \fB<num>\fR (default: 3)
@ -585,7 +593,7 @@ Size of the virtual margin \(en when you click inside of that margin, document s
.PP
document\&.browse\&.scrolling\&.vertical_step \fB<num>\fR (default: 2)
.RS 4
Number of lines to scroll when a key bound to scroll\-up or scroll\- down is pressed and no prefix was given\&.
Number of lines to scroll when a key bound to scroll\-up or scroll\-down is pressed and no prefix was given\&.
.RE
.SS "document\&.browse\&.search (Searching)"
Options for searching\&.
@ -660,7 +668,9 @@ Cache options\&.
.PP
document\&.cache\&.cache_redirects \fB[0|1]\fR (default: 0)
.RS 4
Cache even redirects sent by server (usually thru HTTP by a 302 HTTP code and a Location header)\&. This was the original behaviour for quite some time, but it causes problems in a situation very common to various web login systems \(en frequently, when accessing a certain location, they will redirect you to a login page if they don\'t receive an auth cookie, the login page then gives you the cookie and redirects you back to the original page, but there you have already cached redirect back to the login page! If this option has value of 0, this malfunction is fixed, but occasionally you may get superfluous (depends on how you take it ;\-) requests to the server\&. If this option has value of 1, experienced users can still workaround it by clever combination of usage of reload, jumping around in session history and hitting ctrl+enter\&. Note that this option is checked when retrieving the information from cache, not when saving it to cache \(en thus if you enable it, even previous redirects will be taken from cache instead of asking the server\&.
Cache even redirects sent by server (usually thru HTTP by a 302 HTTP code and a Location header)\&. This was the original behaviour for quite some time, but it causes problems in a situation very common to various web login systems \(en frequently, when accessing a certain location, they will redirect you to a login page if they don\'t receive an auth cookie, the login page then gives you the cookie and redirects you back to the original page, but there you have already cached redirect back to the login page! If this option has value of 0, this malfunction is fixed, but occasionally you may get superfluous (depends on how you take it ;\-) requests to the server\&. If this option has value of 1, experienced users can still workaround it by clever combination of usage of reload, jumping around in session history and hitting ctrl+enter\&.
.sp
Note that this option is checked when retrieving the information from cache, not when saving it to cache \(en thus if you enable it, even previous redirects will be taken from cache instead of asking the server\&.
.RE
.PP
document\&.cache\&.ignore_cache_control \fB[0|1]\fR (default: 1)
@ -681,7 +691,9 @@ document\&.cache\&.format\&.size \fB<num>\fR (default: 5)
.RS 4
Number of cached formatted pages\&. Do not get too generous here, \'formatted\' means that all the accompanying structures are kept in memory so that you get the cached document immediatelly, but these structures may take a lot \(en 2x the size of the HTML source is probably not unusual, but it can be even more if the document consists of a lot of short lines (padded right, if possible) and links and not much other markup\&. So if you set this to 256 and then you don\'t like your
ELinks
eating 90M, don\'t come complaining to us\&. ;\-) Also note that the format cache itself is not counted to the memory cache size, but the HTML source of the formatted documents is always cached, even if it is over the memory cache size threshold\&. (Then of course no other documents can be cached\&.)
eating 90M, don\'t come complaining to us\&. ;\-)
.sp
Also note that the format cache itself is not counted to the memory cache size, but the HTML source of the formatted documents is always cached, even if it is over the memory cache size threshold\&. (Then of course no other documents can be cached\&.)
.RE
.SS "document\&.cache\&.memory (Memory cache)"
Memory cache options\&.
@ -737,7 +749,9 @@ Default bookmarked link color\&.
.PP
document\&.colors\&.dirs \fB<color|#rrggbb>\fR (default: yellow)
.RS 4
Default directory color\&. See
Default directory color\&.
.sp
See
document\&.browse\&.links\&.color_dirs
option\&.
.RE
@ -798,7 +812,9 @@ claims to support, separated with commas\&. The "all" type is implied\&. Current
document\&.css\&.stylesheet \fB<str>\fR (default: "")
.RS 4
The path to the file containing the default user defined Cascading Style Sheet\&. It can be used to control the basic layout of HTML documents\&. The path is assumed to be relative to
ELinks\' home directory\&. Leave as "" to use built\-in document styling\&.
ELinks\' home directory\&.
.sp
Leave as "" to use built\-in document styling\&.
.RE
.SS "document\&.download (Downloading)"
Options regarding files downloading and handling\&.
@ -856,11 +872,13 @@ Codepage used in dump output\&. \'System\' stands for a codepage determined by a
.PP
document\&.dump\&.color_mode \fB<num>\fR (default: \-1)
.RS 4
Color mode for dumps\&. Some modes may have been disabled at compile time\&. The
Setup \(-> Terminal options
dialog lists the modes supported by this executable\&. If you select an unsupported mode,
Color mode for dumps\&.
.sp
Some modes may have been disabled at compile time\&. The Setup \-> Terminal options dialog lists the modes supported by this executable\&. If you select an unsupported mode,
ELinks
uses 16 colors\&. The color modes are:
uses 16 colors\&.
.sp
The color modes are:
.sp
.RS 4
\h'-04'\(bu\h'+03'\-1 is standard dump mode
@ -1022,7 +1040,9 @@ document\&.plain\&.compress_empty_lines \fB[0|1]\fR (default: 0)
Compress successive empty lines to only one in displayed text\&.
.RE
.SS "document\&.uri_passing (URI passing)"
Rules for passing URIs to external commands\&. When one rule is defined the link and tab menu will have a menu item that makes it possible to pass the the link, frame or tab URI to an external command\&. If several rules are defined the link and tab menu will have a submenu of items for each rule\&. Note, this is mostly useful for launching graphical viewers, since there is no support for releasing the terminal while the command runs\&. The action and submenus are also available by binding keys to the frame\-external\-command, the link\-external\-command, and the tab\-external\-command actions\&.
Rules for passing URIs to external commands\&. When one rule is defined the link and tab menu will have a menu item that makes it possible to pass the the link, frame or tab URI to an external command\&. If several rules are defined the link and tab menu will have a submenu of items for each rule\&.
.sp
Note, this is mostly useful for launching graphical viewers, since there is no support for releasing the terminal while the command runs\&. The action and submenus are also available by binding keys to the frame\-external\-command, the link\-external\-command, and the tab\-external\-command actions\&.
.PP
document\&.uri_passing\&._template_ \fB<str>\fR (default: "")
.RS 4
@ -1079,7 +1099,9 @@ to be saved to disk if they have changed (seconds; 0 to disable)
.PP
infofiles\&.secure_save \fB[0|1]\fR (default: 1)
.RS 4
First write data to unique temporary file, then rename this file upon successfully finishing this\&. Note that this relates only to config files, not downloaded files\&. You may want to disable it if you are using some exotic permissions for concerned files\&. Secure file saving is automagically disabled if file is symlink\&. Warning: some systems (ie\&. OS/2, Win32) require that destination file doesn\'t exist when
First write data to unique temporary file, then rename this file upon successfully finishing this\&. Note that this relates only to config files, not downloaded files\&. You may want to disable it if you are using some exotic permissions for concerned files\&. Secure file saving is automagically disabled if file is symlink\&.
.sp
Warning: some systems (ie\&. OS/2, Win32) require that destination file doesn\'t exist when
\fBrename\fR(3)
is called, breaking atomicity, and reducing reliability of this feature\&.
.RE
@ -1209,7 +1231,9 @@ BitTorrent specific options\&.
.PP
protocol\&.bittorrent\&.piece_cache_size \fB<num>\fR (default: 1048576)
.RS 4
The maximum amount of memory used to hold recently downloaded pieces\&. Set to 0 to have unlimited size\&.
The maximum amount of memory used to hold recently downloaded pieces\&.
.sp
Set to 0 to have unlimited size\&.
.RE
.PP
protocol\&.bittorrent\&.max_uploads \fB<num>\fR (default: 7)
@ -1315,7 +1339,9 @@ The number of seconds to wait before closing a socket on which nothing has been
.PP
protocol\&.bittorrent\&.peerwire\&.pool_size \fB<num>\fR (default: 55)
.RS 4
Maximum number of items in the peer pool\&. The peer pool contains information used for establishing connections to new peers\&. Set to 0 to have unlimited size\&.
Maximum number of items in the peer pool\&. The peer pool contains information used for establishing connections to new peers\&.
.sp
Set to 0 to have unlimited size\&.
.RE
.SS "protocol\&.file (Local files)"
Options specific to local browsing\&.
@ -1413,7 +1439,9 @@ and various server\-side scripts \(em the server only returns the client\'s requ
.PP
protocol\&.http\&.user_agent \fB<str>\fR (default: "ELinks/%v (textmode; %s; %t\-%b)")
.RS 4
Change the User Agent ID\&. That means identification string, which is sent to HTTP server when a document is requested\&. The \'textmode\' token in the first field is our silent attempt to establish this as a standard for new textmode user agents, so that the webmasters can have just a single uniform test for these if they are e\&.g\&. pushing some lite version to them automagically\&. Use " " if you don\'t want any User\-Agent header to be sent at all\&.
Change the User Agent ID\&. That means identification string, which is sent to HTTP server when a document is requested\&. The \'textmode\' token in the first field is our silent attempt to establish this as a standard for new textmode user agents, so that the webmasters can have just a single uniform test for these if they are e\&.g\&. pushing some lite version to them automagically\&.
.sp
Use " " if you don\'t want any User\-Agent header to be sent at all\&.
.sp
.RS 4
\h'-04'\(bu\h'+03'%v in the string means
@ -1481,7 +1509,7 @@ protocol\&.http\&.proxy\&.passwd \fB<str>\fR (default: "")
Proxy authentication password\&.
.RE
.SS "protocol\&.http\&.referer (Referer sending)"
HTTP referer sending options\&. HTTP referer is a special header sent in the HTTP requests, which is supposed to contain the previous page visited by the browser\&. This way, the server can know what link did you follow when accessing that page\&. However, this behaviour can unfortunately considerably affect privacy and can lead even to a security problem on some badly designed web pages\&.
HTTP referer sending options\&. HTTP referer is a special header sent in the HTTP requests, which is supposed to contain the previous page visited by the browser\&.This way, the server can know what link did you follow when accessing that page\&. However, this behaviour can unfortunately considerably affect privacy and can lead even to a security problem on some badly designed web pages\&.
.PP
protocol\&.http\&.referer\&.policy \fB<num>\fR (default: 3)
.RS 4
@ -1675,6 +1703,17 @@ Terminal type; matters mostly only when drawing frames and dialog box borders:
.RE
.RE
.PP
terminal\&._template_\&.latin1_title \fB[0|1]\fR (default: 1)
.RS 4
When updating the window title of
\fBxterm\fR
or a similar terminal emulator, encode the title in ISO\-8859\-1 (Latin\-1), rather than in the charset used for other text in the window\&. Cyrillic and other characters get replaced with Latin ones\&. Xterm requires this unless you explicitly enable UTF\-8 titles in it\&.
.sp
If this option does not take effect immediately, try switching to a different page so that
ELinks
notices it needs to update the title\&.
.RE
.PP
terminal\&._template_\&.m11_hack \fB[0|1]\fR (default: 0)
.RS 4
Switch fonts when drawing lines, enabling both local characters and lines working at the same time\&.
@ -1708,11 +1747,13 @@ Move cursor to bottom right corner when done drawing\&. This is particularly use
.PP
terminal\&._template_\&.colors \fB<num>\fR (default: 0)
.RS 4
The color mode controls what colors are used and how they are output to the terminal\&. Some modes may have been disabled at compile time\&. The
Setup \(-> Terminal options
dialog lists the modes supported by this executable\&. If you select an unsupported mode,
The color mode controls what colors are used and how they are output to the terminal\&.
.sp
Some modes may have been disabled at compile time\&. The Setup \-> Terminal options dialog lists the modes supported by this executable\&. If you select an unsupported mode,
ELinks
uses 16 colors\&. The color modes are:
uses 16 colors\&.
.sp
The color modes are:
.sp
.RS 4
\h'-04'\(bu\h'+03'0 is mono mode, only 2 colors are used
@ -2793,17 +2834,23 @@ Sessions settings\&.
.PP
ui\&.sessions\&.auto_restore \fB[0|1]\fR (default: 0)
.RS 4
Automatically restore the session at start\&. This feature requires bookmark support\&.
Automatically restore the session at start\&.
.sp
This feature requires bookmark support\&.
.RE
.PP
ui\&.sessions\&.auto_save \fB[0|1]\fR (default: 0)
.RS 4
Automatically save the session when quitting\&. This feature requires bookmark support\&.
Automatically save the session when quitting\&.
.sp
This feature requires bookmark support\&.
.RE
.PP
ui\&.sessions\&.auto_save_foldername \fB<str>\fR (default: "Auto saved session")
.RS 4
Name of the bookmarks folder used for auto saving and restoring session\&. The name has to be unique\&. Any folders with the same name will be deleted\&. This only makes sense with bookmark support\&.
Name of the bookmarks folder used for auto saving and restoring session\&. The name has to be unique\&. Any folders with the same name will be deleted\&.
.sp
This only makes sense with bookmark support\&.
.RE
.PP
ui\&.sessions\&.homepage \fB<str>\fR (default: "")
@ -2890,9 +2937,3 @@ Keybinding action to be triggered when timer reaches zero\&.
.SH "SEE ALSO"
\fBelinks\fR(1), \fBelinkskeys\fR(5)
.sp
.SH "NOTES"
.IP " 1." 4
ELinks bug 153
.RS 4
\%http://bugzilla.elinks.cz/show_bug.cgi?id=153
.RE

View File

@ -1,11 +1,11 @@
.\" Title: elinkskeys
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
.\" Date: 09/27/2008
.\" Date: 03/29/2009
.\" Manual: ELinks keybindings
.\" Source: ELinks 0.13.GIT
.\"
.TH "ELINKSKEYS" "5" "09/27/2008" "ELinks 0\&.13\&.GIT" "ELinks keybindings"
.TH "ELINKSKEYS" "5" "03/29/2009" "ELinks 0\&.13\&.GIT" "ELinks keybindings"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)

View File

@ -107,7 +107,7 @@ reasonable editor.
In order to compile, get warnings and actually use your updated language file
you will however need the gettext tools. If you don't have any of these tools
please don't hesitate to still do the update and send it to the mailinglist or
bugzilla so it can be added to CVS. By next release or nightly generated tarball
bugzilla so it can be added to Git. By next release or nightly generated tarball
you can then make use of your updates.
2.2 The basics of updating:
@ -185,7 +185,7 @@ translation for each plural form.
2.3 Synchronizing .po files with the code
-----------------------------------------
IMPORTANT: if you changed strings in the code, or if you're using a cvs version
IMPORTANT: if you changed strings in the code, or if you're using a Git version
of ELinks, take care of synchronization between code and po files. Before any
change to a po file, you must synchronize it with code.

3112
po/af.po

File diff suppressed because it is too large Load Diff

3190
po/be.po

File diff suppressed because it is too large Load Diff

3188
po/bg.po

File diff suppressed because it is too large Load Diff

3186
po/ca.po

File diff suppressed because it is too large Load Diff

2976
po/cs.po

File diff suppressed because it is too large Load Diff

3060
po/da.po

File diff suppressed because it is too large Load Diff

2970
po/de.po

File diff suppressed because it is too large Load Diff

3186
po/el.po

File diff suppressed because it is too large Load Diff

3188
po/es.po

File diff suppressed because it is too large Load Diff

3186
po/et.po

File diff suppressed because it is too large Load Diff

3786
po/fi.po

File diff suppressed because it is too large Load Diff

3186
po/gl.po

File diff suppressed because it is too large Load Diff

3186
po/hr.po

File diff suppressed because it is too large Load Diff

3005
po/hu.po

File diff suppressed because it is too large Load Diff

3186
po/id.po

File diff suppressed because it is too large Load Diff

3186
po/is.po

File diff suppressed because it is too large Load Diff

2964
po/it.po

File diff suppressed because it is too large Load Diff

3186
po/lt.po

File diff suppressed because it is too large Load Diff

3186
po/nb.po

File diff suppressed because it is too large Load Diff

3186
po/nl.po

File diff suppressed because it is too large Load Diff

3190
po/pt.po

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

3186
po/ro.po

File diff suppressed because it is too large Load Diff

3188
po/ru.po

File diff suppressed because it is too large Load Diff

2951
po/sk.po

File diff suppressed because it is too large Load Diff

3010
po/sr.po

File diff suppressed because it is too large Load Diff

3186
po/sv.po

File diff suppressed because it is too large Load Diff

3186
po/tr.po

File diff suppressed because it is too large Load Diff

3188
po/uk.po

File diff suppressed because it is too large Load Diff

View File

@ -242,7 +242,7 @@ render_dom_text(struct dom_renderer *renderer, struct screen_char *template,
#define realloc_document_links(doc, size) \
ALIGN_LINK(&(doc)->links, (doc)->nlinks, size)
inline struct link *
NONSTATIC_INLINE struct link *
add_dom_link(struct dom_renderer *renderer, unsigned char *string, int length,
unsigned char *uristring, int urilength)
{

View File

@ -105,7 +105,7 @@ compare_opt(struct document_options *o1, struct document_options *o2)
&& o1->box.width != o2->box.width);
}
inline void
NONSTATIC_INLINE void
copy_opt(struct document_options *o1, struct document_options *o2)
{
copy_struct(o1, o2);

View File

@ -70,6 +70,19 @@ struct codepage_desc {
#include "intl/uni_7b.inc"
#include "intl/entity.inc"
/* Declare the external-linkage inline functions defined in this file.
* Avoid the GCC 4.3.1 warning: `foo' declared inline after being
* called. The functions are not declared inline in charsets.h
* because C99 6.7.4p6 says that every external-linkage function
* declared inline shall be defined in the same translation unit.
* The non-inline declarations in charsets.h also make sure that the
* compiler emits global definitions for the symbols so that the
* functions can be called from other translation units. */
NONSTATIC_INLINE unsigned char *encode_utf8(unicode_val_T u);
NONSTATIC_INLINE int utf8charlen(const unsigned char *p);
NONSTATIC_INLINE int unicode_to_cell(unicode_val_T c);
NONSTATIC_INLINE unicode_val_T utf8_to_unicode(unsigned char **string,
const unsigned char *end);
static const char strings[256][2] = {
"\000", "\001", "\002", "\003", "\004", "\005", "\006", "\007",
@ -213,7 +226,7 @@ u2cp_(unicode_val_T u, int to, enum nbsp_mode nbsp_mode)
static unsigned char utf_buffer[7];
inline unsigned char *
NONSTATIC_INLINE unsigned char *
encode_utf8(unicode_val_T u)
{
memset(utf_buffer, 0, 7);
@ -262,12 +275,13 @@ static const char utf8char_len_tab[256] = {
};
#ifdef CONFIG_UTF8
inline int utf8charlen(const unsigned char *p)
NONSTATIC_INLINE int
utf8charlen(const unsigned char *p)
{
return p ? utf8char_len_tab[*p] : 0;
}
inline int
int
strlen_utf8(unsigned char **str)
{
unsigned char *s = *str;
@ -288,7 +302,7 @@ strlen_utf8(unsigned char **str)
/* Start from @current and move back to @pos char. This pointer return. The
* most left pointer is @start. */
inline unsigned char *
unsigned char *
utf8_prevchar(unsigned char *current, int pos, unsigned char *start)
{
if (current == NULL || start == NULL || pos < 0)
@ -583,7 +597,7 @@ invalid_arg:
* TODO: May be extended to return 0 for zero-width glyphs
* (like composing, maybe unprintable too).
*/
inline int
NONSTATIC_INLINE int
unicode_to_cell(unicode_val_T c)
{
if (c >= 0x1100
@ -626,7 +640,7 @@ unicode_fold_label_case(unicode_val_T c)
}
#endif /* CONFIG_UTF8 */
inline unicode_val_T
NONSTATIC_INLINE unicode_val_T
utf8_to_unicode(unsigned char **string, const unsigned char *end)
{
unsigned char *str = *string;

View File

@ -125,10 +125,10 @@ const uint16_t *get_cp_highhalf(const unsigned char *);
int is_cp_utf8(int);
void free_conv_table(void);
inline unsigned char *encode_utf8(unicode_val_T);
unsigned char *encode_utf8(unicode_val_T);
#ifdef CONFIG_UTF8
inline unsigned char *utf8_prevchar(unsigned char *, int, unsigned char *);
inline int utf8charlen(const unsigned char *);
unsigned char *utf8_prevchar(unsigned char *, int, unsigned char *);
int utf8charlen(const unsigned char *);
int utf8_char2cells(unsigned char *, unsigned char *);
int utf8_ptr2cells(unsigned char *, unsigned char *);
int utf8_ptr2chars(unsigned char *, unsigned char *);
@ -153,11 +153,11 @@ unsigned char *utf8_step_forward(unsigned char *, unsigned char *,
int, enum utf8_step, int *);
unsigned char *utf8_step_backward(unsigned char *, unsigned char *,
int, enum utf8_step, int *);
inline int unicode_to_cell(unicode_val_T);
int unicode_to_cell(unicode_val_T);
unicode_val_T unicode_fold_label_case(unicode_val_T);
inline int strlen_utf8(unsigned char **);
int strlen_utf8(unsigned char **);
#endif /* CONFIG_UTF8 */
inline unicode_val_T utf8_to_unicode(unsigned char **, const unsigned char *);
unicode_val_T utf8_to_unicode(unsigned char **, const unsigned char *);
unicode_val_T cp_to_unicode(int, unsigned char **, const unsigned char *);
#ifdef CONFIG_COMBINE

View File

@ -40,7 +40,7 @@
#define toupper_delta(s1, s2) (toupper(*((char *) s1)) - toupper(*((char *) s2)))
#ifndef HAVE_STRCASECMP
inline int
NONSTATIC_INLINE int
elinks_strcasecmp(const char *s1, const char *s2)
{
while (*s1 != '\0' && toupper_equal(s1, s2)) {
@ -53,7 +53,7 @@ elinks_strcasecmp(const char *s1, const char *s2)
#endif /* !HAVE_STRCASECMP */
#ifndef HAVE_STRNCASECMP
inline int
NONSTATIC_INLINE int
elinks_strncasecmp(const char *s1, const char *s2, size_t len)
{
if (len == 0)
@ -72,7 +72,7 @@ elinks_strncasecmp(const char *s1, const char *s2, size_t len)
#ifndef HAVE_STRCASESTR
/* Stub for strcasestr(), GNU extension */
inline char *
NONSTATIC_INLINE char *
elinks_strcasestr(const char *haystack, const char *needle)
{
size_t haystack_length = strlen(haystack);
@ -93,7 +93,7 @@ elinks_strcasestr(const char *haystack, const char *needle)
#endif
#ifndef HAVE_STRDUP
inline char *
NONSTATIC_INLINE char *
elinks_strdup(const char *str)
{
int str_len = strlen(str);
@ -114,7 +114,7 @@ elinks_strdup(const char *str)
extern int sys_nerr;
extern const char *const sys_errlist[];
#endif
inline const char *
NONSTATIC_INLINE const char *
elinks_strerror(int err_no)
{
if (err_no < 0 || err_no > sys_nerr)
@ -126,7 +126,7 @@ elinks_strerror(int err_no)
#ifndef HAVE_STRSTR
/* From http://www.unixpapa.com/incnote/string.html */
inline char *
NONSTATIC_INLINE char *
elinks_strstr(const char *s, const char *p)
{
char *sp, *pp;
@ -155,7 +155,7 @@ elinks_strstr(const char *s, const char *p)
* arguments reversed.
* From http://www.unixpapa.com/incnote/string.html */
/* Modified for ELinks by Zas. */
inline void *
NONSTATIC_INLINE void *
elinks_memmove(void *d, const void *s, size_t n)
{
register char *dst = (char *) d;
@ -178,7 +178,7 @@ elinks_memmove(void *d, const void *s, size_t n)
#ifndef HAVE_STPCPY
inline char *
NONSTATIC_INLINE char *
elinks_stpcpy(char *dest, const char *src)
{
while ((*dest++ = *src++));
@ -187,7 +187,7 @@ elinks_stpcpy(char *dest, const char *src)
#endif
#ifndef HAVE_MEMPCPY
inline void *
NONSTATIC_INLINE void *
elinks_mempcpy(void *dest, const void *src, size_t n)
{
return (void *) ((char *) memcpy(dest, src, n) + n);
@ -195,7 +195,7 @@ elinks_mempcpy(void *dest, const void *src, size_t n)
#endif
#ifndef HAVE_ISDIGIT
inline int
NONSTATIC_INLINE int
elinks_isdigit(int i)
{
return i >= '0' && i <= '9';
@ -203,7 +203,7 @@ elinks_isdigit(int i)
#endif
#ifndef HAVE_MEMRCHR
inline void *
NONSTATIC_INLINE void *
elinks_memrchr(const void *s, int c, size_t n)
{
char *pos = (char *) s;

View File

@ -54,7 +54,7 @@
#ifndef HAVE_ISDIGIT
#undef isdigit
#define isdigit(a) elinks_isdigit(a)
inline int elinks_isdigit(int);
int elinks_isdigit(int);
#endif
/** strerror() */
@ -78,7 +78,7 @@ char *elinks_strstr(const char *, const char *);
#else
#undef memmove
#define memmove(dst, src, n) elinks_memmove(dst, src, n)
inline void *elinks_memmove(void *, const void *, size_t);
void *elinks_memmove(void *, const void *, size_t);
#endif
#endif

View File

@ -428,7 +428,7 @@ load_ecmascript_imports(struct session *ses, struct document_view *doc_view)
#define load_ecmascript_imports(ses, doc_view)
#endif
inline void
NONSTATIC_INLINE void
load_frames(struct session *ses, struct document_view *doc_view)
{
struct document *document = doc_view->document;

View File

@ -241,7 +241,7 @@ static const unsigned char fg_color[16][8] = {
#define CMPCODE(c) (((c) << 1 | (c) >> 2) & TERM_COLOR_MASK)
#define use_inverse(bg, fg) CMPCODE(fg & TERM_COLOR_MASK) < CMPCODE(bg)
inline void
NONSTATIC_INLINE void
set_term_color16(struct screen_char *schar, enum color_flags flags,
unsigned char fg, unsigned char bg)
{

View File

@ -63,8 +63,8 @@ enum color_mode {
COLOR_MODES = 5, /* XXX: Keep last */
};
inline void set_term_color16(struct screen_char *schar, enum color_flags flags,
unsigned char fg, unsigned char bg);
void set_term_color16(struct screen_char *schar, enum color_flags flags,
unsigned char fg, unsigned char bg);
/** Mixes the color pair and attributes to a terminal text color.
* If @a flags has masked in the ::COLOR_INCREASE_CONTRAST the

View File

@ -34,7 +34,7 @@
inline struct screen_char *
NONSTATIC_INLINE struct screen_char *
get_char(struct terminal *term, int x, int y)
{
assert(term && term->screen && term->screen->image);

View File

@ -62,7 +62,7 @@ found_pos:
}
/** Number of tabs at the terminal (in term->windows) */
inline int
NONSTATIC_INLINE int
number_of_tabs(struct terminal *term)
{
int result = 0;

View File

@ -50,7 +50,7 @@
*
* @returns 0 if OK or width needed for the whole number to fit there,
* if it had to be truncated. A negative value signs an error. */
int inline
NONSTATIC_INLINE int
elinks_ulongcat(unsigned char *s, unsigned int *slen,
unsigned long number, unsigned int width,
unsigned char fillchar, unsigned int base,
@ -108,7 +108,7 @@ elinks_ulongcat(unsigned char *s, unsigned int *slen,
}
/** Similar to elinks_ulongcat() but for @c long number. */
int inline
NONSTATIC_INLINE int
elinks_longcat(unsigned char *s, unsigned int *slen,
long number, unsigned int width,
unsigned char fillchar, unsigned int base,

View File

@ -297,7 +297,7 @@ char * c_strcasestr(const char *haystack, const char *needle)
/* TODO Currently most of the functions use add_bytes_to_string() as a backend
* instead we should optimize each function. */
inline struct string *
NONSTATIC_INLINE struct string *
#ifdef DEBUG_MEMLEAK
init_string__(const unsigned char *file, int line, struct string *string)
#else
@ -322,7 +322,7 @@ init_string(struct string *string)
return string;
}
inline void
NONSTATIC_INLINE void
done_string(struct string *string)
{
assertm(string != NULL, "[done_string]");
@ -341,7 +341,7 @@ done_string(struct string *string)
}
/** @relates string */
inline struct string *
NONSTATIC_INLINE struct string *
add_to_string(struct string *string, const unsigned char *source)
{
assertm(string && source, "[add_to_string]");
@ -355,7 +355,7 @@ add_to_string(struct string *string, const unsigned char *source)
}
/** @relates string */
inline struct string *
NONSTATIC_INLINE struct string *
add_crlf_to_string(struct string *string)
{
assertm(string != NULL, "[add_crlf_to_string]");
@ -374,7 +374,7 @@ add_crlf_to_string(struct string *string)
}
/** @relates string */
inline struct string *
NONSTATIC_INLINE struct string *
add_string_to_string(struct string *string, const struct string *from)
{
assertm(string && from, "[add_string_to_string]");
@ -451,7 +451,7 @@ string_concat(struct string *string, ...)
}
/** @relates string */
inline struct string *
NONSTATIC_INLINE struct string *
add_char_to_string(struct string *string, unsigned char character)
{
assertm(string && character, "[add_char_to_string]");
@ -468,7 +468,7 @@ add_char_to_string(struct string *string, unsigned char character)
return string;
}
inline struct string *
NONSTATIC_INLINE struct string *
add_xchar_to_string(struct string *string, unsigned char character, int times)
{
int newlength;