Mercurial > hg > xemacs-beta

changeset 300:3cc9f0ebfbd1 r21-0b48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b48
author cvs
date Mon, 13 Aug 2007 10:40:26 +0200
parents 24cff6e8d715
children f8fd9702bf71
files CHANGES-beta ChangeLog configure configure.in lib-src/ChangeLog lisp/ChangeLog lisp/about.el lisp/register.el lisp/select.el man/ChangeLog nt/ChangeLog src/ChangeLog src/mule-wnnfns.c version.sh
diffstat 14 files changed, 110 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES-beta	Mon Aug 13 10:39:46 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 10:40:26 2007 +0200
@@ -1,4 +1,7 @@
 							-*- indented-text -*-
+to 21.0 pre5 "Zhong Wei"
+-- multiple DB configure fix from Gregory Neil Shapiro
+
 to 21.0 pre4 "Uzbek Black"
 -- Miscellaneous documentation cleanup from Altrasoft
 -- Updates for using emacsbug.el as primary bug report interface from
--- a/ChangeLog	Mon Aug 13 10:39:46 2007 +0200
+++ b/ChangeLog	Mon Aug 13 10:40:26 2007 +0200
@@ -1,5 +1,16 @@
+1998-07-12  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre5 is released.
+
+1998-07-10  SL Baur  <steve@altair.xemacs.org>
+
+	* configure.in (with_offix): Default --with-offix to off.
+
 1998-07-09  SL Baur  <steve@altair.xemacs.org>
 
+	* configure.in: Handle multiple database libraries.
+	From Gregory Neil Shapiro <gshapiro@sendmail.org>
+
 	* XEmacs 21.0-pre4 is released.
 
 	* configure.in: Fix test for InfoDock sources.
--- a/configure	Mon Aug 13 10:39:46 2007 +0200
+++ b/configure	Mon Aug 13 10:40:26 2007 +0200
@@ -416,7 +416,7 @@
 	  with_database_berkdb=no
 	  with_database_dbm=no
 	  with_database_gnudbm=no
-	  for x in `echo "$val" | sed -e 's/,/ /'` ; do
+	  for x in `echo "$val" | sed -e 's/,/ /g'` ; do
 	    case "$x" in
 		no ) ;;
 		b | be | ber | berk | berkd | berkdb )  with_database_berkdb=yes ;;
@@ -6252,7 +6252,7 @@
   echo "configure: warning: CDE already found, disabling OffiX support" 1>&2
   with_offix=no
 fi
-test -z "$with_offix" && with_offix=yes
+test -z "$with_offix" && with_offix=no
 if test "$with_offix" = "yes"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_OFFIX_DND
--- a/configure.in	Mon Aug 13 10:39:46 2007 +0200
+++ b/configure.in	Mon Aug 13 10:40:26 2007 +0200
@@ -570,7 +570,7 @@
 	  with_database_berkdb=no
 	  with_database_dbm=no
 	  with_database_gnudbm=no
-	  for x in `echo "$val" | sed -e 's/,/ /'` ; do
+	  for x in `echo "$val" | sed -e 's/,/ /g'` ; do
 	    case "$x" in
 		no ) ;;
 		b | be | ber | berk | berkd | berkdb )  with_database_berkdb=yes ;;
@@ -2582,6 +2582,8 @@
 dnl Always compile OffiX unless --without-offix is given, no
 dnl X11 support is compiled in, no standard Xmu is avaiable,
 dnl or dragndrop support is disabled
+dnl Because OffiX support currently loses when more than one display
+dnl is in use, we now disable it by default -slb 07/10/1998.
 test "$window_system" != "x11" && with_offix=no
 if test "$with_xmu" != yes -a "$with_x11" = yes; then
   AC_MSG_WARN([No OffiX without real Xmu support])
@@ -2595,7 +2597,7 @@
   AC_MSG_WARN([CDE already found, disabling OffiX support])
   with_offix=no
 fi
-test -z "$with_offix" && with_offix=yes
+test -z "$with_offix" && with_offix=no
 if test "$with_offix" = "yes"; then
   AC_DEFINE(HAVE_OFFIX_DND)
   XE_APPEND(offix.o, dnd_objs)
--- a/lib-src/ChangeLog	Mon Aug 13 10:39:46 2007 +0200
+++ b/lib-src/ChangeLog	Mon Aug 13 10:40:26 2007 +0200
@@ -1,3 +1,7 @@
+1998-07-12  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre5 is released.
+
 1998-07-09  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 21.0-pre4 is released.
