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 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