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 Stallman <rms@gnu.org> * lisp/hi-lock.el (hi-lock-file-patterns-policy): Default to `ask'. 2007-04-24 Richard 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