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

3 files changed, 14 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ecb03ad1a4..be975f67e99 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+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)
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index a509fdf7f6c..e02fec1362f 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -2025,6 +2025,7 @@ If OPOINT is non-nil, restore point there after adjusting it for replacement."
     (error "Pop-up menus do not work on this terminal"))
   ;; use the correct dictionary
   (flyspell-accept-buffer-local-defs)
+  (or opoint (setq opoint (point-marker)))
   (let ((cursor-location (point))
         (word (flyspell-get-word nil)))
     (if (consp word)
@@ -2133,6 +2134,8 @@ If OPOINT is non-nil, restore point there after adjusting it for replacement."
 ;;*---------------------------------------------------------------------*/
 (defun flyspell-emacs-popup (event poss word)
   "The Emacs popup menu."
+  (unless window-system
+    (error "This command requires pop-up dialogs"))
   (if (not event)
       (let* ((mouse-pos  (mouse-position))
              (mouse-pos  (if (nth 1 mouse-pos)
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 1bde704790b..22935ab7f3b 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -325,7 +325,7 @@ If WITNESS if not found, return nil, otherwise return the root."
                    ;; to another user.  This should save us from looking in
                    ;; things like /net and /afs.  This assumes that all the
                    ;; files inside a project belong to the same user.
-                   (not (equal user (file-attributes file)))
+                   (not (equal user (nth 2 (file-attributes file))))
                    (string-match vc-ignore-dir-regexp file)))
       (if (file-exists-p (expand-file-name witness file))
          (setq root file)