diff options
| author | Thien-Thi Nguyen <ttn@gnuvola.org> | 2007-03-30 16:12:19 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen <ttn@gnuvola.org> | 2007-03-30 16:12:19 +0000 |
| commit | f718c2fc7fdf6168e3e78ff761294dbd77cf1d4d (patch) | |
| tree | 0039101814315e3587e7ca779856ada9ca7670b0 /lisp | |
| parent | 8ad6289625d1be3f82bfa5ccc84f265911874b3d (diff) | |
| download | emacs-f718c2fc7fdf6168e3e78ff761294dbd77cf1d4d.tar.gz emacs-f718c2fc7fdf6168e3e78ff761294dbd77cf1d4d.tar.bz2 emacs-f718c2fc7fdf6168e3e78ff761294dbd77cf1d4d.zip | |
(ewoc--insert-new-node): Take additional arg DLL.
Use it, passed in explicitly, instead of from the dynamic binding.
(ewoc-create, ewoc-enter-before): Update to use new call sequence.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/ewoc.el | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7e003dfb970..654f1af6526 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-03-30 Thien-Thi Nguyen <ttn@gnu.org> + + * emacs-lisp/ewoc.el (ewoc--insert-new-node): Take additional arg DLL. + Use it, passed in explicitly, instead of from the dynamic binding. + (ewoc-create, ewoc-enter-before): Update to use new call sequence. + 2007-03-30 Juanma Barranquero <lekktu@gmail.com> * simple.el (blink-matching-open): When in minibuffer, don't diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el index 3649757f782..9fec81ec2c5 100644 --- a/lisp/emacs-lisp/ewoc.el +++ b/lisp/emacs-lisp/ewoc.el @@ -191,8 +191,9 @@ BUT if it is the header or the footer in EWOC return nil instead." (not (eq dll node)))) (setq node (ewoc--node-right node)))))) -(defun ewoc--insert-new-node (node data pretty-printer) +(defun ewoc--insert-new-node (node data pretty-printer dll) "Insert before NODE a new node for DATA, displayed by PRETTY-PRINTER. +Fourth arg DLL -- from `(ewoc--dll EWOC)' -- is for internal purposes. Call PRETTY-PRINTER with point at NODE's start, thus pushing back NODE and leaving the new node's start there. Return the new node." (save-excursion @@ -262,8 +263,8 @@ fourth arg NOSEP non-nil inhibits this." (unless header (setq header "")) (unless footer (setq footer "")) (setf (ewoc--node-start-marker dll) (copy-marker pos) - foot (ewoc--insert-new-node dll footer hf-pp) - head (ewoc--insert-new-node foot header hf-pp) + foot (ewoc--insert-new-node dll footer hf-pp dll) + head (ewoc--insert-new-node foot header hf-pp dll) (ewoc--hf-pp new-ewoc) hf-pp (ewoc--footer new-ewoc) foot (ewoc--header new-ewoc) head)) @@ -301,7 +302,7 @@ Return the new node." "Enter a new element DATA before NODE in EWOC. Return the new node." (ewoc--set-buffer-bind-dll ewoc - (ewoc--insert-new-node node data (ewoc--pretty-printer ewoc)))) + (ewoc--insert-new-node node data (ewoc--pretty-printer ewoc) dll))) (defun ewoc-next (ewoc node) "Return the node in EWOC that follows NODE. |