synch with vcs

This commit is contained in:
Kai Tetzlaff 2009-12-02 14:49:36 +01:00
parent a68e3e4b2f
commit 025e7dc8a8

View File

@ -1163,23 +1163,26 @@ or in the same sublist"
(defvar dvc-bookmarks-hidden-subtree nil (defvar dvc-bookmarks-hidden-subtree nil
"List of all hidden subtrees") "List of all hidden subtrees")
(defun dvc-bookmarks-show-or-hide-subtree (&optional show) (defun dvc-bookmarks-show-or-hide-subtree ()
"Hide subtree when called with no argument "Toggle subtree visibility."
show subtree when called with prefix argument (C-u)" (interactive)
(interactive "P")
(let ((current-tree (aref (dvc-bookmarks-current-bookmark) 1)) (let ((current-tree (aref (dvc-bookmarks-current-bookmark) 1))
(parent)) (pos (point))
(when (member (assoc current-tree dvc-bookmark-alist) dvc-bookmark-alist) ;check if we are really on a tree parent)
(if current-prefix-arg (when (member (assoc current-tree dvc-bookmark-alist)
dvc-bookmark-alist) ; Check if we are really on a tree.
(if (member current-tree dvc-bookmarks-hidden-subtree)
(progn (progn
(setq dvc-bookmarks-hidden-subtree (remove current-tree dvc-bookmarks-hidden-subtree)) (setq dvc-bookmarks-hidden-subtree
(dvc-bookmarks)) (remove current-tree dvc-bookmarks-hidden-subtree))
(add-to-list 'dvc-bookmarks-hidden-subtree current-tree)) (dvc-bookmarks))
(ewoc-filter dvc-bookmarks-cookie #'(lambda (x) (add-to-list 'dvc-bookmarks-hidden-subtree current-tree))
(setq parent (dvc-get-parent-elm (aref x 1) dvc-bookmark-alist)) (ewoc-filter dvc-bookmarks-cookie
(if (not (member parent dvc-bookmarks-hidden-subtree)) #'(lambda (x)
t (setq parent
nil)))))) (dvc-get-parent-elm (aref x 1) dvc-bookmark-alist))
(if (not (member parent dvc-bookmarks-hidden-subtree)) t nil))))
(goto-char pos)))
(defvar dvc-bookmarks-tmp-yank-item '("hg" (local-tree "~/work/hg/hg"))) (defvar dvc-bookmarks-tmp-yank-item '("hg" (local-tree "~/work/hg/hg")))