aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-05-12 00:01:34 +0200
committerJuanma Barranquero2010-05-12 00:01:34 +0200
commit9ee120ba0118e977e5b7fa78123af6c765002b99 (patch)
tree4ef6fc1cfd950471fe1cc71e0642f7149142067d
parent587e4b13796f78ed582f36ff8b2ea261c6902b6f (diff)
downloademacs-9ee120ba0118e977e5b7fa78123af6c765002b99.tar.gz
emacs-9ee120ba0118e977e5b7fa78123af6c765002b99.zip
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'.)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dirtrack.el7
2 files changed, 5 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92edd9b380c..e7d4150450b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-05-11 Juanma Barranquero <lekktu@gmail.com>
2
3 * dirtrack.el (dirtrackp): Remove defcustom; don't make automatically
4 buffer-local (it's an obsolete alias for `dirtrack-mode') (bug#6173).
5
12010-05-11 Juri Linkov <juri@jurta.org> 62010-05-11 Juri Linkov <juri@jurta.org>
2 7
3 * scroll-all.el (scroll-all-check-to-scroll): 8 * 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."
143 :group 'dirtrack 143 :group 'dirtrack
144 :type 'string) 144 :type 'string)
145 145
146(defcustom dirtrackp t
147 "If non-nil, directory tracking via `dirtrack' is enabled."
148 :group 'dirtrack
149 :type 'boolean)
150
151(make-variable-buffer-local 'dirtrackp)
152
153(defcustom dirtrack-directory-function 146(defcustom dirtrack-directory-function
154 (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) 147 (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
155 'dirtrack-windows-directory-function 148 'dirtrack-windows-directory-function