diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/dos-fns.el | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d58ca1a5bde..14fee5ba12c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2009-09-12 Eli Zaretskii <eliz@gnu.org> + * dos-fns.el (dos-reevaluate-defcustoms): Comment out the + reevaluation of trash-directory. + * mwheel.el: Fix last change. (mouse-wheel-mode): New defvar. (mouse-wheel-mode): Remove autoload cookie. diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el index 3cfaa73d5a0..fadf09c70c2 100644 --- a/lisp/dos-fns.el +++ b/lisp/dos-fns.el @@ -224,8 +224,11 @@ returned unaltered." ;; see if the list of defcustom's below is up to date, run the command ;; "M-x apropos-value RET ~/\. RET". (defun dos-reevaluate-defcustoms () - ;; This was computed at dump time. - (custom-reevaluate-setting 'trash-directory)) + ;; This is not needed in Emacs 23.2 and later, as trash-directory is + ;; initialized as nil. But something like this might become + ;; necessary in the future, so I'm keeping it here as a reminder. + ;(custom-reevaluate-setting 'trash-directory) + ) (add-hook 'before-init-hook 'dos-reevaluate-defcustoms) |