Mercurial > hg > xemacs-beta

changeset 325:f2b5d7006b0a r21-0-60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0-60
author cvs
date Mon, 13 Aug 2007 10:47:35 +0200
parents 8f2460f6e1f6
children e2671bc7f66a
files CHANGES-beta ChangeLog lib-src/ChangeLog lisp/ChangeLog lisp/faces.el lisp/hyper-apropos.el lisp/package-admin.el lisp/package-get.el lisp/wid-edit.el man/ChangeLog nt/ChangeLog nt/config.h nt/xemacs.mak src/ChangeLog src/glyphs-msw.c src/menubar-x.c version.sh
diffstat 17 files changed, 205 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES-beta	Mon Aug 13 10:47:10 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 10:47:35 2007 +0200
@@ -1,5 +1,15 @@
 							-*- indented-text -*-
 to 21.0 "Pyrenean"
+-- help-echo message fix from Hrvoje Niksic
+-- Fix building with union type on MS Windows NT from Andy Piper
+-- Installation/Installation.el/config.values for MS Windows from Adrian
+   Aichner
+-- Package get cleanups from Greg Klanderman and Jan Vroonhof
+-- Avoid defining CLASH_DETECTION on MS Windows NT from Adrian Aichner
+-- Package UI fixes from Jan Vroonhof
+
+to 21.0 "Poitou59"
+-- Menu accelerator bug fix from Didier Verna
 -- easymenu.el synch with FSF from Jan Vroonhof
 -- chartable bug fixes from Hrvoje Niksic
 -- Various MULE filenaming/localization bug fixes from Didier Verna
--- a/ChangeLog	Mon Aug 13 10:47:10 2007 +0200
+++ b/ChangeLog	Mon Aug 13 10:47:35 2007 +0200
@@ -1,3 +1,7 @@
+1998-12-11  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.60 is released
+
 1998-12-08  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.59 is released
--- a/lib-src/ChangeLog	Mon Aug 13 10:47:10 2007 +0200
+++ b/lib-src/ChangeLog	Mon Aug 13 10:47:35 2007 +0200
@@ -1,3 +1,7 @@
+1998-12-11  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.60 is released
+
 1998-12-08  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.59 is released
