Attached are some fixes for compilation with XEmacs.
But there is one function missing and I am not sure if it will be
defined to be an alias to dvc-about-message-with-rolling or its
call should be replaced by it.
While compiling the end of the data in file .../dvc/lisp/tla.el:
** the function tla--message-with-rolling is not known to be defined.
Robert
# Bazaar revision bundle v0.8
#
# message:
# Fixed calls to undefined functions for XEmacs.
#
# committer: Robert Widhopf-Fenk <[EMAIL PROTECTED]>
# date: Mon 2006-08-21 23:05:53.065999985 +0200
=== modified file lisp/Makefile.in // last-changed:[EMAIL PROTECTED]
... 53986ddc2976c9ea
--- lisp/Makefile.in
+++ lisp/Makefile.in
@@ -35,7 +35,7 @@
SYMLINKS = @SYMLINKS@
LINKPATH = @LINKPATH@
-all: clean-some autoloads
+all: dvc-version.el clean-some autoloads
$(EMACS_COMP) -f package-maint-compile
install: install-el install-elc
@@ -96,10 +96,14 @@
##############################################################################
autoloads:
+ifeq ($(EMACS_FLAVOR),xemacs)
+ $(EMACS_COMP) -l autoload -eval '(setq autoload-package-name "xtla"
generated-autoload-file "./auto-autoloads.el")' -f batch-update-autoloads
+ $(EMACS_COMP) -batch -q -l cus-dep -f Custom-make-dependencies $(srcdir)
+else
$(EMACS_COMP) -f package-maint-make-cus-load $(srcdir)
$(EMACS_COMP) -f package-maint-make-auto-load $(srcdir)
$(EMACS_COMP) -f package-maint-make-load
-
+endif
##############################################################################
ARCH_DIR_EXISTS=${shell if [ -r '@top_srcdir@/{arch}' ]; then printf "%s" yes;
else printf "%s" no; fi }
=== modified file lisp/dvc-build.el
--- lisp/dvc-build.el
+++ lisp/dvc-build.el
@@ -34,6 +34,8 @@
(push srcdir load-path)
(push loaddir load-path)
+;(setq debug-on-error t)
+
;; The name of our package
(setq package-maint-pkg "dvc")
@@ -80,6 +82,8 @@
(defalias 'dvc-cmenu-mouse-avoidance-point-position
'mouse-avoidance-point-position)
;; External things
+ (autoload 'debug "debug")
+ (autoload 'tree-widget-action "tree-widget")
(autoload 'ad-add-advice "advice")
(autoload 'customize-group "cus-edit" nil t)
(autoload 'dired "dired" nil t)
=== modified file lisp/dvc-xemacs.el // last-changed:[EMAIL PROTECTED]
... 8-ba098d1d160ec6e4
--- lisp/dvc-xemacs.el
+++ lisp/dvc-xemacs.el
@@ -45,7 +45,10 @@
(eval-and-compile
(require 'overlay)
(require 'wid-edit)
- (require 'dvc-core))
+; The following require causes a infinite recursion as the (provide ...) is at
+; the file end. Thus we live with the warnings about unknown variables etc.
+; (require 'dvc-core)
+)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; fixes warnings about undefined variables
@@ -81,10 +84,12 @@
buffer-file)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(unless (functionp 'replace-regexp-in-string)
+; the unless check seems to fail
+;(unless (functionp 'replace-regexp-in-string)
(defun replace-regexp-in-string (regexp rep string
&optional fixedcase literal)
- (replace-in-string string regexp rep literal)))
+ (replace-in-string string regexp rep literal))
+;)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(unless (functionp 'line-end-position)
@@ -370,6 +375,9 @@
'line-number-at-pos
'line-number))
+
+(defvar allow-remote-paths nil)
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(provide 'dvc-xemacs)
=== modified file lisp/tla-core.el
--- lisp/tla-core.el
+++ lisp/tla-core.el
@@ -870,7 +870,7 @@
Return the log as a string."
(with-current-buffer (or buffer (current-buffer))
- (set-buffer-multibyte nil)
+ (dvc-funcall-if-exists set-buffer-multibyte nil)
(let ((chars (string-to-number
(buffer-substring-no-properties
(point)
@@ -888,7 +888,7 @@
Same as `tla--read-complete-log-string', but don't return anything and
is faster."
(with-current-buffer (or buffer (current-buffer))
- (set-buffer-multibyte nil)
+ (dvc-funcall-if-exists set-buffer-multibyte nil)
(let ((chars (string-to-number
(buffer-substring-no-properties
(point)
=== modified file lisp/xhg.el // last-changed:[EMAIL PROTECTED]
... d1d160ec6e4
--- lisp/xhg.el
+++ lisp/xhg.el
@@ -604,7 +604,7 @@
(interactive)
(split-window)
(other-window 1)
- (woman "hgrc")
+ (apply (if (featurep 'xemacs) 'manual-entry 'woman) "hgrc")
(other-window -1))
# revision id: [EMAIL PROTECTED]
# sha1: b2d15e2724eb4e0f213e5167cbe3ea44783a475c
# inventory sha1: 44627d468cbfd5732a4cd87db8aa5c8cf973ee49
# parent ids:
# [EMAIL PROTECTED]
# base id: [EMAIL PROTECTED]
# properties:
# branch-nick: dvc
# message:
# Fixed auto-autoload.el and custom-load.el generation for XEmacs.
#
# committer: Robert Widhopf-Fenk <[EMAIL PROTECTED]>
# date: Mon 2006-08-21 22:50:51.089999914 +0200
=== modified file lisp/Makefile.in // encoding:base64
LS0tIGxpc3AvTWFrZWZpbGUuaW4KKysrIGxpc3AvTWFrZWZpbGUuaW4KQEAgLTk2LDkgKzk2LDE0
IEBACiAKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogYXV0b2xvYWRzOgoraWZlcSAoJChFTUFDU19G
TEFWT1IpLHhlbWFjcykKKwkkKEVNQUNTX0NPTVApIC1sIGF1dG9sb2FkIC1ldmFsICcoc2V0cSBh
dXRvbG9hZC1wYWNrYWdlLW5hbWUgInh0bGEiIGdlbmVyYXRlZC1hdXRvbG9hZC1maWxlICIuL2F1
dG8tYXV0b2xvYWRzLmVsIiknIC1mIGJhdGNoLXVwZGF0ZS1hdXRvbG9hZHMgCisJJChFTUFDU19D
T01QKSAtYmF0Y2ggLXEgLWwgY3VzLWRlcCAtZiBDdXN0b20tbWFrZS1kZXBlbmRlbmNpZXMgJChz
cmNkaXIpCitlbHNlCiAJJChFTUFDU19DT01QKSAtZiBwYWNrYWdlLW1haW50LW1ha2UtY3VzLWxv
YWQgJChzcmNkaXIpCiAJJChFTUFDU19DT01QKSAtZiBwYWNrYWdlLW1haW50LW1ha2UtYXV0by1s
b2FkICQoc3JjZGlyKQogCSQoRU1BQ1NfQ09NUCkgLWYgcGFja2FnZS1tYWludC1tYWtlLWxvYWQK
K2VuZGlmCiAKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogQVJDSF9ESVJfRVhJU1RTPSR7c2hlbGwg
aWYgWyAtciAnQHRvcF9zcmNkaXJAL3thcmNofScgXTsgdGhlbiBwcmludGYgIiVzIiB5ZXM7IGVs
c2UgcHJpbnRmICIlcyIgbm87IGZpIH0KCg==
# revision id: [EMAIL PROTECTED]
# sha1: f55005e4d6a7194e309a730e553ffa6f5fe1a1a1
# inventory sha1: ee8fa3a5889d16cd8ecf4830ccdae34e5003a76b
# parent ids:
# [EMAIL PROTECTED]
# properties:
# branch-nick: dvc
# message:
# Compilation fixes for XEmacs.
#
# committer: Robert Widhopf-Fenk <[EMAIL PROTECTED]>
# date: Mon 2006-08-21 22:39:28.019000053 +0200
=== modified file lisp/Makefile.in // encoding:base64
LS0tIGxpc3AvTWFrZWZpbGUuaW4KKysrIGxpc3AvTWFrZWZpbGUuaW4KQEAgLTM1LDcgKzM1LDcg
QEAKIFNZTUxJTktTID0gQFNZTUxJTktTQAogTElOS1BBVEggPSBATElOS1BBVEhACiAKLWFsbDog
Y2xlYW4tc29tZSBhdXRvbG9hZHMKK2FsbDogZHZjLXZlcnNpb24uZWwgY2xlYW4tc29tZSBhdXRv
bG9hZHMgCiAJJChFTUFDU19DT01QKSAtZiBwYWNrYWdlLW1haW50LWNvbXBpbGUKIAogaW5zdGFs
bDogaW5zdGFsbC1lbCBpbnN0YWxsLWVsYwpAQCAtMTAwLDcgKzEwMCw2IEBACiAJJChFTUFDU19D
T01QKSAtZiBwYWNrYWdlLW1haW50LW1ha2UtYXV0by1sb2FkICQoc3JjZGlyKQogCSQoRU1BQ1Nf
Q09NUCkgLWYgcGFja2FnZS1tYWludC1tYWtlLWxvYWQKIAotCiAjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMKIEFSQ0hfRElSX0VYSVNUUz0ke3NoZWxsIGlmIFsgLXIgJ0B0b3Bfc3JjZGlyQC97YXJjaH0n
IF07IHRoZW4gcHJpbnRmICIlcyIgeWVzOyBlbHNlIHByaW50ZiAiJXMiIG5vOyBmaSB9CiAKCg==
=== modified file lisp/dvc-build.el // encoding:base64
LS0tIGxpc3AvZHZjLWJ1aWxkLmVsCisrKyBsaXNwL2R2Yy1idWlsZC5lbApAQCAtMzQsNiArMzQs
OCBAQAogKHB1c2ggc3JjZGlyIGxvYWQtcGF0aCkKIChwdXNoIGxvYWRkaXIgbG9hZC1wYXRoKQog
Cis7KHNldHEgZGVidWctb24tZXJyb3IgdCkKKwogOzsgVGhlIG5hbWUgb2Ygb3VyIHBhY2thZ2UK
IChzZXRxIHBhY2thZ2UtbWFpbnQtcGtnICJkdmMiKQogCgo=
=== modified file lisp/dvc-xemacs.el // encoding:base64
LS0tIGxpc3AvZHZjLXhlbWFjcy5lbAorKysgbGlzcC9kdmMteGVtYWNzLmVsCkBAIC00NSw3ICs0
NSwxMCBAQAogKGV2YWwtYW5kLWNvbXBpbGUKICAgKHJlcXVpcmUgJ292ZXJsYXkpCiAgIChyZXF1
aXJlICd3aWQtZWRpdCkKLSAgKHJlcXVpcmUgJ2R2Yy1jb3JlKSkKKzsgVGhlIGZvbGxvd2luZyBy
ZXF1aXJlIGNhdXNlcyBhIGluZmluaXRlIHJlY3Vyc2lvbiBhcyB0aGUgKHByb3ZpZGUgLi4uKSBp
cyBhdAorOyB0aGUgZmlsZSBlbmQuICBUaHVzIHdlIGxpdmUgd2l0aCB0aGUgd2FybmluZ3MgYWJv
dXQgdW5rbm93biB2YXJpYWJsZXMgZXRjLgorOyAgKHJlcXVpcmUgJ2R2Yy1jb3JlKQorKQogCiA7
Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7
Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7CiA7OyBmaXhlcyB3YXJuaW5ncyBhYm91dCB1bmRlZmluZWQg
dmFyaWFibGVzCkBAIC04MSwxMCArODQsMTIgQEAKICAgICAgICAgICBidWZmZXItZmlsZSkpKSkp
CiAKIDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7
Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzsKLSh1bmxlc3MgKGZ1bmN0aW9ucCAncmVwbGFjZS1y
ZWdleHAtaW4tc3RyaW5nKQorOyB0aGUgdW5sZXNzIGNoZWNrIHNlZW1zIHRvIGZhaWwgCis7KHVu
bGVzcyAoZnVuY3Rpb25wICdyZXBsYWNlLXJlZ2V4cC1pbi1zdHJpbmcpCiAgIChkZWZ1biByZXBs
YWNlLXJlZ2V4cC1pbi1zdHJpbmcgKHJlZ2V4cCByZXAgc3RyaW5nCiAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAmb3B0aW9uYWwgZml4ZWRjYXNlIGxpdGVyYWwpCi0g
ICAgKHJlcGxhY2UtaW4tc3RyaW5nIHN0cmluZyByZWdleHAgcmVwIGxpdGVyYWwpKSkKKyAgICAo
cmVwbGFjZS1pbi1zdHJpbmcgc3RyaW5nIHJlZ2V4cCByZXAgbGl0ZXJhbCkpCis7KQogCiA7Ozs7
Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7
Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7CiAodW5sZXNzIChmdW5jdGlvbnAgJ2xpbmUtZW5kLXBvc2l0aW9u
KQpAQCAtMzcwLDYgKzM3NSw5IEBACiAJCQkJICAgICAgJ2xpbmUtbnVtYmVyLWF0LXBvcwogCQkJ
CSAgICAnbGluZS1udW1iZXIpKQogCisKKyhkZWZ2YXIgYWxsb3ctcmVtb3RlLXBhdGhzIG5pbCkK
KwogOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7
Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzsKIChwcm92aWRlICdkdmMteGVtYWNzKQogCgo=
=== modified file lisp/xhg.el // encoding:base64
LS0tIGxpc3AveGhnLmVsCisrKyBsaXNwL3hoZy5lbApAQCAtNjA0LDcgKzYwNCw3IEBACiAgIChp
bnRlcmFjdGl2ZSkKICAgKHNwbGl0LXdpbmRvdykKICAgKG90aGVyLXdpbmRvdyAxKQotICAod29t
YW4gImhncmMiKQorICAoYXBwbHkgKGlmIChmZWF0dXJlcCAneGVtYWNzKSAnbWFudWFsLWVudHJ5
ICd3b21hbikgImhncmMiKQogICAob3RoZXItd2luZG93IC0xKSkKIAogCgo=
# revision id: [EMAIL PROTECTED]
# sha1: c4c729e3904f6a508af76713396be46380efbdda
# inventory sha1: c32f33a359d0b2ca30f47fbfc6833b993834901b
# parent ids:
# [EMAIL PROTECTED]
# properties:
# branch-nick: dvc
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
