X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/06d8ace51597cd41e110560a56a1abeb6cce23d6..51751aa26f9935609630f04e781a954b54ecc82e:/lisp/dabbrev.el

diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 063ba40874..540b93faad 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -1,7 +1,6 @@
 ;;; dabbrev.el --- dynamic abbreviation package
 
-;; Copyright (C) 1985, 1986, 1992, 1994, 1996, 1997, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Copyright (C) 1985-1986, 1992, 1994, 1996-1997, 2000-2011
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Don Morrison
@@ -207,7 +206,8 @@ starting with or containing `no-'.  If you set this variable to
 expanding `yes-or-no-' signals an error because `-' is not part of a word;
 but expanding `yes-or-no' looks for a word starting with `no'.
 
-The recommended value is \"\\\\sw\\\\|\\\\s_\"."
+The recommended value is nil, which will make dabbrev default to
+using \"\\\\sw\\\\|\\\\s_\"."
   :type '(choice (const nil)
 		 regexp)
   :group 'dabbrev)
@@ -392,8 +392,7 @@ then it searches *all* buffers."
 			       dabbrev-case-fold-search)
 			     (or (not dabbrev-upcase-means-case-search)
 				 (string= abbrev (downcase abbrev)))))
-	 (my-obarray dabbrev--last-obarray)
-	 init)
+	 (my-obarray dabbrev--last-obarray))
     (save-excursion
       ;;--------------------------------
       ;; New abbreviation to expand.