--- a/lisp/ChangeLog	Mon Aug 13 10:47:10 2007 +0200
+++ b/lisp/ChangeLog	Mon Aug 13 10:47:35 2007 +0200
@@ -1,3 +1,53 @@
+1998-12-11  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.60 is released
+
+1998-12-04  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* wid-edit.el (widget-echo-this-extent): Set
+	help-echo-owns-message to t.
+
+1998-12-10  SL Baur  <steve@altair.xemacs.org>
+
+	* package-admin.el (package-admin-add-binary-package): Grammar
+	fix.
+
+1998-12-01  Greg Klanderman  <greg@alphatech.com>
+
+	* package-get.el (package-get-locate-index-file): change argument
+	to `force-current'.  error out if force-current is set and no
+	download sites are specified.
+
+1998-12-01  Jan Vroonhof <vroonhof@math.ethz.ch>
+
+	* package-get.el (package-get): If we cannot find a package
+	  because package-get-remote is not set, give a more helpful
+	  error message.
+
+1998-11-30  Greg Klanderman  <greg@alphatech.com>
+
+	* package-get.el (package-get-remote-filename): use an EFS path
+	with user anonymous if no user is specified.
+
+1998-12-01  Didier Verna  <verna@inf.enst.fr>
+
+	* hyper-apropos.el (hyper-where-is): added the missing autoload.
+
+1998-12-10  Jan Vroonhof  <vroonhof@math.ethz.ch>
+
+	* faces.el (face-spec-set): Re-init fallfacks for default after
+	calling reset-face on the default face.
+
+1998-12-10  Jan Vroonhof  <vroonhof@math.ethz.ch>
+
+	* package-admin.el (package-admin-default-install-function):
+	Behave as advertised.  Make sure the pkg-dir is proper for
+	default-directory.
+	(package-admin-add-binary-package): Make sure the pkg-dir is
+	proper for default-directory.
+	(package-admin-install-function-mswindows): Make sure the pkg-dir
+	is proper for default-directory.
+
 1998-12-08  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.59 is released
@@ -307,7 +357,7 @@
 	  mswindows-make-font-bold / -bold-italic: Supplied device was
 	  not being passed into call to mswindows-find-smaller-font.
 
-1998-09-10  Björn Torkelsson  <torkel@hpc2n.umu.se>
+1998-09-10  Bjrn Torkelsson  <torkel@hpc2n.umu.se>
 
 	* package-get.el (package-get-remote): Fix the path where to find
 	  the packages on xemacs.org.
--- a/lisp/faces.el	Mon Aug 13 10:47:10 2007 +0200
+++ b/lisp/faces.el	Mon Aug 13 10:47:35 2007 +0200
@@ -1209,6 +1209,8 @@
 	(init-face-from-resources face frame))
     (let ((frames (relevant-custom-frames)))
       (reset-face face)
+      (if (and (eq 'default face) (featurep 'x))
+	  (x-init-global-faces))
       (face-display-set face spec)
       (while frames
 	(face-display-set face spec (car frames))
--- a/lisp/hyper-apropos.el	Mon Aug 13 10:47:10 2007 +0200
+++ b/lisp/hyper-apropos.el	Mon Aug 13 10:47:35 2007 +0200
@@ -481,6 +481,7 @@
 	(setq hyper-apropos-prev-wconfig (current-window-configuration)))
     (hyper-apropos-get-doc symbol t nil this-ref-buffer)))
 
+;;;###autoload
 (defun hyper-where-is (symbol)
   "Print message listing key sequences that invoke specified command."
   (interactive (list (hyper-apropos-read-function-symbol "Where is function")))
--- a/lisp/package-admin.el	Mon Aug 13 10:47:10 2007 +0200
+++ b/lisp/package-admin.el	Mon Aug 13 10:47:35 2007 +0200
@@ -123,16 +123,20 @@
 
 (defun package-admin-install-function-mswindows (file pkg-dir buf)
   "Install function for mswindows"
-  (let ( (default-directory pkg-dir) )
-    (call-process "djtar" nil buf t "-x" file)
-    ))
+  (let ((default-directory (file-name-as-directory pkg-dir)))
+    (unless (file-directory-p default-directory)
+      (make-directory default-directory t))
+    (call-process "djtar" nil buf t "-x" file)))
 
 (defun package-admin-default-install-function (file pkg-dir buf)
   "Default function to install a package.
 Install package FILENAME into directory PKG-DIR, with any messages output
 to buffer BUF."
-  (let (filename)
-    (setq filename (expand-file-name file pkg-dir))
+  (let* ((pkg-dir (file-name-as-directory pkg-dir))
+	 (default-directory pkg-dir)
+	 (filename (expand-file-name file)))
+    (unless (file-directory-p pkg-dir)
+      (make-directory pkg-dir t))
     ;; Don't assume GNU tar.
     (if (shell-command (concat "gunzip -c " filename " | tar xvf -") buf)
 	0
@@ -320,10 +324,11 @@
 	start err-list
 	)
     (setq pkg-dir (package-admin-get-install-dir 'unknown pkg-dir))
-    ;; Insure that the current directory doesn't change
+    ;; Ensure that the current directory doesn't change
     (save-excursion
       (set-buffer buf)
-      (setq default-directory pkg-dir)
+      ;; This is not really needed
+      (setq default-directory (file-name-as-directory pkg-dir))
       (setq case-fold-search t)
       (buffer-disable-undo)
       (goto-char (setq start (point-max)))
--- a/lisp/package-get.el	Mon Aug 13 10:47:10 2007 +0200
+++ b/lisp/package-get.el	Mon Aug 13 10:47:35 2007 +0200
@@ -320,10 +320,12 @@
           (and (not nil-if-not-found)
                file)))))
 
-(defun package-get-locate-index-file (no-remote)
-  "Locate the package-get index file.  Do not return remote paths if NO-REMOTE
-is non-nil."
-  (or (package-get-locate-file package-get-base-filename t no-remote)
+(defun package-get-locate-index-file (force-current)
+  "Locate the package-get index file.
+If FORCE-CURRENT is non-nil, require a current copy to be found."
+  (when (and force-current (not package-get-remote))
+    (error "No remote package sites specified in `package-get-remote'"))
+  (or (package-get-locate-file package-get-base-filename t (not force-current))
       (locate-data-file package-get-base-filename)
       package-get-base-filename))
 
