aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.h
diff options
context:
space:
mode:
authorPaul Eggert2011-01-17 11:01:01 -0800
committerPaul Eggert2011-01-17 11:01:01 -0800
commita3e44e793796153ff1534be9c74fcab50b45de30 (patch)
tree863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/keymap.h
parent7f818df9420a1320539f7e3e633003573a570413 (diff)
parent721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff)
downloademacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz
emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip
Merge from mainline.
Diffstat (limited to 'src/keymap.h')
-rw-r--r--src/keymap.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/keymap.h b/src/keymap.h
index 2765799f168..931da76e555 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -58,5 +58,3 @@ extern void map_keymap_canonical (Lisp_Object map,
58 58
59#endif 59#endif
60 60
61/* arch-tag: 7400d5a1-ef0b-43d0-b366-f4d678bf3ba2
62 (do not change this comment) */