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

7 files changed, 95 insertions, 19 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 384c1d741c4..500b447b692 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -27,7 +27,7 @@ Reminders sent out on 2006-06-08.
 These don't need to be fixed before a release, but we call the
 attention of Windows users to fixing them.
 
-** Drew Adams 12 Aug bug rpt: overlay  display artifact: trace left behind
+** Drew Adams 12 Aug bug rpt: overlay display artifact: trace left behind
 Windows only bug. Bug appears only when Cleartype enabled, probably related
 to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 
@@ -38,6 +38,38 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 
 See the copy of this file on the EMACS_22_BASE branch.
 
+** rcyeske@gmail.com, April 22: Failure to build on OpenBSD macppc.
+OpenBSD compilation works on i386.
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00932.html
+
+** bojohan+news@dd.chalmers.se, April 23: delete-overlay causes recentering
+(This is now the same as the spurious scrolling bug.)
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00514.html
+
+** Spurious redisplay bug not fixed.
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00443.html
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00732.html
+
+** finish fixing locate.el
+http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00437.html
+
+** angeli@caeruleus.net, April 23: Excessive refontification when setting
+  jit-lock-context-unfontify-pos
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00993.html
+
+** michael.ewe@arcor.de, Apr 24: 22.0.98  not starting on Solaris 10/I386
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html
+
+** rgm@gnu.org, Apr 24: [Stephen.Berman@gmx.net: Re: redisplay]
+  Gives test case for problem that a dialog box blocks redisplay.
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00951.html
+
+** hiroshi.fujishima@gmail.com, Apr 27: emacs-22.0.99 configure problem
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01452.html
+  this is probably an issue for autoconf, rather than Emacs
+
+** C mode fontification took 50 seconds
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01460.html
 
 * DOCUMENTATION
 
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 3d30d30e6c3..4464e7a9f20 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-28  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.py: Restore file pending consideration of python.el legal
+        status.
+        * NEWS: Restore mention of python.el pending consideration of
+        legal status.
+
 2007-04-28  David R. Linn  <drl@jekyll.vuse.vanderbilt.edu>
 
         * PROBLEMS: Add section on Solaris out-of-tree install issues with
diff --git a/etc/NEWS b/etc/NEWS
index 18e39e4c9b2..3cf023df4b9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3483,6 +3483,26 @@ of MATHEMATICAL ITALIC CAPITAL ALPHA (the latter is greater than
 
 This syntax works for both character constants and strings.
 
+*** New syntax: \s now stands for the SPACE character.
+
+`?\s' is a new way to write the space character.  You must make sure
+it is not followed by a dash, since `?\s-...' indicates the "super"
+modifier.  However, it would be strange to write a character constant
+and a following symbol (beginning with `-') with no space between
+them.
+
+`\s' stands for space in strings, too, but it is not really meant for
+strings; it is easier and nicer just to write a space.
+
+*** New syntax: \uXXXX and \UXXXXXXXX specify Unicode code points in hex.
+
+For instance, you can use "\u0428" to specify a string consisting of
+CYRILLIC CAPITAL LETTER SHA, or `"U0001D6E2" to specify one consisting
+of MATHEMATICAL ITALIC CAPITAL ALPHA (the latter is greater than
+#xFFFF and thus needs the longer syntax).
+
+This syntax works for both character constants and strings.
+
 *** The function `expt' handles negative exponents differently.
 The value for `(expt A B)', if both A and B are integers and B is
 negative, is now a float.  For example: (expt 2 -2) => 0.25.
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
diff --git a/man/ChangeLog b/man/ChangeLog
index 95de88b0e8f..21b481ad111 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-28  Glenn Morris  <rgm@gnu.org>
+
+        * ack.texi (Acknowledgments):
+        * anti.texi (Antinews):
+        * faq.texi (New in Emacs 22):
+        * programs.texi (Program Modes): Restore mention of python.el pending
+        consideration of legal status.
+
 2007-04-28  Richard Stallman  <rms@gnu.org>
 
         * files.texi (File Names): Fixes to ~ description on MS systems.
diff --git a/man/anti.texi b/man/anti.texi
index beb0e9da027..ebff1c7677f 100644
--- a/man/anti.texi
+++ b/man/anti.texi
@@ -278,7 +278,7 @@ tries to demonstrate this in the GUD buffer.
 @item
 The Calc, CUA, Ibuffer, Ido, Password, Printing, Reveal,
 Ruler-mode, SES, Table, Tramp, and URL packages have been removed.
-The Benchmark, Cfengine, Conf, Dns, Flymake, Pythno, Thumbs, and
+The Benchmark, Cfengine, Conf, Dns, Flymake, Python, Thumbs, and
 Wdired modes have also been removed.
 
 @item