use markers for unscroll

1 files changed, 9 insertions, 8 deletions

diff --git a/.spacemacs b/.spacemacs
index d9dbdef..47b5fc9 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -277,19 +277,20 @@ M-x ao/what-face."
 ;; Undo accidental scrolling
 (put 'scroll-up-command 'unscrollable t)
 (put 'scroll-down-command 'unscrollable t)
-(put 'scroll-left-command 'unscrollable t)
-(put 'scroll-right-command 'unscrollable t)
-(defvar unscroll-point nil
+(defvar unscroll-point (make-marker)
   "Text position for next call to 'unscroll'.")
-(defvar unscroll-window-start nil
+(defvar unscroll-window-start (make-marker)
   "Window start for next call to 'unscroll'.")
 (defvar unscroll-window-hscroll nil
   "Hscroll for  next call to 'unscroll'.")
 (defun unscroll-maybe-remember ()
-  (if (not (get last-command 'unscrollable))
-      (setq unscroll-point (point)
-            unscroll-window-start (window-start)
-            unscroll-window-hscroll (window-hscroll))))
+   (if (not (get last-command 'unscrollable))
+       (progn
+         (set-marker unscroll-point (point))
+         (set-marker unscroll-window-start (window-start))
+         (setq unscroll-window-hscroll (window-hscroll))
+         )))
+
 (defun unscroll ()
   "Jump to location specified by 'unscroll-point'."
   (interactive)