--- a/lisp/ChangeLog	Mon Aug 13 10:39:46 2007 +0200
+++ b/lisp/ChangeLog	Mon Aug 13 10:40:26 2007 +0200
@@ -1,3 +1,22 @@
+1998-07-12  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre5 is released.
+
+1998-07-11  SL Baur  <steve@altair.xemacs.org>
+
+	* about.el (about-hackers): Credits update.
+
+1998-07-11  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* register.el (insert-register): Don't activate the region.
+
+1998-07-10  SL Baur  <steve@altair.xemacs.org>
+
+	* select.el: Restore x-* symbols for backwards compatibility:
+	x-copy-primary-selection, x-kill-primary-selection,
+	x-delete-primary-selection, x-select-make-extent-for-selection,
+	x-valid-simple-selection-, x-cut-copy-clear-internal.
+
 1998-07-09  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 21.0-pre4 is released.
--- a/lisp/about.el	Mon Aug 13 10:39:46 2007 +0200
+++ b/lisp/about.el	Mon Aug 13 10:40:26 2007 +0200
@@ -1255,6 +1255,14 @@
        (print-short "Michael R. Cook" "mcook@cognex.com" "\
 Author of the \"shy groups\" and minimal matching regular expression
 extensions.\n")
+       (print-short "Darryl Okahata" "darrylo@sr.hp.com" "\
+Perennial Emacs hacker since 1986 or so, when he first started on GNU
+Emacs 17.something.  Over the years, he's developed "OEmacs", the first
+version of GNU Emacs 19 for MSDOS, and "bigperl", a 32-bit version of
+Perl4 for MSDOS.  In recent years, reality has intruded and he no longer 
+has much time for playing with cool programs.  What little time he has
+now goes to XEmacs hacking, where he's worked on speeding up dired under 
+MS Windows, and to feeding his two cats.\n")
        "\n\
 In addition to those just mentioned, the following people have spent a
 great deal of effort providing feedback, testing beta versions of
@@ -1426,7 +1434,6 @@
        (print-short "Christian Nybø" "chr@mediascience.no")
        (print-short "Kevin Oberman" "oberman@es.net")
        (print-short "David Ofelt" "ofelt@getalife.Stanford.EDU")
-       (print-short "Darryl Okahata" "darrylo@sr.hp.com")
        (print-short "Alexandre Oliva" "oliva@dcc.unicamp.br")
        (print-short "Tore Olsen" "toreo@colargol.idb.hist.no")
        (print-short "Greg Onufer" "Greg.Onufer@eng.sun.com")
--- a/lisp/register.el	Mon Aug 13 10:39:46 2007 +0200
+++ b/lisp/register.el	Mon Aug 13 10:40:26 2007 +0200
@@ -240,7 +240,8 @@
       (princ (marker-position val) (current-buffer)))
      (t
       (error "Register does not contain text"))))
