2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42d57a4ea7a..78c6224f7e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-08  Glenn Morris  <rgm@gnu.org>
+
+        * abbrev.el (edit-abbrevs-mode):
+        Derive from fundamental-mode.  (Bug#16682)
+
 2014-02-07  Juanma Barranquero  <lekktu@gmail.com>
 
         * simple.el (quoted-insert): Check character validity (bug#16677).
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 8c59d2919ab..fdbe867377c 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -1007,7 +1007,7 @@ SORTFUN is passed to `sort' to change the default ordering."
 
 ;; Keep it after define-abbrev-table, since define-derived-mode uses
 ;; define-abbrev-table.
-(define-derived-mode edit-abbrevs-mode special-mode "Edit-Abbrevs"
+(define-derived-mode edit-abbrevs-mode fundamental-mode "Edit-Abbrevs"
   "Major mode for editing the list of abbrev definitions.")
 
 (provide 'abbrev)