Mercurial > hg > xemacs-beta

changeset 62:28a7c63c7e1e r19-16-pre6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-16-pre6
author cvs
date Mon, 13 Aug 2007 08:59:13 +0200
parents dd3566f69ebd
children 310b3151a139
files CHANGES-beta configure configure.in etc/dkindred.xpm.Z etc/dkindredm.xpm.Z lisp/prim/about.el lisp/prim/fill.el lisp/version.el lisp/w3/Makefile src/faces.c src/m/iris4d.h src/s/irix6-0.h src/scrollbar-x.c
diffstat 13 files changed, 70 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES-beta	Mon Aug 13 08:59:00 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 08:59:13 2007 +0200
@@ -1,4 +1,13 @@
 							-*- indented-text -*-
+to 19.16 pre6 -- "New York"
+-- Fix for using a pixmap background
+-- about.el updated
+-- Irix 6 build problem fixed
+-- W3 build problem fixed
+-- `sentence-end-double-space' doc string fixed
+-- Lucid scrollbar bug fixed (keyboard grab released when widget disappears)
+-- Iris4 build problem fixed
+
 to 19.16 pre5 -- "Staten Island"
 -- Irix 6 build problem fixed
 -- `directory-files' stack overrun fixed
--- a/configure	Mon Aug 13 08:59:00 2007 +0200
+++ b/configure	Mon Aug 13 08:59:13 2007 +0200
@@ -2083,6 +2083,7 @@
   ;;
   mips-sgi-irix6* )
     machine=iris4d opsys=irix6-0
+    NON_GNU_CPP=/lib/cpp
   ;;
   mips-sgi-irix5.[3-9]* )
     machine=iris4d opsys=irix5-3
--- a/configure.in	Mon Aug 13 08:59:00 2007 +0200
+++ b/configure.in	Mon Aug 13 08:59:13 2007 +0200
@@ -2089,6 +2089,7 @@
   ;;
   mips-sgi-irix6* )
     machine=iris4d opsys=irix6-0
+    NON_GNU_CPP=/lib/cpp
   ;;
   mips-sgi-irix5.[3-9]* )
     machine=iris4d opsys=irix5-3
