[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master d43980c 05/50: wrapped on-screen-record-data in condition-
From: |
Michael Heerdegen |
Subject: |
[elpa] master d43980c 05/50: wrapped on-screen-record-data in condition-case |
Date: |
Mon, 09 Nov 2015 03:35:40 +0000 |
branch: master
commit d43980cf20d1b29d2a804fe6ecf04605516cd89a
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>
wrapped on-screen-record-data in condition-case
---
on-screen.el | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/on-screen.el b/on-screen.el
index e617584..5967655 100644
--- a/on-screen.el
+++ b/on-screen.el
@@ -292,16 +292,16 @@ A nil value for AREA, TIMER or OVERLAYS means that the
remembered
values should not be changed. If TIMER is the symbol `finished',
remember nil for the timer."
(let* ((entry (assoc win on-screen-data))
- (data (cdr entry))
- (same-buffer-p (eq (car data) (window-buffer win))))
+ (data (cdr entry))
+ (same-buffer-p (eq (car data) (window-buffer win))))
(setq area (or area (and same-buffer-p (cadr data)))
- timer (cond ((timerp timer) timer)
- (timer nil)
- (t (and same-buffer-p (caddr data))))
- overlays (or overlays (and same-buffer-p (cadddr data)))
- data `(,(window-buffer win) ,area ,timer ,overlays))
+ timer (cond ((timerp timer) timer)
+ (timer nil)
+ (t (and same-buffer-p (caddr data))))
+ overlays (or overlays (and same-buffer-p (cadddr data)))
+ data `(,(window-buffer win) ,area ,timer ,overlays))
(if entry
- (setcdr entry data)
+ (setcdr entry data)
(push (cons win data) on-screen-data))))
(defun on-screen-get-data (win)
@@ -412,11 +412,13 @@ only the windows of the selected frame."
With ALL-FRAMES non-nil, include all windows of all live frames.
Else, consider only the windows of the selected frame."
;; This normally goes to `pre-command-hook'.
- (mapc (lambda (win) (with-current-buffer (window-buffer win)
+ (condition-case nil
+ (mapc (lambda (win) (with-current-buffer (window-buffer win)
(when (on-screen-enabled-p)
(on-screen-record-data win (list (on-screen-window-start
win)
- (on-screen-window-end
win))))))
- (on-screen-get-windows all-frames)))
+ (on-screen-window-end
win))))))
+ (on-screen-get-windows all-frames))
+ ((debug error) nil)))
(defun on-screen-after-scroll (win display-start)
"DTRT after scrolling.
- [elpa] master updated (872014e -> 65bbd8d), Michael Heerdegen, 2015/11/08
- [elpa] master d43980c 05/50: wrapped on-screen-record-data in condition-case,
Michael Heerdegen <=
- [elpa] master 00b25ac 06/50: minor correction, Michael Heerdegen, 2015/11/08
- [elpa] master 0caf472 02/50: increased def value of on-screen-delay, Michael Heerdegen, 2015/11/08
- [elpa] master 5120be6 04/50: mc, Michael Heerdegen, 2015/11/08
- [elpa] master 6316701 03/50: Doc and name cleanups, Michael Heerdegen, 2015/11/08
- [elpa] master 1d46de7 07/50: removed lexical-binding: t (confusing because not necessary), Michael Heerdegen, 2015/11/08
- [elpa] master 1606351 12/50: new-var on-screen-overlay-priority, Michael Heerdegen, 2015/11/08
- [elpa] master 83dd4f5 13/50: comment in on-screen-make-narrow-line-overlay, Michael Heerdegen, 2015/11/08
- [elpa] master 6b88eaa 10/50: on-screen-treat-cut-lines, default nil (faster), Michael Heerdegen, 2015/11/08
- [elpa] master a898176 14/50: defface on-screen-shadow: make slightly more colorful, Michael Heerdegen, 2015/11/08
- [elpa] master cdf787a 08/50: removed optional arg of on-screen-record-ranges (not used), Michael Heerdegen, 2015/11/08