branch: externals/idlwave commit aa0d37c454a6e83e5a64ddb946f45656dd0b4e5f Author: JD Smith <jdtsm...@gmail.com> Commit: JD Smith <jdtsm...@gmail.com>
Don't require unnecessary things. From upstream Emacs. --- idlw-help.el | 5 +---- idlwave.el | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/idlw-help.el b/idlw-help.el index 51875be591..ffc3c7608e 100644 --- a/idlw-help.el +++ b/idlw-help.el @@ -41,10 +41,7 @@ (defvar idlwave-help-browse-url-available t "Whether browse-url is available") -(setq idlwave-help-browse-url-available - (condition-case nil - (require 'browse-url) - (error nil))) +(require 'browse-url) (defgroup idlwave-online-help nil "Online Help options for IDLWAVE mode." diff --git a/idlwave.el b/idlwave.el index c4388c2c5d..92a337c5e8 100644 --- a/idlwave.el +++ b/idlwave.el @@ -4932,7 +4932,6 @@ Cache to disk for quick recovery." (error "No such XML routine info file: %s" catalog-file) (if (not (file-readable-p catalog-file)) (error "Cannot read XML routine info file: %s" catalog-file))) - (require 'xml) (message "Reading XML routine info...") (setq rinfo (xml-parse-file catalog-file)) (message "Reading XML routine info...done") @@ -9318,20 +9317,17 @@ Assumes that point is at the beginning of the unit as found by (defun idlwave-show-commentary () "Use the finder to view the file documentation from `idlwave.el'." (interactive) - (require 'finder) (finder-commentary "idlwave.el")) (defun idlwave-shell-show-commentary () "Use the finder to view the file documentation from `idlw-shell.el'." (interactive) - (require 'finder) (finder-commentary "idlw-shell.el")) (defun idlwave-info () "Read documentation for IDLWAVE in the info system." (interactive) - (require 'info) - (Info-goto-node "(idlwave)")) + (info "idlwave")) (defun idlwave-list-abbrevs (arg) "Show the code abbreviations define in IDLWAVE mode.