[Emacs-diffs] /srv/bzr/emacs/trunk r102123: * abbrev.el (abbrev-mode): Remove one of the three definitions of this variable.

[Glenn Morris]

------------------------------------------------------------
revno: 102123
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-26 23:50:28 -0700
message:
  * abbrev.el (abbrev-mode): Remove one of the three definitions of this 
variable.
modified:
  lisp/ChangeLog
  lisp/abbrev.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-27 06:48:04 +0000
+++ b/lisp/ChangeLog    2010-10-27 06:50:28 +0000
@@ -1,5 +1,8 @@
 2010-10-27  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/abbrev.el'
--- a/lisp/abbrev.el    2010-08-29 16:17:13 +0000
+++ b/lisp/abbrev.el    2010-10-27 06:50:28 +0000
@@ -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 @@
 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 @@
 
 (provide 'abbrev)
 
-;; arch-tag: dbd6f3ae-dfe3-40ba-b00f-f9e3ff960df5
 ;;; abbrev.el ends here