-  (if (not arg) (exchange-point-and-mark)))
+  ;; XEmacs: don't activate the region.  It's annoying.
+  (if (not arg) (exchange-point-and-mark t)))
 
 (defun copy-to-register (register start end &optional delete-flag)
   "Copy region into register REGISTER.  With prefix arg, delete as well.
--- a/lisp/select.el	Mon Aug 13 10:39:46 2007 +0200
+++ b/lisp/select.el	Mon Aug 13 10:40:26 2007 +0200
@@ -37,18 +37,27 @@
   (interactive)
   (and (console-on-window-system-p)
        (cut-copy-clear-internal 'copy)))
+(define-obsolete-function-alias
+  'x-copy-primary-selection
+  'copy-primary-selection)
 
 (defun kill-primary-selection ()
   "Copy the selection to the Clipboard and the kill ring, then delete it."
   (interactive "*")
   (and (console-on-window-system-p)
        (cut-copy-clear-internal 'cut)))
+(define-obsolete-function-alias
+  'x-kill-primary-selection
+  'kill-primary-selection)
 
 (defun delete-primary-selection ()
   "Delete the selection without copying it to the Clipboard or the kill ring."
   (interactive "*")
   (and (console-on-window-system-p)
        (cut-copy-clear-internal 'clear)))
+(define-obsolete-function-alias
+  'x-delete-primary-selection
+  'delete-primary-selection)
 
 (defun yank-clipboard-selection ()
   "Insert the current Clipboard selection at point."
@@ -209,6 +218,9 @@
 	  (default-mouse-track-next-move-rect start end previous-extent)
 	  ))
 	previous-extent))))
+(define-obsolete-function-alias
+  'x-select-make-extent-for-selection
+  'select-make-extent-for-selection)
 
 ;; moved from x-select.el
 (defun valid-simple-selection-p (data)
@@ -230,6 +242,9 @@
 	       (marker-buffer (cdr data)))
 	   (buffer-live-p (marker-buffer (car data)))
 	   (buffer-live-p (marker-buffer (cdr data))))))
+(define-obsolete-function-alias
+  'x-valid-simple-selection-p
+  'valid-simple-selection-p)
 
 (defun cut-copy-clear-internal (mode)
   (or (memq mode '(cut copy clear)) (error "unkown mode %S" mode))
@@ -272,5 +287,8 @@
 	       (delete-region s e))))
       (disown-selection nil)
       )))
+(define-obsolete-function-alias
+  'x-cut-copy-clear-internal
+  'cut-copy-clear-internal)
 
 ;;; select.el ends here
--- a/man/ChangeLog	Mon Aug 13 10:39:46 2007 +0200
+++ b/man/ChangeLog	Mon Aug 13 10:40:26 2007 +0200
@@ -1,3 +1,7 @@
+1998-07-12  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre5 is released.
+
 1998-07-09  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 21.0-pre4 is released.
--- a/nt/ChangeLog	Mon Aug 13 10:39:46 2007 +0200
+++ b/nt/ChangeLog	Mon Aug 13 10:40:26 2007 +0200
@@ -1,3 +1,7 @@
+1998-07-12  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre5 is released.
+
 1998-07-09  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 21.0-pre4 is released.
--- a/src/ChangeLog	Mon Aug 13 10:39:46 2007 +0200
+++ b/src/ChangeLog	Mon Aug 13 10:40:26 2007 +0200
@@ -1,3 +1,13 @@
+1998-07-12  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre5 is released.
+
+1998-07-10  SL Baur  <steve@altair.xemacs.org>
+
+	* mule-wnnfns.c (Fwnn_open): Correctly trap on misdefined Wnn
+	server type in environment.
+	Use alloca-ed strings instead of tiny fixed size ones.
+
 1998-07-09  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 21.0-pre4 is released.
--- a/src/mule-wnnfns.c	Mon Aug 13 10:39:46 2007 +0200
+++ b/src/mule-wnnfns.c	Mon Aug 13 10:40:26 2007 +0200
@@ -332,20 +332,21 @@
 */
      (hname, lname))
 {
-  char	envname[32];
-  char	langname[32];
-  char	hostname[32];
+  char *envname;
+  char *langname;
+  char *hostname;
   int	snum;
+  int size;
   CHECK_STRING (lname);
 
   snum = check_wnn_server_type ();
   switch (snum)
     {
     case WNNSERVER_J:
-      strcpy (langname, "ja_JP");
+      langname = "ja_JP";
       break;
     case WNNSERVER_C:
-      strcpy (langname, "zh_CN");
+      langname = "zh_CN";
       break;
 /*  
     case WNNSERVER_T:
@@ -353,15 +354,25 @@
     break;
     */
     case WNNSERVER_K:
-      strcpy (langname, "ko_KR");
+      langname = "ko_KR";
       break;
+    case -1:
+    default:
+      return Qnil;
     }
-  strncpy (envname, (char *) XSTRING_DATA (lname), 32);
-  if (NILP (hname)) strcpy (hostname, "");
+  size = XSTRING_LENGTH (lname) > 1024 ? 1026 : XSTRING_LENGTH (lname) + 2;
+  envname = alloca (size);
+  strncpy (envname, (char *) XSTRING_DATA (lname), size-2);
+  envname[size-2] = '\0';
+  if (NILP (hname)) hostname = "";
   else
     {
       CHECK_STRING (hname);
-      strncpy (hostname, (char *) XSTRING_DATA (hname), 32);
+      size = XSTRING_LENGTH(hname) > 1024 ? 1025 : XSTRING_LENGTH(hname) + 1;
+
+      hostname = alloca (size);
+      strncpy (hostname, (char *) XSTRING_DATA (hname), size-1);
+      hostname[size-1] = '\0';
     }
   CHECK_STRING (lname);
   /* 97/4/16 jhod@po.iijnet.or.jp
--- a/version.sh	Mon Aug 13 10:39:46 2007 +0200
+++ b/version.sh	Mon Aug 13 10:40:26 2007 +0200
@@ -2,7 +2,7 @@
 emacs_major_version=21
 emacs_minor_version=0
 emacs_beta_version=
-xemacs_codename="Uzbek Black"
+xemacs_codename="Zhong Wei"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=1