From xemacs-m  Thu Jul 10 07:41:27 1997
Received: from jagor.srce.hr (hniksic@jagor.srce.hr [161.53.2.130])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id HAA05283
	for <xemacs-beta@xemacs.org>; Thu, 10 Jul 1997 07:41:26 -0500 (CDT)
Received: (from hniksic@localhost)
	by jagor.srce.hr (8.8.6/8.8.6) id OAA11909;
	Thu, 10 Jul 1997 14:41:24 +0200 (MET DST)
To: XEmacs Developers <xemacs-beta@xemacs.org>
Subject: [PATCH] `system-configuration-options'
X-Attribution: Hrv
X-Face: Mie8:rOV<\c/~z{s.X4A{!?vY7{drJ([U]0O=W/<W*SMo/Mv:58:*_y~ki>xDi&N7XG
        KV^$k0m3Oe/)'e%3=$PCR&3ITUXH,cK>]bci&<qQ>Ff%x_>1`T(+M2Gg/fgndU%k*ft
        [(7._6e0n-V%|%'[c|q:;}td$#INd+;?!-V=c8Pqf}3J
From: Hrvoje Niksic <hniksic@srce.hr>
Date: 10 Jul 1997 14:41:23 +0200
Message-ID: <kig4ta3w03w.fsf@jagor.srce.hr>
Lines: 109
X-Mailer: Gnus v5.4.59/XEmacs 20.3(beta12) - "Helsinki"

This is usable in things like emacsbug.el.  It was quite trivial to
port/implement.

Top-level ChangeLog:

1997-07-10  Hrvoje Niksic  <hniksic@srce.hr>

	* configure.in (SUBDIR_MAKEFILES): Define EMACS_CONFIG_OPTIONS.

Lisp ChangeLog:

1997-07-10  Hrvoje Niksic  <hniksic@srce.hr>

	* packages/emacsbug.el (report-xemacs-bug): Specify local keymap
 	correctly.
	(report-xemacs-bug): Reenable `system-configuration-options';
 	cosmetic changes.

C ChangeLog:

1997-07-10  Hrvoje Niksic  <hniksic@srce.hr>

	* config.h.in: Declare EMACS_CONFIG_OPTIONS.

	* emacs.c (vars_of_emacs): Define `system-configuration-options'.

Patch:

--- configure.in.orig	Thu Jul 10 14:01:42 1997
+++ configure.in	Thu Jul 10 14:01:49 1997
@@ -3291,6 +3291,7 @@
 AC_SUBST(dynodump_arch)
 
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "$canonical")
+AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}")
 AC_DEFINE_UNQUOTED(config_machfile,  "$machfile")
 AC_DEFINE_UNQUOTED(config_opsysfile, "$opsysfile")
 
--- src/config.h.in.orig	Thu Jul 10 14:03:49 1997
+++ src/config.h.in	Thu Jul 10 14:04:15 1997
@@ -54,6 +54,9 @@
    for the lib-src programs. */
 #undef EMACS_CONFIGURATION
 
+/* The configuration options.  This is exported to Lisp. */
+#undef EMACS_CONFIG_OPTIONS
+
 /* The version info from version.sh. Used in #pragma ident in emacs.c */
 #undef EMACS_MAJOR_VERSION
 #undef EMACS_MINOR_VERSION
--- lisp/packages/emacsbug.el.orig	Thu Jul 10 12:44:25 1997
+++ lisp/packages/emacsbug.el	Thu Jul 10 14:28:45 1997
@@ -40,9 +40,7 @@
 (require 'sendmail)
 
 ;; XEmacs:  Screen for whether a beta version is running and redirect
-;; reports to the beta list instead of the newsgroup.  I don't think
-;; there's an XEmacs equivalent to system-configuration-options, but
-;; there should be.  -sb
+;; reports to the beta list instead of the newsgroup.
 (defvar report-emacs-bug-pretest-address "xemacs-beta@xemacs.org"
   "Address of mailing list for XEmacs beta bugs.")
 
@@ -70,8 +68,7 @@
 	(goto-char (point-min))
 	(re-search-forward (concat "^" (regexp-quote mail-header-separator) "\n"))
 	(insert "In " (emacs-version) "\n")
-	(if (and (boundp 'system-configuration-options)
-		 system-configuration-options
+	(if (and system-configuration-options
 		 (not (equal system-configuration-options "")))
 	    (insert "configured using `configure "
 		    system-configuration-options "'\n"))
@@ -115,7 +112,10 @@
 	;; in order to send easily.
 	;; XEmacs:  FSF non-abstraction of data?
 	;; (use-local-map (nconc (make-sparse-keymap) (current-local-map)))
-	(use-local-map (current-local-map))
+	;; Ghod intended it this way:
+	(use-local-map (let ((map (make-sparse-keymap)))
+			 (set-keymap-parents map (list (current-local-map)))
+			 map))
 	(define-key (current-local-map) "\C-c\C-i" 'report-emacs-bug-info)
 	(with-output-to-temp-buffer "*Bug Help*"
 	  (princ (substitute-command-keys
@@ -123,11 +123,11 @@
 	  (princ (substitute-command-keys
 		  "Type \\[kill-buffer] RET to cancel (don't send it).\n"))
 	  (terpri)
-	  (princ (substitute-command-keys
-		  "Type \\[report-emacs-bug-info] to visit in Info the Emacs Manual section
-about when and how to write a bug report,
-and what information to supply so that the bug can be fixed.
-Type SPC to scroll through this section and its subsections.")))
+	  (princ (substitute-command-keys "\
+Type \\[report-emacs-bug-info] to visit in Info the Emacs Manual section
+about when and how to write a bug report, and what information to supply
+so that the bug can be fixed.
+Type `\\[delete-other-windows]' to remove this window.")))
 	;; Make it less likely people will send empty messages.
 	(make-local-variable 'mail-send-hook)
 	(add-hook 'mail-send-hook 'report-emacs-bug-hook)


-- 
Hrvoje Niksic <hniksic@srce.hr> | Student at FER Zagreb, Croatia
--------------------------------+--------------------------------
Thou Who might be our Father Who perhaps may be in Heaven...
                                                -- Roger Zelazny

