From: Glenn Morris <rgm@gnu.org>
Date: Wed, 27 Oct 2010 06:50:28 +0000 (-0700)
Subject: * abbrev.el (abbrev-mode): Remove one of the three definitions of this variable.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~441
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=208d109c18bf5a1de184b4d3c70748ca4d68aeef;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8199549d7f..1dccc73bda1 100644
--- 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 6e48360587f..1c21aee5662 100644
--- 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)
 
 
@@ -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