1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00

(tpu-current-line): Use posn-at-point and count-screen-lines.

(tpu-edt-off): Disable relevant pieces of advice.
This commit is contained in:
Stefan Monnier 2007-08-06 16:21:33 +00:00
parent f2b189796c
commit 036f2966c3
2 changed files with 10 additions and 2 deletions

View File

@ -1,5 +1,9 @@
2007-08-06 Stefan Monnier <monnier@iro.umontreal.ca>
* emulation/tpu-edt.el (tpu-current-line): Use posn-at-point and
count-screen-lines.
(tpu-edt-off): Disable relevant pieces of advice.
* emulation/tpu-extras.el (tpu-before-save-hook): Rename from
tpu-write-file-hook. Activate it with add-hook on buffer-save-hook.
(newline, newline-and-indent, do-auto-fill): Use advice instead of

View File

@ -826,10 +826,13 @@ Create the key map if necessary."
(use-local-map tpu-buffer-local-map)))
(local-set-key key func))
(defun tpu-current-line nil
(defun tpu-current-line ()
"Return the vertical position of point in the selected window.
Top line is 0. Counts each text line only once, even if it wraps."
(+ (count-lines (window-start) (point)) (if (= (current-column) 0) 1 0) -1))
(or
(cdr (nth 6 (posn-at-point)))
(if (eq (window-start) (point)) 0
(1- (count-screen-lines (window-start) (point) 'count-final-newline)))))
;;;
@ -2479,6 +2482,7 @@ If FILE is nil, try to load a default file. The default file names are
(if (eq tpu-global-map parent)
(set-keymap-parent map (keymap-parent parent))
(setq map parent)))))
(ad-disable-regexp "\\`tpu-")
(setq tpu-edt-mode nil))
(provide 'tpu-edt)