* abbrev.el (abbrev-mode): Remove one of the three definitions of this variable.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8199549d7fbd96b8cbfed6ab8dbb92696d30952..1dccc73bda18ab57e6b0d75e4c3159404b285b13 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-27  Glenn Morris  <rgm@gnu.org>
 
+       * abbrev.el (abbrev-mode): Remove one of the three definitions of this
+       variable.
+
        * server.el (server-host, server-port, server-auth-dir): Autoload risky.
 
        * term/ns-win.el: Restore require of cl when compiling.

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 6e48360587f4f997cfb366eda35bdd2b65a7b74f..1c21aee5662eb9a85aaa34e03ab59e8dee9b9aa6 100644 (file)
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -1,7 +1,7 @@
 ;;; abbrev.el --- abbrev mode commands for Emacs
 
-;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev convenience
@@ -59,16 +59,6 @@ With optional argument ARG, turn abbrev mode on if ARG is
 positive, otherwise turn it off.  In Abbrev mode, inserting an
 abbreviation causes it to expand and be replaced by its expansion.")
 
-(defcustom abbrev-mode nil
-  "Enable or disable Abbrev mode.
-Non-nil means automatically expand abbrevs as they are inserted.
-
-Setting this variable with `setq' changes it for the current buffer.
-Changing it with \\[customize] sets the default value.
-Interactively, use the command `abbrev-mode'
-to enable or disable Abbrev mode in the current buffer."
-  :type 'boolean
-  :group 'abbrev-mode)
 (put 'abbrev-mode 'safe-local-variable 'booleanp)
 
 \f
@@ -927,5 +917,4 @@ SORTFUN is passed to `sort' to change the default ordering."
 
 (provide 'abbrev)
 
-;; arch-tag: dbd6f3ae-dfe3-40ba-b00f-f9e3ff960df5
 ;;; abbrev.el ends here