diff options
| author | Andrea Corallo | 2020-10-10 11:00:35 +0200 |
|---|---|---|
| committer | Andrea Corallo | 2020-10-10 11:00:35 +0200 |
| commit | f7e7ff4fb16bf8fc8e7662f21cd9843e9eb648e8 (patch) | |
| tree | 8757f25ff7948b6b045bd60f5adf6ebf91ed75ee /test/src | |
| parent | 138990bbda7ab228e3fde44710426c474b2c1086 (diff) | |
| parent | 5824c209ba17b97978519ea62478c57010311e88 (diff) | |
| download | emacs-f7e7ff4fb16bf8fc8e7662f21cd9843e9eb648e8.tar.gz emacs-f7e7ff4fb16bf8fc8e7662f21cd9843e9eb648e8.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/xdisp-tests.el | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/test/src/xdisp-tests.el b/test/src/xdisp-tests.el index 3d0d0f58302..95c39dacc3e 100644 --- a/test/src/xdisp-tests.el +++ b/test/src/xdisp-tests.el | |||
| @@ -33,19 +33,21 @@ | |||
| 33 | (lambda () | 33 | (lambda () |
| 34 | (insert "hello") | 34 | (insert "hello") |
| 35 | (let ((ol (make-overlay (point) (point))) | 35 | (let ((ol (make-overlay (point) (point))) |
| 36 | (redisplay-skip-initial-frame nil) | ||
| 36 | (max-mini-window-height 1) | 37 | (max-mini-window-height 1) |
| 37 | (text "askdjfhaklsjdfhlkasjdfhklasdhflkasdhflkajsdhflkashdfkljahsdlfkjahsdlfkjhasldkfhalskdjfhalskdfhlaksdhfklasdhflkasdhflkasdhflkajsdhklajsdgh")) | 38 | (text "askdjfhaklsjdfhlkasjdfhklasdhflkasdhflkajsdhflkashdfkljahsdlfkjahsdlfkjhasldkfhalskdjfhalskdfhlaksdhfklasdhflkasdhflkasdhflkajsdhklajsdgh")) |
| 38 | ;; (save-excursion (insert text)) | 39 | ;; (save-excursion (insert text)) |
| 39 | ;; (sit-for 2) | 40 | ;; (sit-for 2) |
| 40 | ;; (delete-region (point) (point-max)) | 41 | ;; (delete-region (point) (point-max)) |
| 41 | (put-text-property 0 1 'cursor t text) | 42 | (put-text-property 0 1 'cursor t text) |
| 42 | (overlay-put ol 'after-string text) | 43 | (overlay-put ol 'after-string text) |
| 43 | (redisplay 'force) | 44 | (let ((executing-kbd-macro nil)) ;Don't skip redisplay |
| 44 | (throw 'result | 45 | (redisplay 'force)) |
| 45 | ;; Make sure we do the see "hello" text. | 46 | (throw 'result |
| 46 | (prog1 (equal (window-start) (point-min)) | 47 | ;; Make sure we do the see "hello" text. |
| 47 | ;; (list (window-start) (window-end) (window-width)) | 48 | (prog1 (equal (window-start) (point-min)) |
| 48 | (delete-overlay ol))))) | 49 | ;; (list (window-start) (window-end) (window-width)) |
| 50 | (delete-overlay ol))))) | ||
| 49 | (let ((executing-kbd-macro t)) ;Force real minibuffer in `read-string'. | 51 | (let ((executing-kbd-macro t)) ;Force real minibuffer in `read-string'. |
| 50 | (read-string "toto: "))))))) | 52 | (read-string "toto: "))))))) |
| 51 | 53 | ||