Merged in changes from CVS trunk (Jan Djärv has fixed the XSync call in xterm.c, no need to disable it anymore).

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-506
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-507
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-508
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-238

9 files changed, 58 insertions, 23 deletions

diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 1a222e6004e..db16f2f78f3 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -665,7 +665,7 @@ useful, such as version control."
   "*Regexp matching files we don't want displayed in a speedbar buffer.
 It is generated from the variable `completion-ignored-extensions'")
 
-;; Ugly compiler silencing trick.  The real defvar comes later in this file.
+;; Compiler silencing trick.  The real defvar comes later in this file.
 (defvar speedbar-file-regexp)
 
 ;; this is dangerous to customize, because the defaults will probably
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 82c09cbd435..fafb5eff7cd 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -1,6 +1,7 @@
 ;;; vc-svn.el --- non-resident support for Subversion version-control
 
-;; Copyright (C) 1995,98,99,2000,2001,02,2003  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;;           Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
@@ -363,7 +364,10 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
                (append (vc-switches nil 'diff) '("/dev/null")))
         ;; Even if it's empty, it's locally modified.
         1)
-    (let* ((switches (vc-switches 'SVN 'diff))
+    (let* ((switches
+            (if vc-svn-diff-switches
+                (vc-switches 'SVN 'diff)
+              (list "-x" (mapconcat 'identity (vc-switches nil 'diff) " "))))
            (async (and (vc-stay-local-p file)
                        (or oldvers newvers) ; Svn diffs those locally.
                        (fboundp 'start-process))))
@@ -371,8 +375,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
              (if async 'async 0)
              file "diff"
              (append
-              (when switches
-                (list "-x" (mapconcat 'identity switches " ")))
+              switches
               (when oldvers
                 (list "-r" (if newvers (concat oldvers ":" newvers)
                              oldvers)))))
@@ -504,5 +507,5 @@ essential information."
 
 (provide 'vc-svn)
 
-;;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
+;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
 ;;; vc-svn.el ends here
diff --git a/man/ChangeLog b/man/ChangeLog
index 5c0926de48a..72024ae917a 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,17 @@
+2004-08-23  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * display.texi (Font Lock): Correct invalid @xref.
+
+        * search.texi (Regexps): Correct cryptic @ref.
+        (Configuring Scrolling): Correct invalid @xref.
+        (Regexp Replace): Standardize reference to hardcopy Elisp Manual
+        in @pxref.
+
+2004-08-22  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * kmacro.texi (Keyboard Macro Counter, Keyboard Macro Step-Edit):
+        Change section names.
+
 2004-08-22  David Kastrup  <dak@gnu.org>
 
         * reftex.texi (AUCTeX): Update links, section name.
diff --git a/man/display.texi b/man/display.texi
index 2c530ec480a..b78eb8ab939 100644
--- a/man/display.texi
+++ b/man/display.texi
@@ -316,7 +316,8 @@ comments, use this:
 @findex font-lock-remove-keywords
   To remove keywords from the font-lock highlighting patterns, use the
 function @code{font-lock-remove-keywords}.  @xref{Search-based
-Fontification,,,elisp}, for documentation of the format of this list.
+Fontification,,, elisp, The Emacs Lisp Reference Manual}, for
+documentation of the format of this list.
 
 @cindex just-in-time (JIT) font-lock
 @cindex background syntax highlighting
diff --git a/man/kmacro.texi b/man/kmacro.texi
index a0b3a249bbd..d3c24873cd0 100644
--- a/man/kmacro.texi
+++ b/man/kmacro.texi
@@ -261,7 +261,7 @@ the macro ring.
 executes the previous (rather than the head) element on the macro ring.
 
 @node Keyboard Macro Counter
-@section Inserting incrementing numbers in macros
+@section The Keyboard Macro Counter
 
   Each keyboard macro has an associated counter which is automatically
 incremented on every repetition of the keyboard macro.  Normally, the
@@ -449,7 +449,7 @@ keyboard input that you would use to invoke the macro---@kbd{C-x e} or
 @kbd{C-x C-k l} (@code{kmacro-edit-lossage}).
 
 @node Keyboard Macro Step-Edit
-@section Interactively executing and editing a keyboard macro
+@section Stepwise Editing a Keyboard Macro
 
 @findex kmacro-step-edit-macro
 @kindex C-x C-k SPC
diff --git a/man/search.texi b/man/search.texi
index c31bc60af62..a0c64275de0 100644
--- a/man/search.texi
+++ b/man/search.texi
@@ -434,7 +434,7 @@ Search}.
   This manual describes regular expression features that users
 typically want to use.  There are additional features that are
 mainly used in Lisp programs; see @ref{Regular Expressions,,,
-elisp, the same manual}.
+elisp, The Emacs Lisp Reference Manual}.
 
   Regular expressions have a syntax in which a few characters are
 special constructs and the rest are @dfn{ordinary}.  An ordinary
@@ -921,7 +921,8 @@ The buffer contents.
 @item
 The selected window and selected frame.
 @item
-The current match-data @xref{Match Data,,,elisp}.
+The current match-data.  @xref{Match Data,,, elisp, The Emacs Lisp
+Reference Manual}.
 @end enumerate
 
 Additionally, the command must not delete the current window and must
@@ -930,7 +931,7 @@ window's size, or create or delete other windows and frames.
 
 Note that an attempt by a command to scroll the text
 @emph{horizontally} won't work, although it will do no harm---any such
-scrolling will be overriden and nullified by the display code.
+scrolling will be overridden and nullified by the display code.
 
 @node Replace, Other Repeating Search, Configuring Scrolling, Search
 @section Replacement Commands
@@ -1063,7 +1064,7 @@ M-x replace-regexp @key{RET} \(x\)\|y @key{RET}
 @end example
 
   For computing replacement strings for @samp{\,}, the @code{format}
-function is often useful (@pxref{Formatting Strings,,,elisp, GNU Emacs
+function is often useful (@pxref{Formatting Strings,,, elisp, The Emacs
 Lisp Reference Manual}).  For example, to add consecutively numbered
 strings like @samp{ABC00042} to columns 73 @w{to 80} (unless they are
 already occupied), you can use
@@ -1084,7 +1085,7 @@ M-x replace-regexp @key{RET} \footnote@{ @key{RET}
 @end example
 
 @noindent
-will add labels starting with @samp{\label@{fn:0@}} to occurences of
+will add labels starting with @samp{\label@{fn:0@}} to occurrences of
 @samp{\footnote@{}, but letting you edit each replacement before
 performing it.  To number the labels starting at 1, use @samp{\,(1+
 \#)} instead of @samp{\#}.
diff --git a/src/ChangeLog b/src/ChangeLog
index cbf06bc480f..d49514b2fc0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-24  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_catch_errors_unwind): Do not XSync if display has closed.
+
+        * xfns.c (x_window_to_frame, x_any_window_to_frame)
+        (x_non_menubar_window_to_frame, x_menubar_window_to_frame)
+        (x_top_window_to_frame): Return 0 if wdesc is None.
+
 2004-08-22  Richard M. Stallman  <rms@gnu.org>
 
         * process.c (process_send_signal) [SIGNALS_VIA_CHARACTERS,
diff --git a/src/xfns.c b/src/xfns.c
index 762b45d0089..e03edbbec89 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -293,6 +293,8 @@ x_window_to_frame (dpyinfo, wdesc)
   Lisp_Object tail, frame;
   struct frame *f;
 
+  if (wdesc == None) return 0;
+
   for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
@@ -342,6 +344,8 @@ x_any_window_to_frame (dpyinfo, wdesc)
   struct frame *f, *found;
   struct x_output *x;
 
+  if (wdesc == None) return NULL;
+
   found = NULL;
   for (tail = Vframe_list; GC_CONSP (tail) && !found; tail = XCDR (tail))
     {
@@ -396,6 +400,8 @@ x_non_menubar_window_to_frame (dpyinfo, wdesc)
   struct frame *f;
   struct x_output *x;
 
+  if (wdesc == None) return 0;
+
   for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
@@ -442,6 +448,8 @@ x_menubar_window_to_frame (dpyinfo, wdesc)
   struct frame *f;
   struct x_output *x;
 
+  if (wdesc == None) return 0;
+
   for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
@@ -487,6 +495,8 @@ x_top_window_to_frame (dpyinfo, wdesc)
   struct frame *f;
   struct x_output *x;
 
+  if (wdesc == None) return 0;
+
   for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
diff --git a/src/xterm.c b/src/xterm.c
index eb455522d1c..c1edf49aca7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7608,15 +7608,13 @@ static Lisp_Object
 x_catch_errors_unwind (old_val)
      Lisp_Object old_val;
 {
-  Lisp_Object first;
-
-  first = XCAR (old_val);
-
-#if 0  /* XXX This has dumped core on me several times when my X
-          server crashed.  If this call is important, maybe we should
-          check that the display is still alive. -- lorentey */
-  XSync (XSAVE_VALUE (first)->pointer, False);
-#endif
+  Lisp_Object first = XCAR (old_val);
+  Display *dpy = XSAVE_VALUE (first)->pointer;
+  
+  /* The display may have been closed before this function is called.
+     Check if it is still open before calling XSync.  */
+  if (x_display_info_for_display (dpy) != 0)
+    XSync (dpy, False);
 
   x_error_message_string = XCDR (old_val);
   return Qnil;