Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 3)

   - Update from CVS

2007-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/vc-hooks.el (vc-ignore-dir-regexp): Add /.../ for the DFS filesystem.

2007-04-28  Eli Zaretskii  <eliz@gnu.org>

   * lisp/makefile.w32-in ($(lisp)/mh-e/mh-loaddefs.el): Use ./mh-e
   instead of $(lisp)/mh-e.

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

2 files changed, 26 insertions, 17 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c69b8a71a55..1e3ecfaa838 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -12,6 +12,15 @@
         * progmodes/gud.el (gud-menu-map): Pdb can't handle SIGINT so
         don't put stop on toolbar.
 
+2007-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc-hooks.el (vc-ignore-dir-regexp): Add /.../ for the DFS filesystem.
+
+2007-04-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(lisp)/mh-e/mh-loaddefs.el): Use ./mh-e
+        instead of $(lisp)/mh-e.
+
 2007-04-28  Glenn Morris  <rgm@gnu.org>
 
         * image-dired.el (image-dired-cmd-create-thumbnail-options)
@@ -20,8 +29,8 @@
 
 2007-04-27  Chong Yidong  <cyd@stupidchicken.com>
 
-        * textmodes/flyspell.el (flyspell-auto-correct-previous-word): Use
-        window-start and window-end.
+        * textmodes/flyspell.el (flyspell-auto-correct-previous-word):
+        Use window-start and window-end.
 
 2007-04-27  Andreas Schwab  <schwab@suse.de>
 
@@ -55,9 +64,8 @@
 
 2007-04-25  Mathias Dahl  <mathias.dahl@gmail.com>
 
-        * image-dired.el (image-dired-display-image): Derive image-type
-        from filename rather than assuming jpeg, in case no resizing was
-        needed.
+        * image-dired.el (image-dired-display-image): Derive image-type from
+        filename rather than assuming jpeg, in case no resizing was needed.
 
 2007-04-25  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
 
@@ -65,12 +73,11 @@
 
 2007-04-24  J.D. Smith  <jdsmith@as.arizona.edu>
 
-        * progmodes/idlw-shell.el (idlwave-shell-clear-all-bp): Don't
-        re-query for each cleared BP.
+        * progmodes/idlw-shell.el (idlwave-shell-clear-all-bp):
+        Don't re-query for each cleared BP.
         (idlwave-shell-clear-bp): Optionally skip BP query.
-        (idlwave-shell-update-bp-overlays): Use set-window-margins
-        instead of set-window-buffer, which incorrectly moves displayed
-        region.
+        (idlwave-shell-update-bp-overlays): Use set-window-margins instead
+        of set-window-buffer, which incorrectly moves displayed region.
 
 2007-04-23  Jay Belanger  <jay.p.belanger@gmail.com>
 
@@ -84,8 +91,8 @@
 
 2007-04-23  Chong Yidong  <cyd@stupidchicken.com>
 
-        * info.el (Info-mouse-scroll-up, Info-mouse-scroll-down): New
-        functions.
+        * info.el (Info-mouse-scroll-up, Info-mouse-scroll-down):
+        New functions.
         (Info-mode-line-node-keymap): Bind mouse commands to
         Info-mouse-scroll-up/down instead of Info-scroll-up/down.
 
@@ -96,8 +103,8 @@
         (locate-prompt-for-search-string): New function.
         (locate): New optional arg.  Make locate-local-prompt
         buffer-local.  Use locate-prompt-for-search-string.
-        (locate-with-filter): New optional arg.  Use
-        locate-prompt-for-search-string.
+        (locate-with-filter): New optional arg.
+        Use locate-prompt-for-search-string.
         (locate-update): Bind locate-prompt-for-command.
 
 2007-04-23  Glenn Morris  <rgm@gnu.org>
@@ -180,8 +187,8 @@
         * progmodes/vhdl-mode.el (vhdl-template-type)
         (vhdl-template-record, vhdl-template-nature)
         (vhdl-template-configuration-spec, vhdl-template-component-inst)
-        (vhdl-template-break, vhdl-regress-line, vhdl-electric-tab): Use
-        delete-region instead of kill-word and kill-line.
+        (vhdl-template-break, vhdl-regress-line, vhdl-electric-tab):
+        Use delete-region instead of kill-word and kill-line.
 
 2007-04-21  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
 
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index df66c817293..d67a0262d88 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -52,7 +52,9 @@ BACKEND, use `vc-handled-backends'.")
 (defvar vc-header-alist ())
 (make-obsolete-variable 'vc-header-alist 'vc-BACKEND-header)
 
-(defcustom vc-ignore-dir-regexp "\\`\\([\\/][\\/]\\|/net/\\|/afs/\\)\\'"
+(defcustom vc-ignore-dir-regexp
+  ;; Stop SMB, automounter, AFS, and DFS host lookups.
+  "\\`\\(?:[\\/][\\/]\\|/\\(?:net\\|afs\\|\\.\\\.\\.\\)/\\)\\'"
   "Regexp matching directory names that are not under VC's control.
 The default regexp prevents fruitless and time-consuming attempts
 to determine the VC status in directories in which filenames are