diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-19 12:27:55 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-19 12:27:55 -0700 |
| commit | 59ced4521ebdadaf48b9c22b7cda46407a8b942b (patch) | |
| tree | e200fa9accae153426fb414cde550435d94cc58d /src/buffer.c | |
| parent | 8893d81fc30c2fd9afceecb4e0325edc9c8b3f50 (diff) | |
| parent | 5569e644448eb84dce1ca9359ae33901347acac8 (diff) | |
| download | emacs-59ced4521ebdadaf48b9c22b7cda46407a8b942b.tar.gz | |
Merge from origin/emacs-25
5569e64 ; Spelling fixes
24a5f57 * lisp/net/eww.el (eww-tag-meta): Handle single quoted URLs (...
9b89896 * lisp/progmodes/sql.el (sql-product-alist): Doc tweak
69b50f5 * lisp/progmodes/sql.el (sql-product-alist): Doc fix. (Bug#2...
42eae54 Improve documentation of dabbrevs
b0ade0d Clarify that easy-menu-add is a nop (Bug#25382)
3c69f2c * lisp/textmodes/rst.el (rst-package-emacs-version-alist): Fi...
# Conflicts:
# lisp/textmodes/rst.el
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c index c00cc40d6f2..ff4a500c8b7 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -870,7 +870,7 @@ drop_overlay (struct buffer *b, struct Lisp_Overlay *ov) } -/* Delete all overlays of B and reset it's overlay lists. */ +/* Delete all overlays of B and reset its overlay lists. */ void delete_all_overlays (struct buffer *b) @@ -1698,7 +1698,7 @@ cleaning up all windows currently displaying the buffer to be killed. */) if (EQ (buffer, XWINDOW (minibuf_window)->contents)) return Qnil; - /* When we kill an ordinary buffer which shares it's buffer text + /* When we kill an ordinary buffer which shares its buffer text with indirect buffer(s), we must kill indirect buffer(s) too. We do it at this stage so nothing terrible happens if they ask questions or their hooks get errors. */ |