@@ -332,7 +334,7 @@
 (defun package-get-maybe-save-index (filename)
   "Offer to save the current buffer as the local package index file,
 if different."
-  (let ((location (package-get-locate-index-file t)))
+  (let ((location (package-get-locate-index-file nil)))
     (unless (and filename (equal filename location))
       (unless (equal (md5 (current-buffer))
 		     (with-temp-buffer
@@ -350,7 +352,7 @@
   "Update the package-get database file with entries from DB-FILE.
 Unless FORCE-CURRENT is non-nil never try to update the database."
   (interactive
-   (let ((dflt (package-get-locate-index-file nil)))
+   (let ((dflt (package-get-locate-index-file t)))
      (list (read-file-name "Load package-get database: "
                            (file-name-directory dflt)
                            dflt
@@ -358,7 +360,7 @@
                            (file-name-nondirectory dflt)))))
   (setq db-file (expand-file-name (or db-file
                                       (package-get-locate-index-file
-				         (not force-current)))))
+                                       force-current))))
   (if (not (file-exists-p db-file))
       (error "Package-get database file `%s' does not exist" db-file))
   (if (not (file-readable-p db-file))
--- a/lisp/wid-edit.el	Mon Aug 13 10:47:10 2007 +0200
+++ b/lisp/wid-edit.el	Mon Aug 13 10:47:35 2007 +0200
@@ -302,6 +302,7 @@
     (and (functionp help-echo)
 	 (setq help-echo (funcall help-echo widget)))
     (when (stringp help-echo)
+      (setq help-echo-owns-message t)
       (display-message 'help-echo help-echo))))
 
 (defsubst widget-handle-help-echo (extent help-echo)
--- a/man/ChangeLog	Mon Aug 13 10:47:10 2007 +0200
+++ b/man/ChangeLog	Mon Aug 13 10:47:35 2007 +0200
@@ -1,3 +1,7 @@
+1998-12-11  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.60 is released
+
 1998-12-08  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.59 is released
--- a/nt/ChangeLog	Mon Aug 13 10:47:10 2007 +0200
+++ b/nt/ChangeLog	Mon Aug 13 10:47:35 2007 +0200
@@ -1,3 +1,21 @@
+1998-12-11  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.60 is released
+
+1998-11-04  Adrian Aichner  <aichner@ecf.teradyne.com>
+
+	* xemacs.mak: Creating minimal versions of Installation,
+	  Installation.el, and config.values to make
+	  (describe-installation) and (config-value ...) work in Windows
+	  NT native builds.  Incorporating rule for movemail.exe courtesy
+	  of Andy Piper.
+
+1998-12-03  Adrian Aichner  <aichner@ecf.teradyne.com>
+
+	* config.h: HAVE_LONG_FILE_NAMES no longer causes CLASH_DETECTION
+	to be defined.	File-locking is implemented using symbolic links,
+	which Windows NT dearly misses.
+
 1998-12-08  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.59 is released
--- a/nt/config.h	Mon Aug 13 10:47:10 2007 +0200
+++ b/nt/config.h	Mon Aug 13 10:47:35 2007 +0200
@@ -175,10 +175,6 @@
 
 #define HAVE_LONG_FILE_NAMES
 
-#ifdef HAVE_LONG_FILE_NAMES
-#define CLASH_DETECTION
-#endif
-
 #undef HAVE_LIBKSTAT
 #undef HAVE_LIBINTL
 #undef HAVE_LIBDNET
--- a/nt/xemacs.mak	Mon Aug 13 10:47:10 2007 +0200
+++ b/nt/xemacs.mak	Mon Aug 13 10:47:35 2007 +0200
@@ -219,7 +219,7 @@
 !if [set CONF_REPORT_ALREADY_PRINTED=1]
 !endif
 !message ------------------------------------------------
-!message Configured for "$(EMACS_CONFIGURATION)".
+!message XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename) configured for "$(EMACS_CONFIGURATION)".
 !message 
 !message Installation directory is "$(INSTALL_DIR)".
 !message Package path is $(PATH_PACKAGEPATH).
@@ -398,6 +398,47 @@
 
 OUTDIR=obj
 
+#
+# Creating simplified versions of Installation and Installation.el
+#
+# Some values cannot be written on the same line with
+# their key, since they cannot be put inside an echo command.
+# Macro substitution (:"=\", :\=\\) can be performed on values in order
+# to create a legal string in LISP for Installation.el.
+#
+!if [echo OS: $(OS)>Installation] ||\
+[echo XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename:"=\") configured for ^`$(EMACS_CONFIGURATION)^'.>>Installation] ||\
+[echo Where should the build process find the source code?>>Installation] ||\
+[echo $(MAKEDIR:\=\\)>>Installation]
+!endif
+# Compiler Information
+!if defined(CCV) &&\
+[echo What compiler should XEmacs be built with?>>Installation] &&\
+[echo $(CCV)>>Installation]
+!endif
+# Window System Information
+!if [echo What window system should XEmacs use?>>Installation]
+!endif
+!if (defined (HAVE_X) && $(HAVE_X) == 1)
+!if [echo X11>>Installation]
+!endif
+!endif
+!if (defined (HAVE_MSW) && $(HAVE_MSW) == 1)
+!if [echo MS Windows>>Installation]
+!endif
+!endif
+!if (!defined (HAVE_MSW) && !defined (HAVE_X))
+!if [echo Please specify at least one HAVE_MSW^=1 and^/or HAVE_X^=1>>Installation]
+!endif
+!endif
+# Creation of Installation.el
+!if [type Installation] ||\
+[echo (setq Installation-string ^">Installation.el] ||\
+[type Installation >>Installation.el] ||\
+[echo ^")>>Installation.el]
+!endif
+
+
 #------------------------------------------------------------------------------
 
 default: $(OUTDIR)\nul all 
@@ -430,6 +471,29 @@
 LIB_SRC = $(XEMACS)\lib-src
 LIB_SRC_DEFINES = -DHAVE_CONFIG_H -DWIN32 -DWINDOWSNT
 
+#
+# Creating config.values to be used by config.el
+#
+CONFIG_VALUES = $(LIB_SRC)\config.values
+!if [echo Creating $(CONFIG_VALUES) && echo ;;; Do not edit this file!>$(CONFIG_VALUES)]
+!endif
+# MAKEDIR has to be made into a string.
+!if [echo blddir>>$(CONFIG_VALUES) && echo ^"$(MAKEDIR:\=\\)\\..^">>$(CONFIG_VALUES)]
+!endif
+!if [echo CC>>$(CONFIG_VALUES) && echo ^"$(CC:\=\\)^">>$(CONFIG_VALUES)]
+!endif
+!if [echo CFLAGS>>$(CONFIG_VALUES) && echo ^"$(CFLAGS:\=\\)^">>$(CONFIG_VALUES)]
+!endif
+!if [echo CPP>>$(CONFIG_VALUES) && echo ^"$(CPP:\=\\)^">>$(CONFIG_VALUES)]
+!endif
+!if [echo CPPFLAGS>>$(CONFIG_VALUES) && echo ^"$(CPPFLAGS:\=\\)^">>$(CONFIG_VALUES)]
+!endif
+!if [echo LISPDIR>>$(CONFIG_VALUES) && echo ^"$(MAKEDIR:\=\\)\\$(LISP:\=\\)^">>$(CONFIG_VALUES)]
+!endif
+# PATH_PACKAGEPATH is already a quoted string.
+!if [echo PACKAGE_PATH>>$(CONFIG_VALUES) && echo $(PATH_PACKAGEPATH)>>$(CONFIG_VALUES)]
+!endif
+
 # Inferred rule
 {$(LIB_SRC)}.c{$(LIB_SRC)}.exe :
 	@cd $(LIB_SRC)
@@ -439,7 +503,7 @@
 # Individual dependencies
 ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(LIB_SRC)/../src/regex.c
 $(LIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS)
-$(LIB_SRC)/movemail.exe: $(LIB_SRC)/movemail.c $(ETAGS_DEPS)
+$(LIB_SRC)/movemail.exe: $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS)
 
 LIB_SRC_TOOLS = \
 	$(LIB_SRC)/make-docfile.exe	\
@@ -951,6 +1015,7 @@
 	@del "$(INSTALL_DIR)\lock\README"
 	@xcopy /q $(LIB_SRC)\*.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\"
 	@copy $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
+	@copy $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
 	@copy $(XEMACS)\src\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
 	@copy $(RUNEMACS) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
 	@xcopy /e /q $(XEMACS)\etc  "$(INSTALL_DIR)\etc\"
@@ -985,6 +1050,7 @@
 	del *.orig
 	del *.rej
 	del *.exe
+	del $(CONFIG_VALUES)
 	cd $(LISP)
 	-del /s /q *.bak *.elc *.orig *.rej
 
--- a/src/ChangeLog	Mon Aug 13 10:47:10 2007 +0200
+++ b/src/ChangeLog	Mon Aug 13 10:47:35 2007 +0200
@@ -1,3 +1,12 @@
+1998-12-11  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.60 is released
+
+1998-12-03  Andy Piper  <andy@xemacs.org>
+
+	* glyphs-msw.c (init_image_instance_from_xbm_inline): assign
+	hotspot lisp objects rather than erronously using XSETINT.
+
 1998-12-08  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.59 is released
--- a/src/glyphs-msw.c	Mon Aug 13 10:47:10 2007 +0200
+++ b/src/glyphs-msw.c	Mon Aug 13 10:47:35 2007 +0200
@@ -1732,10 +1732,10 @@
 	if (NILP (background))
 	  background = pointer_bg;
 
-	XSETINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii), 
-		 find_keyword_in_vector (instantiator, Q_hotspot_x));
-	XSETINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii), 
-		 find_keyword_in_vector (instantiator, Q_hotspot_y));
+	IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii) = 
+	  find_keyword_in_vector (instantiator, Q_hotspot_x);
+	IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii) = 
+	  find_keyword_in_vector (instantiator, Q_hotspot_y);
 	IMAGE_INSTANCE_PIXMAP_FG (ii) = foreground;
 	IMAGE_INSTANCE_PIXMAP_BG (ii) = background;
 	if (COLOR_INSTANCEP (foreground))
--- a/src/menubar-x.c	Mon Aug 13 10:47:10 2007 +0200
+++ b/src/menubar-x.c	Mon Aug 13 10:47:35 2007 +0200
@@ -124,6 +124,11 @@
 	{
 	  wv->name = string_chars;
 	  wv->enabled = 1;
+	  /* dverna Dec. 98: command_builder_operate_menu_accelerator will
+	     manipulate the accel as a Lisp_Object if the widget has a name.
+	     Since simple labels have a name, but no accel, we *must* set it
+	     to nil */
+	  wv->accel = LISP_TO_VOID (Qnil);
 	}
     }
   else if (VECTORP (desc))
@@ -255,7 +260,7 @@
 	      /* Add a fake entry so the menus show up */
 	      wv->contents = dummy = xmalloc_widget_value ();
 	      dummy->name = "(inactive)";
-	      dummy->accel = NULL;
+	      dummy->accel = LISP_TO_VOID (Qnil);
 	      dummy->enabled = 0;
 	      dummy->selected = 0;
 	      dummy->value = NULL;
--- a/version.sh	Mon Aug 13 10:47:10 2007 +0200
+++ b/version.sh	Mon Aug 13 10:47:35 2007 +0200
@@ -1,8 +1,8 @@
 #!/bin/sh
 emacs_major_version=21
 emacs_minor_version=0
-emacs_beta_version=59
-xemacs_codename="Poitou59"
+emacs_beta_version=60
+xemacs_codename="Poitou60"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=6