Package: xtla
Version: 1.2-1
Severity: important

I'm using emacs-snapshot and while browsing missing patches,
'ewoc--node-delete' errors appear. This is because emacs 22 includes a
different version of ewoc that does not publish the function and it
loads the package before the one provided by xtla.

I attach a patch that fixes this by copying ewoc--node-delete to a new
tla--ewoc-node-delete function in xtla.el.

-- System Information:
Debian Release: testing/unstable
 APT prefers unstable
 APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17-1-686
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)

Versions of packages xtla depends on:
ii  bazaar                      1.4.2-2      arch-based distributed revision co
ii  emacs-snapshot-gtk [emacs-s 1:20060623-1 The GNU Emacs editor (with GTK+ 2.
ii  emacs-snapshot-nox [emacs-s 1:20060623-1 The GNU Emacs editor (without X su
ii  emacs21                     21.4a-6      The GNU Emacs editor
ii  tla                         1.3.3-3.3    arch revision control system

xtla recommends no packages.

-- no debconf information
--- xtla.el.old	2006-06-26 15:34:23.000000000 +0200
+++ xtla.el	2006-06-26 15:34:34.000000000 +0200
@@ -367,6 +367,16 @@
   (ewoc-filter cookie
                '(lambda (x) (not (eq x (ewoc-data elem))))))
 
+(defun tla--ewoc-node-delete (node)
+  "Unbind NODE from its doubly linked list and return it."
+  ;; This is a no-op when applied to the dummy node. This will return
+  ;; nil if applied to the dummy node since it always contains nil.
+  (setf (ewoc--node-right (ewoc--node-left node)) (ewoc--node-right node))
+  (setf (ewoc--node-left (ewoc--node-right node)) (ewoc--node-left node))
+  (setf (ewoc--node-left node) nil)
+  (setf (ewoc--node-right node) nil)
+  node)
+                  
 (defun tla-generic-refresh ()
   "Call the function specified by `tla-buffer-refresh-function'."
   (interactive)
@@ -4501,7 +4511,7 @@
                           output (capture node) cookie
                           'tla-revision-compute-merged-by
                           )
-                         (ewoc--node-delete to-delete)
+                         (tla--ewoc-node-delete to-delete)
                          (ewoc-refresh tla-revision-list-cookie)
                          (let ((loc (if deleted
                                         (ewoc-next
@@ -4562,7 +4572,7 @@
                           (tla-bookmarks-missing-parse-changes
                            output (capture (ewoc-nth tla-revision-list-cookie
                                              -1)))
-                          (ewoc--node-delete (capture to-delete))
+                          (tla--ewoc-node-delete (capture to-delete))
                           (ewoc-refresh tla-revision-list-cookie)
                           (let ((loc (if deleted
                                          (ewoc-next
@@ -4579,7 +4589,7 @@
                                   (cur (ewoc-locate
                                         tla-revision-list-cookie))
                                   (deleted (eq cur (capture to-delete))))
-                             (ewoc--node-delete (capture to-delete))
+                             (tla--ewoc-node-delete (capture to-delete))
                              (ewoc-refresh tla-revision-list-cookie)
                              (let ((loc (if deleted
                                             (ewoc-next

Reply via email to