aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.112
-rw-r--r--src/ChangeLog.32
-rw-r--r--src/xdisp.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index a00ca453ca4..77180262aca 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -14235,7 +14235,7 @@
14235 ns_alternate_modifier. (Bug#1217) 14235 ns_alternate_modifier. (Bug#1217)
14236 14236
14237 * nsmenu.m (EmacsMenu-parseKeyEquiv:, addItemWithWidgetValue:): 14237 * nsmenu.m (EmacsMenu-parseKeyEquiv:, addItemWithWidgetValue:):
14238 Display all shortcuts, including those w/o super modifier. 14238 Display all shortcuts, including those without super modifier.
14239 14239
14240 * nsfns.m (ns-read-file-name): Fix typo in assignment statement. 14240 * nsfns.m (ns-read-file-name): Fix typo in assignment statement.
14241 14241
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 4b3675eaa8f..d32e894fa53 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -14422,7 +14422,7 @@
14422 * s-umips.h: Now include either s-usg5-2-2.h or s-bsd4-3.h 14422 * s-umips.h: Now include either s-usg5-2-2.h or s-bsd4-3.h
14423 and then override as needed. 14423 and then override as needed.
14424 * m-mips.h: System dependence deleted. 14424 * m-mips.h: System dependence deleted.
14425 LD_SWITCH_MACHINE remains w/ options needed on all systems. 14425 LD_SWITCH_MACHINE remains with options needed on all systems.
14426 * m-pmax.h: A little of that (LIBS_DEBUG) moved here. 14426 * m-pmax.h: A little of that (LIBS_DEBUG) moved here.
14427 No need to undef LIBS_MACHINE. 14427 No need to undef LIBS_MACHINE.
14428 14428
diff --git a/src/xdisp.c b/src/xdisp.c
index b09aa6ec967..171c6ccaa02 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22616,7 +22616,8 @@ usage: (trace-to-stderr STRING &rest OBJECTS) */)
22616 ***********************************************************************/ 22616 ***********************************************************************/
22617 22617
22618/* Return a temporary glyph row holding the glyphs of an overlay arrow. 22618/* Return a temporary glyph row holding the glyphs of an overlay arrow.
22619 Used for non-window-redisplay windows, and for windows w/o left fringe. */ 22619 Used for non-window-redisplay windows, and for windows without left
22620 fringe. */
22620 22621
22621static struct glyph_row * 22622static struct glyph_row *
22622get_overlay_arrow_glyph_row (struct window *w, Lisp_Object overlay_arrow_string) 22623get_overlay_arrow_glyph_row (struct window *w, Lisp_Object overlay_arrow_string)