changeset: 5284:5efbd1253905 user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Mon Jun 07 18:42:10 2010 +0100 files: ChangeLog configure configure.ac lisp/ChangeLog lisp/dumped-lisp.el lisp/loadup.el lisp/packages.el lisp/simple.el lisp/startup.el lisp/toolbar.el lisp/version.el src/ChangeLog src/config.h.in src/device-gtk.c src/device-x.c src/emacs.c src/lread.c tests/ChangeLog tests/gtk/gtk-test.el version.sh.in description: Remove all support for InfoDock. src/ChangeLog addition: 2010-06-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; * lread.c (vars_of_lread): * emacs.c: (shut_down_emacs, vars_of_emacs, complex_vars_of_emacs): * device-x.c (get_device_from_display) (have_xemacs_resources_in_xrdb): * device-gtk.c (Fgtk_init): * config.h.in: Remove all checks for InfoDock. lisp/ChangeLog addition: 2010-06-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; * version.el: (emacs-version): * startup.el (command-line): * simple.el (display-warning, emacs-name): * packages.el (packages-package-hierarchy-directory-names): * loadup.el (Dumping): * dumped-lisp.el (preloaded-file-list): Remove all InfoDock-specific code. diff -r fbd1485af104 -r 5efbd1253905 ChangeLog --- a/ChangeLog Sun Jun 06 13:24:31 2010 +0100 +++ b/ChangeLog Mon Jun 07 18:42:10 2010 +0100 ＠＠ -1,3 +1,9 ＠＠ +2010-06-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * version.sh.in: + * configure.ac (XE_COMPLEX_ARG, XE_EXPAND_VARIABLE): + Remove conditionals and information for InfoDock. + 2010-04-09 Ben Wing <ben(a)xemacs.org&gt; * CHANGES-beta: diff -r fbd1485af104 -r 5efbd1253905 configure --- a/configure Sun Jun 06 13:24:31 2010 +0100 +++ b/configure Mon Jun 07 18:42:10 2010 +0100 ＠＠ -1005,8 +1005,6 ＠＠ with_workshop enable_sparcworks with_sparcworks -enable_infodock -with_infodock enable_debug with_debug enable_error_checking ＠＠ -1952,8 +1950,6 ＠＠ --with-workshop Support the Sun WorkShop (formerly Sparcworks) development environment. --with-sparcworks Alias for --with-workshop - --with-infodock Support the Infodock version of XEmacs. Infodock is - a SourceForge project). Debugging options ----------------- ＠＠ -5190,22 +5186,6 ＠＠ withval="$with_sparcworks" fi; -# If --with-infodock or --without-infodock were given then copy the value to the -# equivalent enable_infodock variable. -if test "${with_infodock+set}" = set; then - enable_infodock="$with_infodock" -fi; -# If -enable-infodock or --disable-infodock were given then copy the value to the -# equivalent with_infodock variable. -if test "${enable_infodock+set}" = set; then - with_infodock="$enable_infodock" -fi; -# Check whether --with-infodock or --without-infodock was given. -if test "${with_infodock+set}" = set; then - enableval="$with_infodock" - withval="$with_infodock" - -fi; # If --with-debug or --without-debug were given then copy the value to the # equivalent enable_debug variable. ＠＠ -5716,34 +5696,8 ＠＠ _ACEOF -if test "$with_infodock" = "yes"; then - if test ! -f ../../ID-INSTALL; then - echo "Cannot build InfoDock without InfoDock sources" - with_infodock=no - fi -fi - -if test "$with_infodock" = "yes"; then - cat >>confdefs.h <<_ACEOF -#define INFODOCK_MAJOR_VERSION $infodock_major_version -_ACEOF - - cat >>confdefs.h <<_ACEOF -#define INFODOCK_MINOR_VERSION $infodock_minor_version -_ACEOF - - cat >>confdefs.h <<_ACEOF -#define INFODOCK_BUILD_VERSION $infodock_build_version -_ACEOF - - version=${infodock_major_version}.${infodock_minor_version}.${infodock_build_version} - PROGNAME=infodock - SHEBANG_PROGNAME=infodock-script - CPPFLAGS="$CPPFLAGS -DINFODOCK" -else - PROGNAME=xemacs - SHEBANG_PROGNAME=xemacs-script -fi +PROGNAME=xemacs +SHEBANG_PROGNAME=xemacs-script diff -r fbd1485af104 -r 5efbd1253905 configure.ac --- a/configure.ac Sun Jun 06 13:24:31 2010 +0100 +++ b/configure.ac Mon Jun 07 18:42:10 2010 +0100 ＠＠ -977,9 +977,6 ＠＠ XE_MERGED_ARG([sparcworks], AS_HELP_STRING([--with-sparcworks],[Alias for --with-workshop]), [], []) -XE_MERGED_ARG([infodock], - AS_HELP_STRING([--with-infodock],[Support the Infodock version of XEmacs. Infodock is a SourceForge project).]), - [], []) dnl XE_HELP_SUBSECTION([Debugging options]) XE_MERGED_ARG([debug], ＠＠ -1228,27 +1225,8 ＠＠ fi AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") -if test "$with_infodock" = "yes"; then - if test ! -f ../../ID-INSTALL; then - echo "Cannot build InfoDock without InfoDock sources" - with_infodock=no - fi -fi - -if test "$with_infodock" = "yes"; then - dnl InfoDock version numbers. XEmacs will use the same style of numbering - dnl after the release of XEmacs 21.0. - AC_DEFINE_UNQUOTED(INFODOCK_MAJOR_VERSION, $infodock_major_version) - AC_DEFINE_UNQUOTED(INFODOCK_MINOR_VERSION, $infodock_minor_version) - AC_DEFINE_UNQUOTED(INFODOCK_BUILD_VERSION, $infodock_build_version) - version=${infodock_major_version}.${infodock_minor_version}.${infodock_build_version} - PROGNAME=infodock - SHEBANG_PROGNAME=infodock-script - CPPFLAGS="$CPPFLAGS -DINFODOCK" -else - PROGNAME=xemacs - SHEBANG_PROGNAME=xemacs-script -fi +PROGNAME=xemacs +SHEBANG_PROGNAME=xemacs-script AC_SUBST(SHEBANG_PROGNAME) diff -r fbd1485af104 -r 5efbd1253905 lisp/ChangeLog --- a/lisp/ChangeLog Sun Jun 06 13:24:31 2010 +0100 +++ b/lisp/ChangeLog Mon Jun 07 18:42:10 2010 +0100 ＠＠ -11,6 +11,17 ＠＠ specified by CL. For discussion; the compiler macro may be a little too aggressive about taking the compile time argument lists of the functions it is inverting. + +2010-06-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * version.el: + (emacs-version): + * startup.el (command-line): + * simple.el (display-warning, emacs-name): + * packages.el (packages-package-hierarchy-directory-names): + * loadup.el (Dumping): + * dumped-lisp.el (preloaded-file-list): + Remove all InfoDock-specific code. 2010-05-31 Aidan Kehoe <kehoea(a)parhasard.net&gt; diff -r fbd1485af104 -r 5efbd1253905 lisp/dumped-lisp.el --- a/lisp/dumped-lisp.el Sun Jun 06 13:24:31 2010 +0100 +++ b/lisp/dumped-lisp.el Mon Jun 07 18:42:10 2010 +0100 ＠＠ -148,10 +148,10 ＠＠ ;; should just be able to assume that, if (featurep 'menubar), ;; the menubar should work and if items are added, they can be ;; seen clearly and usefully. - (when (featurep '(and (not infodock) menubar)) "menubar-items") - (when (featurep '(and gutter)) "gutter-items") - (when (featurep '(and (not infodock) toolbar)) "toolbar-items") - (when (featurep '(and (not infodock) dialog)) "dialog-items") + (when (featurep 'menubar) "menubar-items") + (when (featurep 'gutter) "gutter-items") + (when (featurep 'toolbar) "toolbar-items") + (when (featurep 'dialog) "dialog-items") ;;;;;;;;;;;;;;;;;; Coding-system support "coding" ＠＠ -234,12 +234,6 ＠＠ ;;; mule-load.el ends here -;; preload InfoDock stuff. should almost certainly not be here if -;; id-menus is not here. infodock needs to figure out a clever way to -;; advise this stuff or we need to export a clean way for infodock or -;; others to control this programmatically. - (when (featurep '(and infodock (or x mswindows gtk) menubar)) - "id-menus") ;; preload the X code. (when (featurep '(and x scrollbar)) "x-scrollbar") (when (featurep 'x) diff -r fbd1485af104 -r 5efbd1253905 lisp/loadup.el --- a/lisp/loadup.el Sun Jun 06 13:24:31 2010 +0100 +++ b/lisp/loadup.el Mon Jun 07 18:42:10 2010 +0100 ＠＠ -264,12 +264,7 ＠＠ load-always-display-messages nil debug-on-error nil) (dump-emacs - (cond - ((featurep 'infodock) "infodock") - ;; #### BILL!!! - ;; If we want to dump under a name other than `xemacs', do that here! - ;; ((featurep 'gtk) "xemacs-gtk") - (t "xemacs")) + "xemacs" "temacs") (kill-emacs)) diff -r fbd1485af104 -r 5efbd1253905 lisp/packages.el --- a/lisp/packages.el Sun Jun 06 13:24:31 2010 +0100 +++ b/lisp/packages.el Mon Jun 07 18:42:10 2010 +0100 ＠＠ -107,7 +107,6 ＠＠ These are the valid immediate directory names of package directories, directories with higher priority first" (delq nil `("site-packages" - ,(when (featurep 'infodock) "infodock-packages") ,(when (featurep 'mule) "mule-packages") "xemacs-packages"))) diff -r fbd1485af104 -r 5efbd1253905 lisp/simple.el --- a/lisp/simple.el Sun Jun 06 13:24:31 2010 +0100 +++ b/lisp/simple.el Mon Jun 07 18:42:10 2010 +0100 ＠＠ -4681,8 +4681,7 ＠＠ (or level (setq level 'warning)) (or (listp class) (setq class (list class))) (check-argument-type 'warning-level-p level) - (if (and (not (featurep 'infodock)) - (not init-file-loaded)) + (if (not init-file-loaded) (push (list class message level) before-init-deferred-warnings) (catch 'ignored (let ((display-p t) ＠＠ -4772,8 +4771,7 ＠＠ (defun emacs-name () "Return the printable name of this instance of Emacs." - (cond ((featurep 'infodock) "InfoDock") - ((featurep 'xemacs) "XEmacs") + (cond ((featurep 'xemacs) "XEmacs") (t "Emacs"))) (defun debug-print-1 (&rest args) diff -r fbd1485af104 -r 5efbd1253905 lisp/startup.el --- a/lisp/startup.el Sun Jun 06 13:24:31 2010 +0100 +++ b/lisp/startup.el Mon Jun 07 18:42:10 2010 +0100 ＠＠ -722,9 +722,7 ＠＠ (declare-fboundp (init-mule-at-startup))) (if (featurep 'toolbar) - (if (featurep 'infodock) - (require 'id-x-toolbar) - (init-toolbar))) + (init-toolbar)) ;; Create the initial device (which may be the already-created stdio ;; device, if we're noninteractive). diff -r fbd1485af104 -r 5efbd1253905 lisp/toolbar.el --- a/lisp/toolbar.el Sun Jun 06 13:24:31 2010 +0100 +++ b/lisp/toolbar.el Mon Jun 07 18:42:10 2010 +0100 ＠＠ -117,7 +117,6 ＠＠ ;; called from toolbar.c during device and frame initialization (defun init-toolbar-from-resources (locale) (if (and (featurep 'x) - (not (featurep 'infodock)) (or (eq locale 'global) (eq 'x (device-or-frame-type locale)))) (declare-fboundp (x-init-toolbar-from-resources locale)))) diff -r fbd1485af104 -r 5efbd1253905 lisp/version.el --- a/lisp/version.el Sun Jun 06 13:24:31 2010 +0100 +++ b/lisp/version.el Mon Jun 07 18:42:10 2010 +0100 ＠＠ -56,9 +56,6 ＠＠ " XEmacs Lucid") "Version numbers of this version of XEmacs.") -(if (featurep 'infodock) - (require 'id-vers)) - ;; Moved to C code as of XEmacs 20.3 ;(defconst emacs-major-version ; (progn (or (string-match "^[0-9]+" emacs-version) ＠＠ -95,9 +92,7 ＠＠ (format "XEmacs %s %s(%s%s) of %s %s on %s" (substring emacs-version 0 (string-match " XEmacs" emacs-version)) - (if (not (featurep 'infodock)) - "[Lucid] " - "") + "[Lucid] " system-configuration (cond ((or (and (fboundp 'featurep) (featurep 'mule)) diff -r fbd1485af104 -r 5efbd1253905 src/ChangeLog --- a/src/ChangeLog Sun Jun 06 13:24:31 2010 +0100 +++ b/src/ChangeLog Mon Jun 07 18:42:10 2010 +0100 ＠＠ -6,6 +6,17 ＠＠ applicable passes, with the exception that the ALLOW-OTHER-KEYS-NIL Common Lisp issue (functions with &key must *always* accept :allow-other-keys nil) hasn't been implemented. + +2010-06-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * lread.c (vars_of_lread): + * emacs.c: + (shut_down_emacs, vars_of_emacs, complex_vars_of_emacs): + * device-x.c (get_device_from_display) + (have_xemacs_resources_in_xrdb): + * device-gtk.c (Fgtk_init): + * config.h.in: + Remove all checks for InfoDock. 2010-06-01 Aidan Kehoe <kehoea(a)parhasard.net&gt; diff -r fbd1485af104 -r 5efbd1253905 src/config.h.in --- a/src/config.h.in Sun Jun 06 13:24:31 2010 +0100 +++ b/src/config.h.in Mon Jun 07 18:42:10 2010 +0100 ＠＠ -114,10 +114,6 ＠＠ #undef XEMACS_CODENAME #undef XEMACS_EXTRA_NAME #undef XEMACS_RELEASE_DATE -/* InfoDock versions, not used with XEmacs */ -#undef INFODOCK_MAJOR_VERSION -#undef INFODOCK_MINOR_VERSION -#undef INFODOCK_BUILD_VERSION /* Make functions from IEEE Stds 1003.[123] available. */ #undef _POSIX_C_SOURCE diff -r fbd1485af104 -r 5efbd1253905 src/device-gtk.c --- a/src/device-gtk.c Sun Jun 06 13:24:31 2010 +0100 +++ b/src/device-gtk.c Mon Jun 07 18:42:10 2010 +0100 ＠＠ -184,11 +184,7 ＠＠ slow_down_interrupts (); #ifdef HAVE_GNOME -#ifdef INFODOCK - gnome_init ("InfoDock", EMACS_VERSION, argc, argv); -#else gnome_init ("XEmacs", EMACS_VERSION, argc, argv); -#endif /* INFODOCK */ #else gtk_init (&argc, &argv); #endif diff -r fbd1485af104 -r 5efbd1253905 src/device-x.c --- a/src/device-x.c Sun Jun 06 13:24:31 2010 +0100 +++ b/src/device-x.c Mon Jun 07 18:42:10 2010 +0100 ＠＠ -149,13 +149,8 ＠＠ struct device * get_device_from_display (Display *dpy) { +#define FALLBACK_RESOURCE_NAME "xemacs" struct device *d = get_device_from_display_1 (dpy); - -#if !defined(INFODOCK) -# define FALLBACK_RESOURCE_NAME "xemacs" -# else -# define FALLBACK_RESOURCE_NAME "infodock" -#endif if (!d) { ＠＠ -344,11 +339,7 ＠＠ const char *xdefs, *key; int len; -#ifdef INFODOCK - key = "InfoDock"; -#else key = "XEmacs"; -#endif len = strlen (key); if (!dpy) ＠＠ -653,11 +644,7 ＠＠ { app_class = (NILP (Vx_emacs_application_class) && have_xemacs_resources_in_xrdb (dpy)) -#ifdef INFODOCK - ? "InfoDock" -#else ? "XEmacs" -#endif : "Emacs"; } else diff -r fbd1485af104 -r 5efbd1253905 src/emacs.c --- a/src/emacs.c Sun Jun 06 13:24:31 2010 +0100 +++ b/src/emacs.c Mon Jun 07 18:42:10 2010 +0100 ＠＠ -512,11 +512,6 ＠＠ Lisp_Object Vxemacs_codename; Lisp_Object Vxemacs_extra_name; Lisp_Object Vxemacs_release_date; -#ifdef INFODOCK -Lisp_Object Vinfodock_major_version; -Lisp_Object Vinfodock_minor_version; -Lisp_Object Vinfodock_build_version; -#endif /* The path under which XEmacs was invoked. */ Lisp_Object Vinvocation_path; ＠＠ -3636,15 +3631,9 ＠＠ "Your version of XEmacs was distributed with a PROBLEMS file that may describe\n" "your crash, and with luck a workaround. Please check it first, but do report\n" "the crash anyway.\n\n" -#ifdef INFODOCK -"Please report this bug by selecting `Report-Bug' in the InfoDock menu, or\n" -"(last resort) by emailing `xemacs-beta(a)xemacs.org&#39; -- note that this is for\n" -"XEmacs in general, not just Infodock." -#else "Please report this bug by invoking M-x report-emacs-bug, or by selecting\n" "`Send Bug Report' from the Help menu. If that won't work, send ordinary\n" "email to `xemacs-beta(a)xemacs.org&#39;.&quot; -#endif " *MAKE SURE* to include this entire\n" "output from this crash, especially including the Lisp backtrace, as well as\n" "the XEmacs configuration from M-x describe-installation (or equivalently,\n" ＠＠ -4343,22 +4332,6 ＠＠ Vemacs_beta_version = Qnil; #endif -#ifdef INFODOCK - DEFVAR_LISP ("infodock-major-version", &Vinfodock_major_version /* -Major version number of this InfoDock release. -*/ ); - Vinfodock_major_version = make_int (INFODOCK_MAJOR_VERSION); - - DEFVAR_LISP ("infodock-minor-version", &Vinfodock_minor_version /* -Minor version number of this InfoDock release. -*/ ); - Vinfodock_minor_version = make_int (INFODOCK_MINOR_VERSION); - - DEFVAR_LISP ("infodock-build-version", &Vinfodock_build_version /* -Build version of this InfoDock release. -*/ ); - Vinfodock_build_version = make_int (INFODOCK_BUILD_VERSION); -#endif DEFVAR_LISP ("xemacs-codename", &Vxemacs_codename /* Codename of this version of Emacs (a string). ＠＠ -4557,7 +4530,6 ＠＠ DEFVAR_LISP ("emacs-program-name", &Vemacs_program_name /* *Name of the Emacs variant. -For example, this may be \"xemacs\" or \"infodock\". This is mainly meant for use in path searching. */ ); Vemacs_program_name = build_extstring (PATH_PROGNAME, Qfile_name); diff -r fbd1485af104 -r 5efbd1253905 src/lread.c --- a/src/lread.c Sun Jun 06 13:24:31 2010 +0100 +++ b/src/lread.c Mon Jun 07 18:42:10 2010 +0100 ＠＠ -3460,9 +3460,6 ＠＠ #ifdef FEATUREP_SYNTAX DEFSYMBOL (Qfeaturep); Fprovide (intern ("xemacs")); -#ifdef INFODOCK - Fprovide (intern ("infodock")); -#endif /* INFODOCK */ #endif /* FEATUREP_SYNTAX */ #ifdef LISP_BACKQUOTES diff -r fbd1485af104 -r 5efbd1253905 tests/ChangeLog --- a/tests/ChangeLog Sun Jun 06 13:24:31 2010 +0100 +++ b/tests/ChangeLog Mon Jun 07 18:42:10 2010 +0100 ＠＠ -1,3 +1,8 ＠＠ +2010-06-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * gtk/gtk-test.el (gtk-test): + Remove a conditional for InfoDock. + 2010-04-05 Aidan Kehoe <kehoea(a)parhasard.net&gt; * automated/hash-table-tests.el: diff -r fbd1485af104 -r 5efbd1253905 tests/gtk/gtk-test.el --- a/tests/gtk/gtk-test.el Sun Jun 06 13:24:31 2010 +0100 +++ b/tests/gtk/gtk-test.el Mon Jun 07 18:42:10 2010 +0100 ＠＠ -1976,7 +1976,7 ＠＠ close-button (gtk-button-new-with-label "Quit")) (gtk-window-set-title window (format "%s/GTK %d.%d.%d" - (if (featurep 'infodock) "InfoDock" "XEmacs") + "XEmacs" emacs-major-version emacs-minor-version (or emacs-patch-level emacs-beta-version))) diff -r fbd1485af104 -r 5efbd1253905 version.sh.in --- a/version.sh.in Sun Jun 06 13:24:31 2010 +0100 +++ b/version.sh.in Mon Jun 07 18:42:10 2010 +0100 ＠＠ -5,8 +5,5 ＠＠ emacs_beta_version=29 xemacs_codename="garbanzo" emacs_kit_version= -infodock_major_version=4 -infodock_minor_version=0 -infodock_build_version=8 xemacs_release_date="2009-05-18" xemacs_extra_name= \ No newline at end of file _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches