Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (base, patch 1-2)

   - tag of emacs@sv.gnu.org/emacs--devo--0--patch-709
   - Sync to CVS tag EMACS_22_BRANCHPOINT
   - Sync to CVS branch EMACS_22_BASE

2007-04-25  Richard M. Stallman  <rms@gnu.org>

   * lisp/hi-lock.el (hi-lock-file-patterns-policy): Default to `ask'.

2007-04-24  Richard M. Stallman  <rms@gnu.org>

   * lispref/text.texi (Special Properties): Add xref to Overlay Properties.

   * lispref/display.texi (Overlay Properties): Add xref to Special Properties.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-716

diff --cc admin/FOR-RELEASE
index 90ca44fbc5b83250c0ba8b57dd7d44086796bef2,724900c2056abb972a2d5daf4de5a150ab70ac8d..274fa692c73449d59baf706d5dca1bcc63a2e3c7
--- 1/admin/FOR-RELEASE
--- 2/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@@ -42,14 -42,15 +42,23 @@@ http://lists.gnu.org/archive/html/emacs
  ** rcyeske@gmail.com, April 22: Failure to build on OpenBSD macppc.
  OpenBSD compilation works on i386.
  
 +** bojohan+news@dd.chalmers.se, April 23: delete-overlay causes recentering
 +(This is now the same as the spurious scrolling bug.)
 +
 +** finish fixing locate.el
 +
 +** angeli@caeruleus.net, April 23: Excessive refontification when setting
 +      jit-lock-context-unfontify-pos
 +
+ ** michael.ewe@arcor.de, Apr 24: 22.0.98  not starting on Solaris 10/I386
+ 
+ ** rgm@gnu.org, Apr 24: [Stephen.Berman@gmx.net: Re: redisplay]
+   Gives test case for problem that a dialog box blocks redisplay.
+ 
+ ** Spurious redisplay bug not fixed.
+ 
+ ** mituharu@math.s.chiba-u.ac.jp, Apr 25: Cursors in fringe not redrawn by expose events.
+ 
  * DOCUMENTATION
  
  ** Check the Emacs Tutorial.

diff --cc lisp/ChangeLog
index c856ecae6495c459324f96f6df31c2d323b24f54,3a3bc53ac80c6949783ba8573c32a6326fefa774..85a19f355d088b29f66f4dbf1f9c28dfaf35a994
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -20,8 -17,10 +20,12 @@@
        * button.el (button): Use underline if supported, else fall back
        to color.
  
 +      * version.el (emacs-version): Increase to 22.1.50.
 +
+ 2007-04-25  Richard Stallman  <rms@gnu.org>
+ 
+       * hi-lock.el (hi-lock-file-patterns-policy): Default to `ask'.
+ 
  2007-04-25  J.D. Smith  <jdsmith@as.arizona.edu>
  
        * progmodes/idlwave.el (idlwave-beginning-of-subprogram)

diff --cc lispref/ChangeLog
index eb4fa2e7c4df2c7f9bfa09064aaeff374334ef41,d0a97073488c830dc9c5237b0057d4d4f1e337f6..84a378dc56757d8cda6c1a01dbac7b31076ae5c3
--- 1/lispref/ChangeLog
--- 2/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@@ -1,12 -1,9 +1,18 @@@
 +2007-04-26  Glenn Morris  <rgm@gnu.org>
 +
 +      * elisp.texi (EMACSVER): Increase to 22.1.50.
 +
 +2007-04-25  Karl Berry  <karl@gnu.org>
 +
 +      * elisp.texi: Improve line breaks on copyright page,
 +      similar layout to emacs manual, 8.5x11 by default.
 +
+ 2007-04-24  Richard Stallman  <rms@gnu.org>
+ 
+       * text.texi (Special Properties): Add xref to Overlay Properties.
+ 
+       * display.texi (Overlay Properties): Add xref to Special Properties.
+ 
  2007-04-22  Richard Stallman  <rms@gnu.org>
  
        * keymaps.texi (Extended Menu Items): Move the info about