diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-26 13:37:36 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-26 13:37:36 -0700 |
| commit | fa9d9041aa05263b5331e32f99f7e3d5a1f16696 (patch) | |
| tree | c04ce068cefba3b22d9eeacdaf434d808cd92c6f /src/character.h | |
| parent | 4dad9675c58ea82f6d2f8ec8dfa10d67d754d1d1 (diff) | |
| parent | 0ae9a816b9f68bd3f50fc287a342237c8b4fe78d (diff) | |
| download | emacs-fa9d9041aa05263b5331e32f99f7e3d5a1f16696.tar.gz | |
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/character.h')
| -rw-r--r-- | src/character.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/character.h b/src/character.h index b72b61d7054..fc8a0dd74d2 100644 --- a/src/character.h +++ b/src/character.h @@ -308,7 +308,7 @@ enum } \ } while (false) -/* Return the character code of character whose multibyte form is at P. */ +/* Return the character code of character whose multibyte form is at P. */ #define STRING_CHAR(p) \ (!((p)[0] & 0x80) \ |