aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-04-13 22:16:02 -0700
committerPaul Eggert2012-04-13 22:16:02 -0700
commit3bace81626cc6ecdffc7901f3d03aa051d18c0af (patch)
treead0ed4cbd77e666bdb30b12779def351dabd7421 /src
parentec041b558711c7a80d4bdf145469fd0eb52973a4 (diff)
parent5ae255c7e9a2bd1ac594afe99fb24e9a0091d414 (diff)
downloademacs-3bace81626cc6ecdffc7901f3d03aa051d18c0af.tar.gz
emacs-3bace81626cc6ecdffc7901f3d03aa051d18c0af.zip
Merge from trunk.
Diffstat (limited to 'src')
-rw-r--r--src/character.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/character.h b/src/character.h
index a829def428d..88de343b228 100644
--- a/src/character.h
+++ b/src/character.h
@@ -316,7 +316,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
316 Note: This macro returns the actual length of the character's 316 Note: This macro returns the actual length of the character's
317 multibyte sequence as it is stored in a buffer or string. The 317 multibyte sequence as it is stored in a buffer or string. The
318 character it returns might have a different codepoint that has a 318 character it returns might have a different codepoint that has a
319 different multibyte sequence of a different legth, due to possible 319 different multibyte sequence of a different length, due to possible
320 unification of CJK characters inside string_char. Therefore do NOT 320 unification of CJK characters inside string_char. Therefore do NOT
321 assume that the length returned by this macro is identical to the 321 assume that the length returned by this macro is identical to the
322 length of the multibyte sequence of the character it returns. */ 322 length of the multibyte sequence of the character it returns. */