Mercurial > emacs

changeset 83198:d58083e7ec81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in changes from CVS trunk (Jan D. 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
author Karoly Lorentey <lorentey@elte.hu>
date Tue, 31 Aug 2004 16:30:29 +0000
parents d1ccd8aa7b94 (current diff) 1dac05def6d8 (diff)
children 0e38a1bd20a8
files man/ChangeLog man/kmacro.texi src/xfns.c src/xterm.c
diffstat 9 files changed, 58 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/speedbar.el	Tue Aug 24 08:45:10 2004 +0000
+++ b/lisp/speedbar.el	Tue Aug 31 16:30:29 2004 +0000
@@ -665,7 +665,7 @@
   "*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
--- a/lisp/vc-svn.el	Tue Aug 24 08:45:10 2004 +0000
+++ b/lisp/vc-svn.el	Tue Aug 31 16:30:29 2004 +0000
@@ -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 @@
 	       (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 @@
 	     (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 @@
 
 (provide 'vc-svn)
 
-;;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
+;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
 ;;; vc-svn.el ends here
--- a/man/ChangeLog	Tue Aug 24 08:45:10 2004 +0000
+++ b/man/ChangeLog	Tue Aug 31 16:30:29 2004 +0000
@@ -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.
--- a/man/display.texi	Tue Aug 24 08:45:10 2004 +0000
+++ b/man/display.texi	Tue Aug 31 16:30:29 2004 +0000
@@ -316,7 +316,8 @@
 @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
--- a/man/kmacro.texi	Tue Aug 24 08:45:10 2004 +0000
+++ b/man/kmacro.texi	Tue Aug 31 16:30:29 2004 +0000
@@ -261,7 +261,7 @@
 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 @@
 @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
--- a/man/search.texi	Tue Aug 24 08:45:10 2004 +0000
+++ b/man/search.texi	Tue Aug 31 16:30:29 2004 +0000
@@ -434,7 +434,7 @@
   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 @@
 @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 @@
 
 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 @@
 @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 @@
 @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{\#}.
--- a/src/ChangeLog	Tue Aug 24 08:45:10 2004 +0000
+++ b/src/ChangeLog	Tue Aug 31 16:30:29 2004 +0000
@@ -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,
--- a/src/xfns.c	Tue Aug 24 08:45:10 2004 +0000
+++ b/src/xfns.c	Tue Aug 31 16:30:29 2004 +0000
@@ -293,6 +293,8 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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);
--- a/src/xterm.c	Tue Aug 24 08:45:10 2004 +0000
+++ b/src/xterm.c	Tue Aug 31 16:30:29 2004 +0000
@@ -7608,15 +7608,13 @@
 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;