diff options
| author | Kenichi Handa <handa@gnu.org> | 2012-10-30 20:38:37 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@gnu.org> | 2012-10-30 20:38:37 +0900 |
| commit | 6ccc848cd85e75d77d6b11a46f5f23f860db9ff5 (patch) | |
| tree | e10cb69f3bbe6f2d9616d3867f12bf035c70e0f8 /lisp/emacs-lisp/eieio-opt.el | |
| parent | aee5b18ec3c7844ca125249914113eeaef04342c (diff) | |
| parent | fcc1acdadbeae00d8dcabeb6dccb20da9672af2c (diff) | |
| download | emacs-6ccc848cd85e75d77d6b11a46f5f23f860db9ff5.tar.gz emacs-6ccc848cd85e75d77d6b11a46f5f23f860db9ff5.tar.bz2 emacs-6ccc848cd85e75d77d6b11a46f5f23f860db9ff5.zip | |
merge trun
Diffstat (limited to 'lisp/emacs-lisp/eieio-opt.el')
| -rw-r--r-- | lisp/emacs-lisp/eieio-opt.el | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el index 64b240b9d5d..c8bdd7758fa 100644 --- a/lisp/emacs-lisp/eieio-opt.el +++ b/lisp/emacs-lisp/eieio-opt.el @@ -29,9 +29,9 @@ ;; (require 'eieio) -(require 'button) -(require 'help-mode) (require 'find-func) +(require 'speedbar) +(require 'help-mode) ;;; Code: ;;;###autoload @@ -710,10 +710,6 @@ Arguments UNUSED are not used." ;;; SPEEDBAR SUPPORT ;; -(eval-when-compile - (condition-case nil - (require 'speedbar) - (error (message "Error loading speedbar... ignored")))) (defvar eieio-class-speedbar-key-map nil "Keymap used when working with a project in speedbar.") |