*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 043fc4e33fc7e496234c864ba6d6f5ec170b04d1..3501994e8a635ea552f93f70540b1c48e024882a 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2178,7 +2178,7 @@ expression with auto-compression-mode enabled.
 with the more general `:mask' property.
 
 +++
-** Image specifications accept more `:algorithm's.
+** Image specifications accept more `:conversion's.
 
 ** A `?' can be used in a symbol name without escaping it with a
 backslash.
@@ -3657,7 +3657,7 @@ horizontal margin and Y specifying the vertical margin.  Default is 0.
 RELIEF is analogous to the `:relief' attribute of faces.  Puts a relief
 around an image.
 
-`:algorithm ALGO'
+`:conversion ALGO'
 
 Apply an image algorithm to the image before displaying it.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1473fa819011064d6006bbc8f5b4a5be2196b94..a2854dbdd11ccac112180dcaa97e970fb4ff7e4f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,41 @@
+2001-01-17  Gerd Moellmann  <gerd@gnu.org>
+
+       * isearch.el (isearch-lazy-highlight-initial-delay)
+       (isearch-lazy-highlight-interval): Default to 0.
+
+2001-01-17  Bob Glickstein  <bobg@zanshin.com>
+
+       * isearch.el (isearch-highlight): Set isearch-overlay priority to
+       1 here rather than each time through
+       isearch-lazy-highlight-new-loop.
+       (isearch-lazy-highlight-max): Variable deleted.
+       (isearch-lazy-highlight-max-at-a-time): New user variable, like
+       isearch-lazy-highlight-max but controls a single invocation of
+       isearch-lazy-highlight-update.
+       (isearch-lazy-highlight-wrapped): Variable recreated.
+       (isearch-lazy-highlight-window-start): New variable.
+       (isearch-lazy-highlight-cleanup): Restored to behavior of
+       before 2-Jan.
+       (isearch-lazy-highlight-remove-overlays): Function deleted;
+       behavior folded into isearch-lazy-highlight-cleanup.  "Keep"
+       behavior removed.
+       (isearch-lazy-highlight-new-loop): Restore old behavior of calling
+       isearch-lazy-highlight-update in a loop rather than just once.
+       Test isearch-invalid-regexp here and decide not to start a new
+       loop, rather than testing it each time through
+       isearch-lazy-highlight-update.
+       (isearch-lazy-highlight-search): Function restored.
+       (isearch-lazy-highlight-update): Get called in a timer loop again,
+       but this time highlight more than one match each time through.
+       Only highlight matches in the visible part of the window.  Start
+       at point, move in the direction of the search, and wrap around at
+       the edge of the window.  Use sit-for to force redisplay and ensure
+       window-start is credible.  "Face suppressing" behavior removed;
+       overlay priorities should make it unnecessary, right?
+       (isearch-highlight): Face suppressing behavior removed.
+       (isearch-dehighlight): Face suppressing behavior removed.
+       (isearch-set-lazy-highlight-faces-at): Removed.
+
 2001-01-17  Kenichi Handa  <handa@etl.go.jp>
 
        * language/european.el ("Latin-1"): Make the format of description

diff --git a/lispref/display.texi b/lispref/display.texi
index 4f218de4b1b89ba2e163e5978c2bb77dc2018660..4cfef835049f50b284c2bc0bbfac9f21574ddc2f 100644 (file)
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001
 @c   Free Software Foundation, Inc. 
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/display
@@ -2481,8 +2481,8 @@ shadow lines, in pixels.  If @var{relief} is negative, shadows are drawn
 so that the image appears as a pressed button; otherwise, it appears as
 an unpressed button.
 
-@item :algorithm @var{algorithm}
-The @code{:algorithm} property, if non-@code{nil}, specifies a
+@item :conversion @var{algorithm}
+The @code{:conversion} property, if non-@code{nil}, specifies a
 conversion algorithm that should be applied to the image before it is
 displayed; the value, @var{algorithm}, specifies which algorithm.
 

diff --git a/src/ChangeLog b/src/ChangeLog
index e5f944066a7c355835b5ffc910742aa25251b4d3..165f6749c5f5dd3490c71cdbdf1406b9efe95271 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2001-01-17  Gerd Moellmann  <gerd@gnu.org>
 
+       * xfns.c (QCconversion): Replaces QCalgorithm.
+
+       * w32fns.c (QCconversion): Replaces QCalgorithm.  Update copyright.
+
+       * xdisp.c (build_desired_tool_bar_string): Use :conversion instead
+       of :algorithm.
+       
        * xdisp.c (redisplay_tool_bar): Change tool bar's height when
        not everything could be displayed.