diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-07-02 19:19:26 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-07-02 19:19:26 -0700 |
| commit | 02f2f336af7c4129ec79ab00881bba3e14ff9820 (patch) | |
| tree | 3f279977bb231ea6ddab8680999bc1bffcb31071 /lisp/skeleton.el | |
| parent | bc0e36df8d33595d6411ec4c18e3f4b643c01306 (diff) | |
| parent | fc5cae731cede7e00f3f2d40d6577537f872d439 (diff) | |
| download | emacs-02f2f336af7c4129ec79ab00881bba3e14ff9820.tar.gz | |
Merge from origin/emacs-26
fc5cae7 ; Fix ChangeLog typo.
e17a5e5 ; make change-history-commit
f205928 * etc/HISTORY: Cite Brinkoff on early history.
4e58ca8 Document internal use of 'above-suspended' z-group frame para...
4bd43b0 Increase max-lisp-eval-depth adjustment while in debugger (bu...
ab98352 Improve on last change in replace-buffer-contents
2f149c0 Fix a factual error in Introduction to Emacs Lisp
8ad50a3 ; * lisp/files.el (buffer-offer-save): Doc fix. (Bug#32000)
c80f31f Minor improvements in documentation of imenu.el
8ebb683 Avoid errors with recentering in 'skeleton-insert'
e980a3c * src/lisp.h: Omit obsolete comment re bytecode stack.
eec71eb Speed up replace-buffer-contents
93c41ce Remove extra process call from vc-git-find-file-hook
7ea0873 ; Update some commentary
4a7f423 Speed up vc-git-dir-status-files
9134c84 Avoid compiler warning using coding.h
Conflicts:
src/editfns.c
Diffstat (limited to 'lisp/skeleton.el')
| -rw-r--r-- | lisp/skeleton.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 1d1af825a17..e7ac2ea32b2 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -268,7 +268,8 @@ available: (or (eolp) (not skeleton-end-newline) (newline-and-indent)) (run-hooks 'skeleton-end-hook) (sit-for 0) - (or (pos-visible-in-window-p beg) + (or (not (eq (window-buffer) (current-buffer))) + (pos-visible-in-window-p beg) (progn (goto-char beg) (recenter 0))) |