aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.11
diff options
context:
space:
mode:
authorPaul Eggert2011-04-14 13:16:48 -0700
committerPaul Eggert2011-04-14 13:16:48 -0700
commit8bd7b8304a41da5dc0c8a11967c1a6005e9465d0 (patch)
tree145588110166df723c31f3fceaa00c190b77aa8c /src/ChangeLog.11
parentcd64ea1d0df393beb93d1bdf19bd3990e3378f85 (diff)
parent9024ff7943e9529ec38a80aaaa0db43224c1e885 (diff)
downloademacs-8bd7b8304a41da5dc0c8a11967c1a6005e9465d0.tar.gz
emacs-8bd7b8304a41da5dc0c8a11967c1a6005e9465d0.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