aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.11
diff options
context:
space:
mode:
authorPaul Eggert2011-04-15 00:48:51 -0700
committerPaul Eggert2011-04-15 00:48:51 -0700
commit4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch)
treee993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/ChangeLog.11
parent1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff)
parent49093f601b69d91126aefd328ee8f6bfeb797407 (diff)
downloademacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz
emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip
Merge from mainline.
Diffstat (limited to 'src/ChangeLog.11')
-rw-r--r--src/ChangeLog.112
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 703b084743c..6f462e32534 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -4906,7 +4906,7 @@
4906 (Finternal_describe_syntax_value): Recognize new flag; use the 4906 (Finternal_describe_syntax_value): Recognize new flag; use the
4907 SYNTAX_FLAGS_* macros. 4907 SYNTAX_FLAGS_* macros.
4908 (scan_sexps_forward, Fparse_partial_sexp): Change representation of 4908 (scan_sexps_forward, Fparse_partial_sexp): Change representation of
4909 comment style to accomodate the new styles. 4909 comment style to accommodate the new styles.
4910 (back_comment, forw_comment, Fforward_comment, scan_lists) 4910 (back_comment, forw_comment, Fforward_comment, scan_lists)
4911 (scan_sexps_forward): Update code to obey the new comment style flag. 4911 (scan_sexps_forward): Update code to obey the new comment style flag.
4912 4912