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

Merge branch 'elinks-0.12' into elinks-0.13

Browse Source 
Conflicts:

	src/osdep/osdep.c
This commit is contained in:
Kalle Olavi Niemitalo 2008-02-04 23:51:42 +02:00 committed by Kalle Olavi Niemitalo
commit 814e672736
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -17,8 +17,6 @@ Incompatibilities:
Miscellaneous: Miscellaneous:
* bug 939: Fix FSP directory listing on FreeBSD. * bug 939: Fix FSP directory listing on FreeBSD.
* minor bug 54, Debian bug 338402: Don't force the terminal to 8 bits
with no parity.
* enhancement 867: Use bracketed paste mode on xterm. This requires * enhancement 867: Use bracketed paste mode on xterm. This requires
xterm patch #228 or later configured with --enable-readline-mouse. xterm patch #228 or later configured with --enable-readline-mouse.
* enhancement 824: Experimental support for combining characters. * enhancement 824: Experimental support for combining characters.
@ -99,6 +97,8 @@ Miscellaneous:
reloaded. See elinks-users mail from 28 Oct 2005. reloaded. See elinks-users mail from 28 Oct 2005.
* several accesskey fixes * several accesskey fixes
* in Lua: don't write to the string returned by lua_tostring * in Lua: don't write to the string returned by lua_tostring
* minor bug 54, Debian bug 338402: don't force the terminal to 8 bits
with no parity, and don't disable XON/OFF flow control either
* minor bug 972: preserve the background color and underlining in * minor bug 972: preserve the background color and underlining in
spaces when justifying spaces when justifying
* minor bug 284: render closing bracket for HTML element SUB in the * minor bug 284: render closing bracket for HTML element SUB in the

2
doc/Doxyfile.in
View File

@ -221,7 +221,7 @@ ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES SEARCH_INCLUDES = YES
INCLUDE_PATH = INCLUDE_PATH = @api_srcdir@
INCLUDE_FILE_PATTERNS = INCLUDE_FILE_PATTERNS =
PREDEFINED = "LIST_OF(element_T)=element_T list" \ PREDEFINED = "LIST_OF(element_T)=element_T list" \
CONFIG_ECMASCRIPT \ CONFIG_ECMASCRIPT \

21
src/osdep/osdep.c
View File

@ -805,12 +805,21 @@ unblock_stdin(void)
void void
elinks_cfmakeraw(struct termios *t) elinks_cfmakeraw(struct termios *t)
{ {
/* Bug 54: Do not alter the character-size and parity bits in /* This elinks_cfmakeraw() intentionally leaves the following
* t->c_cflag. If they have unusual values, the terminal * settings unchanged, even though the standard cfmakeraw()
* probably requires those and won't work if ELinks changes * would change some of them:
* the flags. The cfmakeraw function would set 8-bit characters *
* and no parity, so don't use that. */ * - c_cflag & CSIZE: number of bits per character.
t->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON); * Bug 54 asked ELinks not to change this.
* - c_cflag & (PARENB | PARODD): parity bit in characters.
* Bug 54 asked ELinks not to change this.
* - c_iflag & (IXON | IXOFF | IXANY): XON/XOFF flow control.
*
* The reasoning is, if the user has set up unusual values for
* those settings before starting ELinks, then the terminal
* probably expects those values and ELinks should not mess
* with them. */
t->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL);
t->c_oflag &= ~OPOST; t->c_oflag &= ~OPOST;
t->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN); t->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
t->c_cc[VMIN] = 1; t->c_cc[VMIN] = 1;