From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 11 May 2010 22:01:34 +0000 (+0200)
Subject: Fix bug#6173: "(require 'dirtrack) erroring"
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~211^2~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ee120ba0118e977e5b7fa78123af6c765002b99;p=emacs.git

Fix bug#6173: "(require 'dirtrack) erroring"

* dirtrack.el (dirtrackp): Remove defcustom; don't make automatically
  buffer-local (it's an obsolete alias for `dirtrack-mode'.)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92edd9b380c..e7d4150450b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11  Juanma Barranquero  <lekktu@gmail.com>
+
+	* dirtrack.el (dirtrackp): Remove defcustom; don't make automatically
+	buffer-local (it's an obsolete alias for `dirtrack-mode') (bug#6173).
+
 2010-05-11  Juri Linkov  <juri@jurta.org>
 
 	* scroll-all.el (scroll-all-check-to-scroll):
diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el
index c209a2a6eb9..4e29c51fa75 100644
--- a/lisp/dirtrack.el
+++ b/lisp/dirtrack.el
@@ -143,13 +143,6 @@ be on a single line."
   :group 'dirtrack
   :type  'string)
 
-(defcustom dirtrackp t
-  "If non-nil, directory tracking via `dirtrack' is enabled."
-  :group 'dirtrack
-  :type  'boolean)
-
-(make-variable-buffer-local 'dirtrackp)
-
 (defcustom dirtrack-directory-function
   (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
       'dirtrack-windows-directory-function