Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 26-27)

   - Update from CVS
   - lisp/vc-hooks.el (vc-find-root): Fix file attribute test

2007-05-25  Miles Bader  <miles@fencepost.gnu.org>

   * lisp/vc-hooks.el (vc-find-root): Fix file attribute test.

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

   * lisp/textmodes/flyspell.el (flyspell-correct-word-before-point):
   Don't let opoint be nil.
   (flyspell-emacs-popup): Explicit error if no dialogs.

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

diff --cc lisp/ChangeLog
index 3ecb03ad1a46040be31ee52d4739b9fce5a88bb2,93f2477b07fb8a805364f36e866af9feb8c6f5b6..be975f67e990534d10e34870ffb0b9a1c59a0a5f
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,29 -1,13 +1,39 @@@
+ 2007-05-25  Miles Bader  <miles@fencepost.gnu.org>
+ 
+       * vc-hooks.el (vc-find-root): Fix file attribute test.
+ 
+ 2007-05-24  Richard Stallman  <rms@gnu.org>
+ 
+       * textmodes/flyspell.el (flyspell-correct-word-before-point):
+       Don't let opoint be nil.
+       (flyspell-emacs-popup): Explicit error if no dialogs.
+ 
 +2007-05-24  Chong Yidong  <cyd@stupidchicken.com>
 +
 +      * image-mode.el (image-forward-hscroll, image-backward-hscroll)
 +      (image-next-line, image-previous-line, image-scroll-up)
 +      (image-scroll-down, image-bol, image-eol, image-bob, image-eob):
 +      New functions.
 +      (image-mode-map): Remap motion commands.
 +      (image-mode-text-map): New keymap for viewing images as text.
 +      (image-mode): Use image-mode-map.
 +      (image-toggle-display): Toggle auto-hscroll-mode and mode keymaps.
 +
 +2007-05-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * textmodes/fill.el (canonically-space-region): Make the second arg
 +      a marker if it's not already the case.
 +
 +2007-05-23  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * tar-mode.el (tar-header-block-summarize, tar-summarize-buffer)
 +      (tar-get-descriptor): Handle type 55, an extended pax header.
 +
 +2007-05-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * autoinsert.el (auto-insert-alist): Quote elisp sample code so as not
 +      to confuse outline-minor-mode.
 +
  2007-05-23  Eli Zaretskii  <eliz@gnu.org>
  
        * tar-mode.el (tar-file-name-handler): New function.