SL Baur <steve(a)xemacs.org&gt; writes: Unfortunately some of my patches have been only partially applied: 1. Due to all the confusion with the patch conflicts due to the patch from Greg that was included by mistake, the version of package-get.el that appears in 21.0 is now incorrect. The version that is in the XEmacs 21.2 is OK 2. A part of my gui*.* patch to include extra menu keyword was not included (problem in both branches). It IS in src/Changelog 1999-01-04 Jan Vroonhof <vroonhof(a)math.ethz.ch&gt; * package-get: Sync again with 21.2 version (undoes premature patch applied by mistake). bolzano:/scratch/vroonhof/cvs/xemacs-20> cvs diff lisp/package-get.el Index: lisp/package-get.el =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs-20/lisp/package-get.el,v retrieving revision 1.24 diff -u -r1.24 package-get.el --- package-get.el 1999/01/04 01:34:38 1.24 +++ package-get.el 1999/01/05 00:36:43 ＠＠ -261,8 +261,7 ＠＠ "Build the `Add Download Site' menu." (mapcar (lambda (site) (vector (car site) - `(lambda () - (interactive) (package-ui-add-site (quote ,(cdr site)))) + `(package-ui-add-site (quote ,(cdr site))) :style 'toggle :selected `(member (quote ,(cdr site)) package-get-remote))) package-get-download-sites)) ＠＠ -324,12 +323,10 ＠＠ (and (not nil-if-not-found) file))))) -(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)) +(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) (locate-data-file package-get-base-filename) package-get-base-filename)) ＠＠ -338,7 +335,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 nil))) + (let ((location (package-get-locate-index-file t))) (unless (and filename (equal filename location)) (unless (equal (md5 (current-buffer)) (with-temp-buffer ＠＠ -356,7 +353,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 t))) + (let ((dflt (package-get-locate-index-file nil))) (list (read-file-name "Load package-get database: " (file-name-directory dflt) dflt ＠＠ -364,7 +361,7 ＠＠ (file-name-nondirectory dflt))))) (setq db-file (expand-file-name (or db-file (package-get-locate-index-file - force-current)))) + (not 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)) [The Changelog for this is already in src/Changelogs] bolzano:/scratch/vroonhof/cvs/xemacs-20> cvs diff -u src/gui*.* Index: src/gui-x.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/gui-x.c,v retrieving revision 1.15 diff -u -u -r1.15 gui-x.c --- gui-x.c 1998/07/28 06:25:20 1.15 +++ gui-x.c 1999/01/05 03:02:51 ＠＠ -401,6 +401,8 ＠＠ if (EQ (key, Q_active)) active_p = val; else if (EQ (key, Q_suffix)) suffix = val; else if (EQ (key, Q_keys)) keys = val; + else if (EQ (key, Q_key_sequence)) ; /* ignored for FSF compat */ + else if (EQ (key, Q_label)) ; /* implement for 21.0 */ else if (EQ (key, Q_style)) style = val; else if (EQ (key, Q_selected)) selected_p = val, selected_spec = 1; else if (EQ (key, Q_included)) include_p = val, included_spec = 1; cvs server: I know nothing about src/gui-x.o cvs server: I know nothing about src/gui.o