Evgeny!
I'm rejecting this patch, sorry. Following is the diff with my
comments interspersed...
> --- orig/etc/sample.init.el
> +++ mod/etc/sample.init.el
The sample.init.el needs a complete rewrite anyway as much of it is
complete crap anyway.
> -(or (boundp 'running-xemacs)
> - (defvar running-xemacs (string-match "XEmacs\\|Lucid" emacs-version)))
> +(or (boundp 'running-sxemacs)
> + (defvar running-sxemacs (string-match "XEmacs\\|Lucid" emacs-version)))
I would have just removed this sexp completely, it's useless anyway.
> -; (cond ((and running-xemacs
> +; (cond ((and running-sxemacs
We are completely compatible with XEmacs, so this change is wrong. It
should either be left as it was, or changed to
(cond ((and (or running-xemacs running-sxemacs))
> --- orig/lisp/custom-load.el
> +++ mod/lisp/custom-load.el
I don't know what the hell is going on with this file... practically
every time I build SXEmacs, I get changes here.
Dammit! I want this file out of the repo!
> --- orig/lisp/loadup.el
> +++ mod/lisp/loadup.el
> @@ -37,10 +37,10 @@
> (when (fboundp 'error)
> (error "loadup.el already loaded!"))
> -(defvar running-xemacs t
> - "Non-nil when the current emacs is XEmacs.")
> +(defvar running-sxemacs t
> + "Non-nil when the current emacs is SXEmacs.")
No. `running-xemacs' must stay! But I don't mind adding the
`running-sxemacs', that's a good idea.
> (defvar preloaded-file-list nil
> - "List of files preloaded into the XEmacs binary image.")
> + "List of files preloaded into the SXEmacs binary image.")
> (defvar Installation-string nil
> "Description of XEmacs installation.")
> @@ -268,20 +268,20 @@
> ;(loadup-profile-results nil 'external-debugging-output)
> -;; Dump into the name `xemacs' (only)
> +;; Dump into the name `sxemacs' (only)
> (when (member "dump" command-line-args)
> - (message "Dumping under the name xemacs")
> + (message "Dumping under the name sxemacs")
> ;; This is handled earlier in the build process.
> - ;; (condition-case () (delete-file "xemacs") (file-error nil))
> + ;; (condition-case () (delete-file "sxemacs") (file-error nil))
> (when (fboundp 'really-free)
> (really-free))
> (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"))
> + ;; If we want to dump under a name other than `sxemacs', do that here!
> + ;; ((featurep 'gtk) "sxemacs-gtk")
> + (t "sxemacs"))
> "temacs")
> (kill-emacs))
This part is fine. But I wonder why I haven't had any problems in the
area with building?
> --- orig/man/xemacs-faq.texi
> +++ mod/man/xemacs-faq.texi
> @@ -2681,7 +2681,7 @@
> For all new code, all you really need to do is:
> @lisp
> -(defvar running-xemacs (string-match "XEmacs\\|Lucid" emacs-version))
> +(defvar running-sxemacs (string-match "SXEmacs" emacs-version))
> @end lisp
Bah! This is bogus. Change it to something like...
(if (or running-xemacs
running-sxemacs)
((S)XEmacs code here)
(Emacs code here))
> @node Q3.0.2, Q3.0.3, Q3.0.1, Customization
> @@ -4675,12 +4675,12 @@
> --- /opt/SUNWspro/lib/eserve.el.ORIG Fri May 14 15:23:26 1999
> +++ /opt/SUNWspro/lib/eserve.el Fri May 14 15:24:54 1999
> @@@@ -42,7 +42,7 @@@@
> - (defvar running-xemacs nil "t if we're running XEmacs")
> + (defvar running-sxemacs nil "t if we're running SXEmacs")
> (defvar running-emacs nil "t if we're running GNU Emacs 19")
> -(if (string-match "^\\(19\\|20\\)\..*\\(XEmacs\\|Lucid\\)" emacs-version)
> -+(if (string-match "\\(XEmacs\\|Lucid\\)" emacs-version)
> - (setq running-xemacs t)
> ++(if (string-match "SXEmacs" emacs-version)
> + (setq running-sxemacs t)
> (setq running-emacs t))
> @end format
No. Don't replace running-xemacs with running-sxemacs, just add
running-sxemacs.
Evgeny, the best way to redo this would be...
$ tla replay --reverse patch-1 RET
$ tla commit -s "reverting patch-1" RET
...and then start hacking again.
Thanks, Evgeny. I'm looking forward to seeing a merge request for
sxemacs--ckent--22.1.0--patch-3. :-)
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| In space, |
| No one can hear you rip a stinky |
|------------------------------------<steve@xxxxxxxxxxx>---|
pgp2p4RA2FCFl.pgp
Description: PGP signature
|