Changeset 4079 for trunk/lisp/emacs-lisp/ewoc.el

Timestamp:

05/13/06 11:31:18 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/emacs-lisp/ewoc.el (modified) (12 diffs)

trunk/lisp/emacs-lisp/ewoc.el

@@ -145 +145 @@
-\(fn NODE CHILD)")
-
-(defun ewoc--dll-create ()
-  "Create an empty doubly linked list."
-  (let ((dummy-node (ewoc--node-create 'DL-LIST 'DL-LIST)))
-    (setf (ewoc--node-right dummy-node) dummy-node)
-    (setf (ewoc--node-left dummy-node) dummy-node)
-    dummy-node))
-
-(defun ewoc--node-enter-before (node elemnode)
-  "Insert ELEMNODE before NODE in a DLL."
-  (assert (and (null (ewoc--node-left elemnode)) (null (ewoc--node-right elemnode))))
-  (setf (ewoc--node-left elemnode) (ewoc--node-left node))
-  (setf (ewoc--node-right elemnode) node)
-  (setf (ewoc--node-right (ewoc--node-left node)) elemnode)
-  (setf (ewoc--node-left node) elemnode))
-
-(defun ewoc--node-enter-first (dll node)
-  "Add a free floating NODE first in DLL."
-  (ewoc--node-enter-before (ewoc--node-right dll) node))
-
-(defun ewoc--node-enter-last (dll node)
-  "Add a free floating NODE last in DLL."
-  (ewoc--node-enter-before dll node))
-
-(defun ewoc--node-next (dll node)
-  "Return the node after NODE, or nil if NODE is the last node."
@@ -175 +152 @@
-  "Return the node before NODE, or nil if NODE is the first node."
-  (unless (eq (ewoc--node-left node) dll) (ewoc--node-left node)))
-
-(defun 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 ewoc--node-nth (dll n)
@@ -222 +189 @@
-buffer will *not* have been changed.
-Return value of last form in FORMS."
-
-
-
-
+
+
-            (dll (ewoc--dll ,hnd))
-            ,@varlist)
-
-
-
-
+
+
-
-(defmacro ewoc--set-buffer-bind-dll (ewoc &rest forms)
@@ -243 +206 @@
-    node))
-
-
-
-
-
-
+
+
+
+
-  (save-excursion
-;; Remember the position as a number so that it doesn't move
-;; when we insert the string.
-(when (markerp pos) (setq pos (marker-position pos)
-(goto-char pos
-(let ((inhibit-read-only t)
+(let* ((inhibit-read-only t)
+       (m (copy-marker (ewoc--node-start-marker node)))
+       (pos (marker-position m
+       (elemnode (ewoc--node-create m data))
+  (goto-char pos
-      ;; Insert the trailing newline using insert-before-markers
-      ;; so that the start position for the next element is updated.
@@ -260 +222 @@
-      (backward-char 1)
-      (funcall pretty-printer data)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-(defun ewoc--refresh-node (pp node)
-  "Redisplay the element represented by NODE using the pretty-printer PP."
-  (let ((inhibit-read-only t))
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-;;; ===========================================================================
@@ -314 +260 @@
-newline.  Optional third argument FOOTER is similar, and will
-be inserted at the bottom of the ewoc."
-
-
-
-
+
+
+
+
+
+
+
+
+
-    (ewoc--set-buffer-bind-dll new-ewoc
-      ;; Set default values
-      (unless header (setq header ""))
-      (unless footer (setq footer ""))
-
-
-
-
-
-
-
+
+
+
+
+
-    ;; Return the ewoc
-    new-ewoc))
@@ -357 +306 @@
-Return the new node."
-  (ewoc--set-buffer-bind-dll ewoc
-
-
-
-
-
-
+
-
-(defun ewoc-next (ewoc node)
@@ -407 +351 @@
-      ((footer (ewoc--footer ewoc))
-       (node (ewoc--node-nth dll 1)))
-
-
-
-
+
+
+
+
+
-
-(defun ewoc-filter (ewoc predicate &rest args)
@@ -422 +367 @@
-      ((node (ewoc--node-nth dll 1))
-       (footer (ewoc--footer ewoc))
-
+
+
+
-    (while (not (eq node footer))
-      (setq next (ewoc--node-next dll node))
-      (unless (apply predicate (ewoc--node-data node) args)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      (setq node next))))
-
@@ -503 +464 @@
-Delete current text first, thus effecting a \"refresh\"."
-  (ewoc--set-buffer-bind-dll ewoc
-
-
+
+
+
-
-(defun ewoc-goto-prev (ewoc arg)
@@ -556 +518 @@
-                     (ewoc--node-start-marker footer))
-      (goto-char (ewoc--node-start-marker footer))
-
+
+
-        (while (not (eq node footer))
-          (set-marker (ewoc--node-start-marker node) (point))
-
-
+
-          (insert "\n")
-          (setq node (ewoc--node-next dll node)))))
@@ -602 +564 @@
-  (setf (ewoc--node-data (ewoc--header ewoc)) header)
-  (setf (ewoc--node-data (ewoc--footer ewoc)) footer)
-
-
+
+
+
-
-