Did not attempt to run yet, but at least this makes it compile...
Summary of changes:
* condition-case (require 'dired-x) ignoring errors
* Only add uniquify-list-buffers-directory-modes to dvc-status-mode if
it is bound.
* Transform all ecase instances with 't' conditional to case, since
ecase does not support otherwise clauses, despite the fact the GNU Emacs
seems to violate Common Lisp there.
=== modified file 'lisp/dvc-fileinfo.el'
--- lisp/dvc-fileinfo.el 2011-04-22 07:26:27 +0000
+++ lisp/dvc-fileinfo.el 2012-06-22 22:24:29 +0000
@@ -191,7 +191,7 @@
(progn
(newline)
(insert " ")
- (ecase (dvc-fileinfo-file-status fileinfo)
+ (case (dvc-fileinfo-file-status fileinfo)
(rename-source
(insert "to "))
(rename-target
@@ -301,7 +301,7 @@
(let ((fileinfo (dvc-fileinfo-current-fileinfo)))
(etypecase fileinfo
(dvc-fileinfo-file ; also matches dvc-fileinfo-dir
- (ecase (dvc-fileinfo-file-status fileinfo)
+ (case (dvc-fileinfo-file-status fileinfo)
(rename-source
;; target name is in more-status
(dvc-fileinfo-file-more-status fileinfo))
@@ -319,7 +319,7 @@
(let ((fileinfo (dvc-fileinfo-current-fileinfo)))
(etypecase fileinfo ; also matches dvc-fileinfo-dir
(dvc-fileinfo-file
- (ecase (dvc-fileinfo-file-status fileinfo)
+ (case (dvc-fileinfo-file-status fileinfo)
(rename-target
;; source name is in more-status, and it includes the path
(dvc-fileinfo-file-more-status fileinfo))
=== modified file 'lisp/dvc-status.el'
--- lisp/dvc-status.el 2011-04-22 07:26:27 +0000
+++ lisp/dvc-status.el 2012-06-22 14:50:18 +0000
@@ -140,7 +140,8 @@
(buffer-disable-undo)
(set-buffer-modified-p nil))
-(add-to-list 'uniquify-list-buffers-directory-modes 'dvc-status-mode)
+(when (boundp 'uniquify-list-buffers-directory-modes)
+ (add-to-list 'uniquify-list-buffers-directory-modes 'dvc-status-mode))
(defun dvc-status-prepare-buffer (dvc root base-revision branch header-more refresh)
"Prepare and return a status buffer. Should be called by <back-end>-dvc-status.
=== modified file 'lisp/dvc-unified.el'
--- lisp/dvc-unified.el 2011-12-15 21:40:33 +0000
+++ lisp/dvc-unified.el 2012-06-22 22:33:39 +0000
@@ -78,7 +78,9 @@
;;; Code:
-(require 'dired-x)
+(condition-case nil
+ (require 'dired-x)
+ (error nil))
(require 'ffap)
(require 'dvc-register)
(require 'dvc-core)
=== modified file 'lisp/xhg.el'
--- lisp/xhg.el 2010-09-23 19:14:57 +0000
+++ lisp/xhg.el 2012-06-22 22:34:12 +0000
@@ -141,7 +141,9 @@
;;; Code:
-(require 'dired-x)
+(condition-case nil
+ (require 'dired-x)
+ (error nil))
(require 'dvc-core)
(require 'dvc-diff)
(require 'xhg-core)
=== modified file 'lisp/xmtn-propagate.el'
--- lisp/xmtn-propagate.el 2011-04-22 07:26:27 +0000
+++ lisp/xmtn-propagate.el 2012-06-22 22:30:24 +0000
@@ -618,12 +618,12 @@
(setf (xmtn-propagate-data-from-local-changes data) 'need-scan)
(setf (xmtn-propagate-data-to-local-changes data) 'need-scan)))
- (ecase (xmtn-propagate-data-from-local-changes data)
+ (case (xmtn-propagate-data-from-local-changes data)
(need-scan
(xmtn-propagate-create-from-status-buffer data))
(t nil))
- (ecase (xmtn-propagate-data-to-local-changes data)
+ (case (xmtn-propagate-data-to-local-changes data)
(need-scan
(xmtn-propagate-create-to-status-buffer data))
(t nil))
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
