diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-04-20 08:07:43 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-04-20 08:07:43 -0700 |
| commit | 2a8f8f75639505b0f04757a1034480843fbd8398 (patch) | |
| tree | d17b3a2c7ea7c51aecb9de9466b9505378dacafb /lisp | |
| parent | e927a36f3cf974a57094d10023ee075bb4596fb9 (diff) | |
| parent | 5de608f3edb54b4f8d9774e159d0fa99484d3ac8 (diff) | |
| download | emacs-2a8f8f75639505b0f04757a1034480843fbd8398.tar.gz | |
Merge from origin/emacs-26
5de608f (origin/emacs-26) Update the documentation of 'perform-replace'
06245b6 * etc/NEWS: Another fix for the last change (noted by Juri Li...
8f6293c Fix use of @key in Texinfo manuals
f4c9894 Improve documentation of actual arglist
ce0e253 ; * etc/NEWS: Improve last change as proposed by Phil Sainty
b89ff0e Don't assume term-current-row cache is valid (Bug#31193)
326a296 ; * etc/NEWS: Mention 'display-buffer-in-major-side-window' c...
3bdc9a1 Fix flyspell-auto-correct-previous-word broken by recent change
a539eb5 * test/src/lread-tests.el (lread-test-bug-31186): New test.
3fa472b Fix undefined behaviour while looking for lexical-binding fil...
4341aac Minor wording improvement in "Bookmarks"
Conflicts:
test/src/lread-tests.el
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/term.el | 4 | ||||
| -rw-r--r-- | lisp/textmodes/flyspell.el | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/term.el b/lisp/term.el index d3a9ef30371..cfb39c34e53 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -3653,7 +3653,7 @@ all pending output has been dealt with.")) (let ((start-column (term-horizontal-column))) (when (and check-for-scroll (or term-scroll-with-delete term-pager-count)) (setq down (term-handle-scroll down))) - (unless (and (= term-current-row 0) (< down 0)) + (unless (and (= (term-current-row) 0) (< down 0)) (term-adjust-current-row-cache down) (when (or (/= (point) (point-max)) (< down 0)) (setq down (- down (term-vertical-motion down))))) @@ -3663,7 +3663,7 @@ all pending output has been dealt with.")) (setq term-current-column 0) (setq term-start-line-column 0)) (t - (when (= term-current-row 0) + (when (= (term-current-row) 0) ;; Insert lines if at the beginning. (save-excursion (term-insert-char ?\n (- down))) (save-excursion diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index b5c841403a1..2d0307845ca 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -1950,8 +1950,9 @@ spell-check." (let ((pos (point)) (old-max (point-max))) ;; Flush a possibly stale cache from previous invocations of - ;; flyspell-auto-correct-word. - (if (not (eq last-command 'flyspell-auto-correct-word)) + ;; flyspell-auto-correct-word/flyspell-auto-correct-previous-word. + (if (not (memq last-command '(flyspell-auto-correct-word + flyspell-auto-correct-previous-word))) (setq flyspell-auto-correct-region nil)) ;; Use the correct dictionary. (flyspell-accept-buffer-local-defs) |