From 49af2995e0c3c30039ca36fc65c28b62c9d0e5a4 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Mon, 20 Feb 2006 22:31:16 +0000 Subject: [PATCH] *** empty log message *** --- admin/ChangeLog | 10 ++++++++++ admin/FOR-RELEASE | 9 +++++++++ etc/NEWS | 7 +++++++ lisp/ChangeLog | 9 ++++++++- lispref/ChangeLog | 13 +++++++++++++ src/ChangeLog | 42 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 89 insertions(+), 1 deletion(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 1b855f7c4e..1543c17d3a 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,13 @@ +2006-02-20 Kim F. Storm + + * FOR-RELEASE (NEW FEATURES): Completed work on this item: + Rework how fringe bitmaps are defined and used. + Currently, bitmap usage and bitmap appearence are "mixed-up" in a + one-level representation. It would be cleaner to split the + representation into a two-level model where first level maps + bitmap usage to a bitmap name, and second level maps bitmap name to + a bitmap appearence. + 2006-01-27 Chong Yidong * FOR-RELEASE: string allocation bugs fixed. diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index bc490ff2ca..ef73ec4436 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -48,6 +48,15 @@ excesive CPU on some Windows environments. Usages of 50% and 100% CPU time have been observed on different Window XP configurations. Seems to be a problem in sys_select in w32proc.c. +In its current form, it sys_select says the socket is ready, so we +call server_accept_connection which again calls accept() which returns +-1 with errno == WSAEWOULDBLOCK (10035) indicating that there is no +pending connection to accept. + +It seems that to fix this, w32 server sockets must use WSAAsyncSelect ++ FD_ACCEPT to request notifications of incoming connections... + + * DOCUMENTATION ** Add a node to the Lisp manual describing key sequences from the diff --git a/etc/NEWS b/etc/NEWS index c2b818940a..df6a44e225 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -4604,6 +4604,13 @@ or bottom edge of a window. It does not move other window edges. +++ ** Customizable fringe bitmaps +*** New buffer-local variables `fringe-indicator-alist' and +`fringe-cursor-alist' maps between logical (internal) fringe indicator +and cursor symbols and the actual fringe bitmaps to be displayed. +This decouples the logical meaning of the fringe indicators from the +physical appearence, as well as allowing different fringe bitmaps to +be used in different windows showing different buffers. + *** New function `define-fringe-bitmap' can now be used to create new fringe bitmaps, as well as change the built-in fringe bitmaps. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1411e26a25..3710328afc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,4 +1,11 @@ -2006-02-21 Nick Roberts +2006-02-20 Kim F. Storm + + * fringe.el (fringe-bitmaps): Update to new bitmap names. + (fringe-indicator-alist, fringe-cursor-alist): Initialize. + + * loadup.el: Load "fringe" on window systems. + +2006-02-20 Nick Roberts * progmodes/gud.el (gud-speedbar-buttons): Use shadow face for all out of scope components. diff --git a/lispref/ChangeLog b/lispref/ChangeLog index e706eb5b9f..0bfb942583 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,16 @@ +2006-02-20 Kim F. Storm + + * display.texi (Fringe Indicators): New section. + Move indicate-empty-lines, indicate-buffer-boundaries, and + default-indicate-buffer-boundaries here. + Add fringe-indicator-alist and default-fringes-indicator-alist. + Add list of logical fringe indicator symbols. + Update list of standard bitmap names. + (Fringe Cursors): New section. + Move overflow-newline-into-fringe here. + Add fringe-cursor-alist and default-fringes-cursor-alist. + Add list of fringe cursor symbols. + 2006-02-20 Juanma Barranquero * commands.texi (Using Interactive): Fix reference to node diff --git a/src/ChangeLog b/src/ChangeLog index e922586bde..3667d6c7a6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,45 @@ +2006-02-20 Kim F. Storm + + * Makefile.in: Add fringe.elc to WINDOW_SUPPORT. + + * buffer.h (struct buffer): New members fringe_indicator_alist and + fringe_cursor_alist. + + * buffer.c (init_buffer_once): Set dummy default values for + fringe-indicator-alist and fringe-cursor-alist. The proper + default values are set by pre-loading fringe.el. + (syms_of_buffer): defvar_per_buffer new fringe-indicator-alist and + fringe-cursor-alist buffer-local variables and defvar_lisp_nopro + correspondig default- variables. + + * fringe.c (enum fringe_bitmap_type): Remove. Change all uses + to use `int'. + (NO_FRINGE_BITMAP, UNDEF_FRINGE_BITMAP, MAX_STANDARD_FRINGE_BITMAPS): + Define explicitly. + (Qtruncation, Qcontinuation, Qempty_line, Qtop_bottom) + (Qhollow_small): New variables. + (syms_of_fringe): Intern and staticpro them. + (question_mark_bits): Rename from unknown_bits. + (left_curly_arrow_bits): Rename from continuation_bits. + (right_curly_arrow_bits): Rename from continued_bits. + (left_triangle_bits): Rename from ov_bits. + (right_triangle_bits): Added. + (filled_rectangle_bits): Rename from filled_box_cursor_bits. + (hollow_rectangle_bits): Rename from hollow_box_cursor_bits. + (filled_square_bits): Added. + (vertical_bar_bits): Rename from bar_cursor_bits. + (horisontal_bar_bits): Rename from hbar_cursor_bits. + (empty_line_bits): Rename from zv_bits. + (standard_bitmaps): Update to use new names. + (draw_fringe_bitmap_1): Make static. + (get_logical_cursor_bitmap, get_logical_fringe_bitmap): New functions + to map from logical cursors and indicators to physical bitmaps. + (draw_fringe_bitmap): Resolve fringe cursor and overlay-arrow + bitmaps using symbol names instead of bitmap numbers. + (update_window_fringes): Use logical indicator symbol names + instead of bitmap numbers for logical. Add bitmap cache. + (LEFT_FRINGE, RIGHT_FRINGE): New helper macros. + 2006-02-20 Chong Yidong * regex.c: Revert 2006-02-19 change. -- 2.20.1