Binary file etc/dkindred.xpm.Z has changed
Binary file etc/dkindredm.xpm.Z has changed
--- a/lisp/prim/about.el	Mon Aug 13 08:59:00 2007 +0200
+++ b/lisp/prim/about.el	Mon Aug 13 08:59:13 2007 +0200
@@ -80,7 +80,7 @@
   (view-mode nil 'kill-buffer)		;; assume the new view-less
   (let* ((buffer-read-only nil)
          (emacs-short-version (concat emacs-major-version "." emacs-minor-version))
-         (emacs-about-version (format "version %s; September 1997" emacs-short-version))
+         (emacs-about-version (format "version %s; October 1997" emacs-short-version))
 	 (indent-tabs-mode t)
 	 )
     (erase-buffer)
@@ -159,7 +159,7 @@
     (toggle-read-only 0)
 
     (let ((rest (if who-to-load (list who-to-load)
-		  '(steve mrb cthomp wing stig jwz mly vladimir baw piper bw wmperry kyle larsi jens vin)))
+		  '(steve mrb cthomp wing stig jwz mly vladimir baw piper bw wmperry kyle larsi jens vin dkindred)))
 	  (got-error nil))
       (while rest
 	(let* ((who (car rest))
@@ -240,6 +240,7 @@
     (w3-python   . "http://www.python.org/ftp/emacs/")
     (w3-infodock . "http://www.infodock.com")
     (w3-kyle     . "http://www.wonderworks.com/kyle/")
+    (w3-dkindred . "http://www.cs.cmu.edu/People/dkindred/me.html")
     (w3-larsi    . "http://www.ifi.uio.no/~larsi/")
     (w3-hrvoje   . "ftp://gnjilux.cc.fer.hr/pub/unix/util/wget/")
     (w3-upa      . "http://www.upa.org")
@@ -310,6 +311,7 @@
 			       ((eq xref 'larsi) "About Lars Magne Ingebrigtsen")
 			       ((eq xref 'jens) "About Jens Lautenbacher")
 			       ((eq xref 'vin) "About Vin Shelton")
+			       ((eq xref 'dkindred) "About Darrell Kindred")
 			       ((eq xref 'others) "About Everyone")
 			       ((eq xref 'features) "New XEmacs Features")
 			       ((eq xref 'history) "XEmacs History")
@@ -841,6 +843,26 @@
 	  (insert " to go back to the previous page.\n")
 	  )
 
+	 ((eq xref 'dkindred)
+	  (about-face "Darrell Kindred" 'bold)
+	  (insert " <dkindred@cmu.edu>
+
+	Darrell tends to come out of the woodwork a couple of weeks 
+	before a new release with a flurry of fixes for bugs that 
+	annoy him.  He hopes he's spared you from a core dump or two.
+
+	Darrell is currently a doctoral student in computer science at
+	Carnegie Mellon University, but he's trying hard to kick that
+	habit.  
+
+	See ")
+	  (about-xref "http://www.cs.cmu.edu/People/dkindred/me.html"
+		      'w3-dkindred "Visit Darrell's WWW page")
+	  (insert ".\n\n\tClick ")
+	  (about-xref "here" prev-page "Return to previous page")
+	  (insert " to go back to the previous page.\n")
+	  )
+
 	 ((eq xref 'others)
 	  (insert "Click ")
 	  (about-xref "here" 'about "Return to previous page")
@@ -944,12 +966,9 @@
 	  detached minibuffer code, as well as a few minor enhancements to
 	  the menubar options.
 
-	Darrell Kindred <Darrell.Kindred@cmu.edu>
-	  Unofficial maintainer of the xemacs-beta list of extant
-	  bugs and contributor of an extraordinary number of
-	  important bug fixes, many of them in areas that neither
-	  Chuck nor Ben was particularly enthusiastic about
-	  investigating.
+	") (about-xref "Darrell Kindred" 'dkindred "Find out more about Darrell Kindred") (insert " <dkindred@cmu.edu>
+	  Long-time bug tracker and exterminator for XEmacs and 
+          Lucid Emacs.
 
 	Eduardo Pelegri-Llopart <pelegri@eng.sun.com>
 	  Author of EOS, a package included in the standard XEmacs
@@ -984,8 +1003,8 @@
 	  the initial implementation of `duplicable' properties.
 
 	Hans Muller <hmuller@eng.sun.com>
-	 Author of the code used to connect XEmacs with ToolTalk,
-	 and of an early client of the external Emacs widget.
+	  Author of the code used to connect XEmacs with ToolTalk,
+	  and of an early client of the external Emacs widget.
 
 	David Moore <dmoore@UCSD.EDU>
 	  David has contributed greatly to the quest to speed up XEmacs.
--- a/lisp/prim/fill.el	Mon Aug 13 08:59:00 2007 +0200
+++ b/lisp/prim/fill.el	Mon Aug 13 08:59:13 2007 +0200
@@ -38,7 +38,9 @@
 A value of nil means that any change in indentation starts a new paragraph.")
 
 (defconst sentence-end-double-space t
-  "*Non-nil means a single space does not end a sentence.")
+  "*Non-nil means a single space does not end a sentence.
+This variable applies only to filling, not motion commands.  To
+change the behavior of motion commands, see `sentence-end'.")
 
 (defconst colon-double-space nil
   "*Non-nil means put two spaces after a colon when filling.")
--- a/lisp/version.el	Mon Aug 13 08:59:00 2007 +0200
+++ b/lisp/version.el	Mon Aug 13 08:59:13 2007 +0200
@@ -55,7 +55,7 @@
   "Non-nil when this is a test (beta) version of XEmacs.
 Warning, this variable did not exist in XEmacs versions prior to 20.3")
 
-(defconst xemacs-codename "Staten Island"
+(defconst xemacs-codename "New York"
   "Symbolic name of XEmacs build.
 Warning, this variable did not exist in XEmacs versions prior to 19.16
 and 20.3")
--- a/lisp/w3/Makefile	Mon Aug 13 08:59:00 2007 +0200
+++ b/lisp/w3/Makefile	Mon Aug 13 08:59:13 2007 +0200
@@ -35,7 +35,7 @@
 URLSOURCES = \
 	url-nfs.el url-file.el url-cookie.el url-parse.el url-irc.el	\
 	url-gopher.el url-http.el url-mail.el url-misc.el url-news.el	\
-	url-vars.el url-auth.el mm.el md5.el url-gw.el ssl.el base64.el	\
+	url-vars.el url-auth.el mm.el url-gw.el ssl.el base64.el	\
 	url.el socks.el url-cache.el url-ns.el
 
 CUSTOMSOURCES = # widget.el widget-edit.el
--- a/src/faces.c	Mon Aug 13 08:59:00 2007 +0200
+++ b/src/faces.c	Mon Aug 13 08:59:13 2007 +0200
@@ -1217,6 +1217,26 @@
       FROB (background);
       FROB (display_table);
       FROB (background_pixmap);
+
+      /*
+       * A face's background pixmap will override the face's
+       * background color.  But the background pixmap of the
+       * default face should not override the background color of
+       * a face if the background color has been specified or
+       * inherited.
+       *
+       * To accomplish this we remove the background pixmap of the
+       * cachel and mark it as having been specified so that cachel
+       * merging won't override it later.
+       */
+      if (! default_face
+	  && cachel->background_specified
+	  && ! cachel->background_pixmap_specified)
+	{
+	  cachel->background_pixmap = Qunbound;
+	  cachel->background_pixmap_specified = 1;
+	}
+
 #undef FROB
 
       ensure_face_cachel_contains_charset (cachel, domain, Vcharset_ascii);
--- a/src/m/iris4d.h	Mon Aug 13 08:59:00 2007 +0200
+++ b/src/m/iris4d.h	Mon Aug 13 08:59:13 2007 +0200
@@ -118,7 +118,6 @@
 
 #undef LIBS_MACHINE
 /* -lsun in case using Yellow Pages for passwords.  */
-#define LIBS_MACHINE -lmld
 #define LIBS_DEBUG
 
 /* Define this if you have a fairly recent system,
@@ -152,13 +151,3 @@
 
 #undef STACK_DIRECTION
 #define STACK_DIRECTION -1
-
-#ifndef __GNUC__
-/* Turn off some "helpful" error checks for type mismatches
-   that we can't fix without breaking other machines.  */
-#ifdef IRIX_FORCE_32_BITS
-#ifdef THIS_IS_MAKEFILE
-#define C_SWITCH_MACHINE -32
-#endif
-#endif /* IRIX_FORCE_32_BITS */
-#endif /* not __GNUC__ */
--- a/src/s/irix6-0.h	Mon Aug 13 08:59:00 2007 +0200
+++ b/src/s/irix6-0.h	Mon Aug 13 08:59:13 2007 +0200
@@ -2,21 +2,6 @@
 
 #include "irix5-3.h"
 
-/* Irix 6 tries to do 64 bits, but doesn't do it fully,
-   so inhibit that.  */
-#define IRIX_FORCE_32_BITS
-
-#ifndef __GNUC__
-#define LD_SWITCH_SYSTEM -32
-#endif
-
-/* This macro definition, which we inherited from irix5-0.h,
-   is needed in configure on Irix 5, but gets in the way there
-   on Irix 6.  So get rid of it except in Makefile.in where we need it.  */
-#ifndef THIS_IS_MAKEFILE
-#undef C_SWITCH_SYSTEM
-#endif
-
 /* Irix 6.2 doesn't need -lw */
 #undef NEED_LIBW
 
--- a/src/scrollbar-x.c	Mon Aug 13 08:59:00 2007 +0200
+++ b/src/scrollbar-x.c	Mon Aug 13 08:59:13 2007 +0200
@@ -287,6 +287,11 @@
     }
   else if (managed)
     {
+#if defined (LWLIB_SCROLLBARS_MOTIF) || defined (LWLIB_SCROLLBARS_LUCID)
+      /* This isn't needed with Athena Scrollbars.  It might not be needed */
+      /* with Motif scrollbars (it is apparently needed with Lesstif). */
+      XtUngrabKeyboard (SCROLLBAR_X_WIDGET (instance), CurrentTime);
+#endif
       XtUnmanageChild (SCROLLBAR_X_WIDGET (instance));
     }
 }