--- a/contrib/gadict.el	Mon Mar 21 14:44:38 2016 +0200
+++ b/contrib/gadict.el	Mon Mar 21 14:49:37 2016 +0200
@@ -70,8 +70,8 @@
   (insert-char ?\n 3)
   (backward-char))
 
-(defvar gadict-mode-map (make-sparse-keymap))
-(define-key gadict-mode-map [C-return] 'gadict-new-entry)
+(defun gadict-setup-keymap ()
+  (define-key gadict-mode-map [C-return] 'gadict-new-entry))
 
 ;;;###autoload
 (define-derived-mode gadict-mode fundamental-mode "gadict"
@@ -81,7 +81,7 @@
           t nil nil nil
           (font-lock-multiline . t)
           ))
-  (use-local-map gadict-mode-map)
+  (gadict-setup-keymap)
   (modify-syntax-entry ?' ".")
   (modify-syntax-entry ?\" ".")
   (make-local-variable 'paragraph-separate)