diff options
| author | Paul Eggert | 2016-09-26 13:37:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-09-26 13:37:36 -0700 |
| commit | fa9d9041aa05263b5331e32f99f7e3d5a1f16696 (patch) | |
| tree | c04ce068cefba3b22d9eeacdaf434d808cd92c6f /src/buffer.h | |
| parent | 4dad9675c58ea82f6d2f8ec8dfa10d67d754d1d1 (diff) | |
| parent | 0ae9a816b9f68bd3f50fc287a342237c8b4fe78d (diff) | |
| download | emacs-fa9d9041aa05263b5331e32f99f7e3d5a1f16696.tar.gz emacs-fa9d9041aa05263b5331e32f99f7e3d5a1f16696.zip | |
Merge from origin/emacs-25
0ae9a81 Document 'timerp'
2c72c46 Improve documentation of overlay priorities
f6fa160 Fix 'dired-compress-files'
2b8c5f0 Update commentary of STRING_CHAR and FETCH_MULTIBYTE_CHAR
# Conflicts:
# lisp/dired.el
# src/buffer.h
# src/character.h
Diffstat (limited to 'src/buffer.h')
| -rw-r--r-- | src/buffer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer.h b/src/buffer.h index fa4866e8f72..6ac161c1c91 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
| @@ -1182,7 +1182,7 @@ buffer_has_overlays (void) | |||
| 1182 | 1182 | ||
| 1183 | /* Return character code of multi-byte form at byte position POS. If POS | 1183 | /* Return character code of multi-byte form at byte position POS. If POS |
| 1184 | doesn't point the head of valid multi-byte form, only the byte at | 1184 | doesn't point the head of valid multi-byte form, only the byte at |
| 1185 | POS is returned. No range checking. */ | 1185 | POS is returned. No range checking. */ |
| 1186 | 1186 | ||
| 1187 | INLINE int | 1187 | INLINE int |
| 1188 | FETCH_MULTIBYTE_CHAR (ptrdiff_t pos) | 1188 | FETCH_MULTIBYTE_CHAR (ptrdiff_t pos) |