Mercurial > emacs
changeset 68318:682fe4bc1fa5
(get_window_cursor_type): Fix last change.
Update copyright year.
| author | Romain Francoise <romain@orebokech.com> |
|---|---|
| date | Sat, 21 Jan 2006 18:04:09 +0000 |
| parents | c8609ef9d0c3 |
| children | 40fd5f72c481 |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Jan 21 13:27:46 2006 +0000 +++ b/src/ChangeLog Sat Jan 21 18:04:09 2006 +0000 @@ -1,3 +1,8 @@ +2006-01-21 Romain Francoise <romain@orebokech.com> + + * xdisp.c (get_window_cursor_type): Fix last change. + Update copyright year. + 2006-01-20 Eli Zaretskii <eliz@gnu.org> * lread.c (Fload): Don't leak the file descriptor returned by @@ -8,7 +13,7 @@ (sys_dup): Protect against new_fd larger than fd_info[] can handle. (sys_read): If FD is outside [0..MAXDESC) limits, pass it directly to _read. - (sys_write): If FD is outside [0..MAXDESC) limits, pass it + (sys_write): If FD is outside [0..MAXDESC) limits, pass it directly to _write. * .gdbinit: Don't dereference Vsystem_type's Lisp_Symbol pointer
--- a/src/xdisp.c Sat Jan 21 13:27:46 2006 +0000 +++ b/src/xdisp.c Sat Jan 21 18:04:09 2006 +0000 @@ -1,7 +1,7 @@ /* Display generation from window structure and buffer text. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -20779,10 +20779,10 @@ } else return get_specified_cursor_type (b->cursor_type, width); - - *active_cursor = 0; - non_selected = 1; - } + } + + *active_cursor = 0; + non_selected = 1; } /* Nonselected window or nonselected frame. */