diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2006-11-18 17:42:32 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2006-11-18 17:42:32 +0000 |
| commit | d8d555f293dc2f35ed35bd06f18c074d27e2197f (patch) | |
| tree | 1fb80629af7eed6fa765d2b1c68c6e39fd31ef79 | |
| parent | 59e24ad3334e8035b90711f94b4cbd9c85b20161 (diff) | |
| download | emacs-d8d555f293dc2f35ed35bd06f18c074d27e2197f.tar.gz | |
* net/tramp.el (top): cl and custom are always required.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4e616ac7a2a..372c31da3cc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-11-18 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (top): cl and custom are always required. + 2006-11-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * term/x-win.el (x-cut-buffer-or-selection-value): Decode text from diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 54bb6946498..3c6733e6dfa 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -149,12 +149,11 @@ Otherwise, use a separate filename syntax for Tramp.") (when (featurep 'tramp-smb) (unload-feature 'tramp-smb 'force))))))) -(eval-when-compile - (require 'cl) - (require 'custom) - ;; Emacs 19.34 compatibility hack -- is this needed? - (or (>= emacs-major-version 20) - (load "cl-seq"))) +(require 'cl) +(require 'custom) +;; Emacs 19.34 compatibility hack -- is this needed? +(or (>= emacs-major-version 20) + (load "cl-seq")) (unless (boundp 'custom-print-functions) (defvar custom-print-functions nil)) ; not autoloaded before Emacs 20.4 |