[elpa] master 6aaa211 11/50: remove visual line stuff

[Michael Heerdegen]

branch: master
commit 6aaa2114dafbd7f5802f80f7f7a67b95928ac85f
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>

    remove visual line stuff
    
    This didn't work well at all.  And when I was in w3m, and there were
    buttons, and I hit M-: foo, I got this error:
    
    Debugger entered--Lisp error: (args-out-of-range 2501 2501)
      line-pixel-height()
      line-move(-1 t)
      on-screen-beginning-of-line(0)
      (save-excursion (goto-char end) (on-screen-beginning-of-line 0) (point))
      (save-current-buffer (set-buffer (window-buffer window)) (save-excursion 
(goto-char end) (on-screen-beginning-of-line 0) (point)))
      (if (< (/ (float rbot) (+ rbot rowh)) on-screen-treat-cut-lines) end 
(save-current-buffer (set-buffer (window-buffer window)) (save-excursion 
(goto-char end) (on-screen-beginning-of-line 0) (point))))
      (let* ((#1=#:--cl-rest-- vis) (_x (if (= (length #1#) 6) (car-safe (prog1 
#1# (setq #1# (cdr #1#)))) (signal (quote wrong-number-of-arguments) (list nil 
(length #1#))))) (_y (car-safe (prog1 #1# (setq #1# (cdr #1#))))) (_rtop 
(car-safe (prog1 #1# (setq #1# (cdr #1#))))) (rbot (car-safe (prog1 #1# (setq 
#1# (cdr #1#))))) (rowh (car-safe (prog1 #1# (setq #1# (cdr #1#))))) (_vpos 
(car #1#))) (if (< (/ (float rbot) (+ rbot rowh)) on-screen-treat-cut-lines) 
end (save-current-buffer (set- [...]
      (progn (let* ((#1=#:--cl-rest-- vis) (_x (if (= (length #1#) 6) (car-safe 
(prog1 #1# (setq #1# ...))) (signal (quote wrong-number-of-arguments) (list nil 
(length #1#))))) (_y (car-safe (prog1 #1# (setq #1# (cdr #1#))))) (_rtop 
(car-safe (prog1 #1# (setq #1# (cdr #1#))))) (rbot (car-safe (prog1 #1# (setq 
#1# (cdr #1#))))) (rowh (car-safe (prog1 #1# (setq #1# (cdr #1#))))) (_vpos 
(car #1#))) (if (< (/ (float rbot) (+ rbot rowh)) on-screen-treat-cut-lines) 
end (save-current-buffer (set [...]
      (if (not (cddr vis)) end (progn (let* ((#1=#:--cl-rest-- vis) (_x (if (= 
(length #1#) 6) (car-safe (prog1 #1# ...)) (signal (quote 
wrong-number-of-arguments) (list nil ...)))) (_y (car-safe (prog1 #1# (setq #1# 
...)))) (_rtop (car-safe (prog1 #1# (setq #1# ...)))) (rbot (car-safe (prog1 
#1# (setq #1# ...)))) (rowh (car-safe (prog1 #1# (setq #1# ...)))) (_vpos (car 
#1#))) (if (< (/ (float rbot) (+ rbot rowh)) on-screen-treat-cut-lines) end 
(save-current-buffer (set-buffer (window-buf [...]
      (let* ((end (window-end window)) (vis (and on-screen-treat-cut-lines 
(pos-visible-in-window-p (1- end) window t)))) (if (not (cddr vis)) end (progn 
(let* ((#1=#:--cl-rest-- vis) (_x (if (= ... 6) (car-safe ...) (signal ... 
...))) (_y (car-safe (prog1 #1# ...))) (_rtop (car-safe (prog1 #1# ...))) (rbot 
(car-safe (prog1 #1# ...))) (rowh (car-safe (prog1 #1# ...))) (_vpos (car 
#1#))) (if (< (/ (float rbot) (+ rbot rowh)) on-screen-treat-cut-lines) end 
(save-current-buffer (set-buffer ( [...]
      on-screen-window-end(#<window 0x2f99f40 on *Backtrace*>)
      (list (on-screen-window-start win) (on-screen-window-end win))
      (on-screen-record-data win (list (on-screen-window-start win) 
(on-screen-window-end win)))
      (progn (on-screen-record-data win (list (on-screen-window-start win) 
(on-screen-window-end win))))
      (if (on-screen-enabled-p) (progn (on-screen-record-data win (list 
(on-screen-window-start win) (on-screen-window-end win)))))
      (save-current-buffer (set-buffer (window-buffer win)) (if 
(on-screen-enabled-p) (progn (on-screen-record-data win (list 
(on-screen-window-start win) (on-screen-window-end win))))))
      (lambda (win) (save-current-buffer (set-buffer (window-buffer win)) (if 
(on-screen-enabled-p) (progn (on-screen-record-data win (list 
(on-screen-window-start win) (on-screen-window-end win)))))))(#<window 
0x2f99f40 on *Backtrace*>)
      mapc((lambda (win) (save-current-buffer (set-buffer (window-buffer win)) 
(if (on-screen-enabled-p) (progn (on-screen-record-data win (list 
(on-screen-window-start win) (on-screen-window-end win))))))) (#<window 
0x2f99f40 on *Backtrace*>))
      (condition-case nil (mapc (function (lambda (win) (save-current-buffer 
(set-buffer (window-buffer win)) (if (on-screen-enabled-p) (progn 
(on-screen-record-data win ...)))))) (on-screen-get-windows)) ((debug error) 
nil))
      on-screen-record-ranges()
      read-from-minibuffer("" nil (keymap (7 . minibuffer-keyboard-quit) keymap 
(9 . completion-at-point) (27 keymap (9 . completion-at-point)) keymap (18 . 
helm-minibuffer-history) (menu-bar keymap (minibuf #1="Minibuf" keymap 
(previous menu-item "Previous History Item" previous-history-element :help "Put 
previous minibuffer history element in the minibuffer") (next menu-item "Next 
History Item" next-history-element :help "Put next minibuffer history element 
in the minibuffer") (isearch- [...]
" :help "Terminate input and exit minibuffer") (quit menu-item "Quit" 
abort-recursive-edit :help "Abort input and exit minibuffer") #1#)) (10 . 
exit-minibuffer) (13 . exit-minibuffer) (7 . minibuffer-keyboard-quit) (C-tab . 
file-cache-minibuffer-complete) (9 . self-insert-command) (XF86Back . 
previous-history-element) (up . previous-history-element) (prior . 
previous-history-element) (XF86Forward . next-history-element) (down . 
next-history-element) (next . next-history-element) (27 keyma [...]
      my-read--expression("")
      byte-code("\301\302\303\304\305!\"!D\207" [current-prefix-arg read 
format "(my-eval-in-mb-wrapper %s)" my-read--expression ""] 5)
      call-interactively(my-eval-expression nil nil)
      command-execute(my-eval-expression)
---
 on-screen.el |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/on-screen.el b/on-screen.el
index 745cb12..9592f8e 100644
--- a/on-screen.el
+++ b/on-screen.el
@@ -280,14 +280,10 @@ Type M-x customize-group on-screen RET for configuration."
               (point))))))))
 
 (defalias 'on-screen-beginning-of-line
-  (if (fboundp 'beginning-of-visual-line)
-      'beginning-of-visual-line
-    'beginning-of-line))
+  'beginning-of-line)
 
 (defalias 'on-screen-end-of-line
-  (if (fboundp 'end-of-visual-line)
-      'end-of-visual-line
-    'end-of-line))
+  'end-of-line)
 
 (defun on-screen-record-data (win area &optional timer overlays)
   ;; The collected data has the form ((beg end) timer overlays), and