diff options
| author | Glenn Morris | 2018-03-02 11:59:46 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-03-02 11:59:46 -0800 |
| commit | 762ea10d7ff483d3528c2c85b42596178ccc2a34 (patch) | |
| tree | 00154b726c2bd73c85d47f89a2912bd2ff389b92 /src | |
| parent | e943b9b514fcc82a47364a35e4af9f46e30e7346 (diff) | |
| parent | 0213c8bf472b196d995d92a52b44458ac8226e42 (diff) | |
| download | emacs-762ea10d7ff483d3528c2c85b42596178ccc2a34.tar.gz emacs-762ea10d7ff483d3528c2c85b42596178ccc2a34.zip | |
Merge from origin/emacs-26
0213c8b (origin/emacs-26) mwheel minor consistency fix
82f12b2 * src/window.c (Frecenter): Improve commentary.
04da8f4 Fix downloading non-text files in EWW
832b9ec ; Spelling fixes
dd88499 ; Spelling fixes
3968f72 Rename some mwheel options, for consistency
d6e78de * lisp/vc/add-log.el (add-change-log-entry): Replace obsolete...
5fe0387 Improve the Emacs manual
56ab8e3 * lisp/dired-aux.el (dired-do-create-files): Doc fix. (Bug#3...
Conflicts:
etc/NEWS
lisp/mwheel.el
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/window.c b/src/window.c index 08c3f32dff5..e6d0280d9b0 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -5923,6 +5923,9 @@ and redisplay normally--don't erase and redraw the frame. */) | |||
| 5923 | EMACS_INT iarg UNINIT; | 5923 | EMACS_INT iarg UNINIT; |
| 5924 | int this_scroll_margin; | 5924 | int this_scroll_margin; |
| 5925 | 5925 | ||
| 5926 | /* For reasons why we signal an error here, see | ||
| 5927 | http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00053.html, | ||
| 5928 | http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00094.html. */ | ||
| 5926 | if (buf != current_buffer) | 5929 | if (buf != current_buffer) |
| 5927 | error ("`recenter'ing a window that does not display current-buffer."); | 5930 | error ("`recenter'ing a window that does not display current-buffer."); |
| 5928 | 5931 | ||