Mercurial > emacs
changeset 111202:607a65b74c6c
* abbrev.el (abbrev-mode): Remove one of the three definitions of this variable.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 26 Oct 2010 23:50:28 -0700 |
| parents | fa47bedbdb89 |
| children | d9447313bf33 |
| files | lisp/ChangeLog lisp/abbrev.el |
| diffstat | 2 files changed, 5 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Oct 26 23:48:04 2010 -0700 +++ b/lisp/ChangeLog Tue Oct 26 23:50:28 2010 -0700 @@ -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.
--- a/lisp/abbrev.el Tue Oct 26 23:48:04 2010 -0700 +++ b/lisp/abbrev.el Tue Oct 26 23:50:28 2010 -0700 @@ -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