diff options
| -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 @@ | |||
| 1 | 2006-11-18 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (top): cl and custom are always required. | ||
| 4 | |||
| 1 | 2006-11-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 5 | 2006-11-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * term/x-win.el (x-cut-buffer-or-selection-value): Decode text from | 7 | * 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.") | |||
| 149 | (when (featurep 'tramp-smb) | 149 | (when (featurep 'tramp-smb) |
| 150 | (unload-feature 'tramp-smb 'force))))))) | 150 | (unload-feature 'tramp-smb 'force))))))) |
| 151 | 151 | ||
| 152 | (eval-when-compile | 152 | (require 'cl) |
| 153 | (require 'cl) | 153 | (require 'custom) |
| 154 | (require 'custom) | 154 | ;; Emacs 19.34 compatibility hack -- is this needed? |
| 155 | ;; Emacs 19.34 compatibility hack -- is this needed? | 155 | (or (>= emacs-major-version 20) |
| 156 | (or (>= emacs-major-version 20) | 156 | (load "cl-seq")) |
| 157 | (load "cl-seq"))) | ||
| 158 | 157 | ||
| 159 | (unless (boundp 'custom-print-functions) | 158 | (unless (boundp 'custom-print-functions) |
| 160 | (defvar custom-print-functions nil)) ; not autoloaded before Emacs 20.4 | 159 | (defvar custom-print-functions nil)) ; not autoloaded before Emacs 20.4 |