@@ -3,22 +3,11 @@ ;; (eval-when-compile (require 'cl)) -(defun rbdbgr-directory () - "The directory of this file, or nil." - (let ((file-name (or load-file-name - (symbol-file 'rbdbgr-directory)))) - (if file-name - (file-name-directory file-name) - nil))) - -(setq load-path (cons nil - (cons (format "%s.." (rbdbgr-directory)) - (cons (rbdbgr-directory) load-path)))) -(require 'dbgr-track) -(require 'rbdbgr-regexp) -(require 'dbgr-core) -(require 'dbgr-scriptbuf) -(setq load-path (cdddr load-path)) +(require 'load-relative) +(provide 'rbdbgr-core) +(load-relative + '("../dbgr-track" "../dbgr-core" "../dbgr-scriptbuf") + 'rbdbgr-track-mode) ;; FIXME: I think the following could be generalized and moved to ;; dbgr-... probably via a macro. @@ -262,13 +251,6 @@ breakpoints, etc.)." (interactive) (customize-group 'rbdbgr)) - -;; ------------------------------------------------------------------- -;; The end. -;; - -(provide 'rbdbgr-core) - ;;; Local variables: ;;; eval:(put 'rbdbgr-debug-enter 'lisp-indent-hook 1) ;;; End: ruby/rbdbgr-core.el @@ -5,20 +5,9 @@ ;; (eval-when-compile (require 'cl)) -(defun rbdbgr-directory () - "The directory of this file, or nil." - (let ((file-name (or load-file-name - (symbol-file 'rbdbgr-core)))) - (if file-name - (file-name-directory file-name) - nil))) - -(setq load-path (cons nil - (cons (format "%s.." (rbdbgr-directory)) - (cons (rbdbgr-directory) load-path)))) -(load "dbgr-regexp") ; for make-dbgr-loc-pat -(setq load-path (cdddr load-path)) - +(require 'load-relative) +(provide 'rbdbgr-regexp) +(load-relative "../dbgr-regexp" 'rbdbgr-regexp) (defvar rbdbgr-pat-hash (make-hash-table :test 'equal) "Hash key is the what kind of pattern we want to match: traceback, prompt, etc. @@ -52,8 +41,6 @@ The values of a hash entry is a dbgr-dbgr-loc-pat struct") :line-group 2)) -(provide 'rbdbgr-regexp) - ;;; Local variables: ;;; eval:(put 'rbdbgr-debug-enter 'lisp-indent-hook 1) ;;; End: ruby/rbdbgr-regexp.el @@ -3,21 +3,9 @@ (eval-when-compile (require 'cl)) -(defun rbdbgr-directory () - "The directory of this file, or nil." - (let ((file-name (or load-file-name - (symbol-file 'rbdbgr-track-mode)))) - (if file-name - (file-name-directory file-name) - nil))) - -(setq load-path (cons nil - (cons (format "%s.." (rbdbgr-directory)) - (cons (rbdbgr-directory) load-path)))) -(require 'dbgr-track-mode) -(require 'rbdbgr-core) -(setq load-path (cdddr load-path)) - +(require 'load-relative) +(provide 'rbdbgr-track-mode) +(load-relative '("../dbgr-track-mode" "rbdbgr-core") 'rbdbgr-track-mode) (defun rbdbgr-track-mode-body() "Called when entering or leaving rbdbgr-track-mode" @@ -57,12 +45,6 @@ Use the command `rbdbgr-track-mode' to toggle or set this variable.") (rbdbgr-track-mode-body) ) -;; ------------------------------------------------------------------- -;; The end. -;; - -(provide 'rbdbgr-track-mode) - ;;; Local variables: ;;; eval:(put 'rbdbg-debug-enter 'lisp-indent-hook 1) ;;; End: ruby/rbdbgr-track-mode.el @@ -4,21 +4,9 @@ "You need at least Emacs 22 or greater to run this - you have version %d" emacs-major-version)) -(defun rbdbgr-directory () - "The directory of this file, or nil." - (let ((file-name (or load-file-name - (symbol-file 'rbdbgr)))) - (if file-name - (file-name-directory file-name) - nil))) - -(setq load-path (cons nil - (cons (format "%s.." (rbdbgr-directory)) - (cons (rbdbgr-directory) load-path)))) - -(load "rbdbgr-core") -(load "rbdbgr-track-mode") -(setq load-path (cdddr load-path)) +(require 'load-relative) +(provide 'rbdbgr) +(load-relative '("rbdbgr-core" "rbdbgr-track-mode") 'rbdbgr) ;; This is needed, or at least the docstring part of it is needed to ;; get the customization menu to work in Emacs 23. ruby/rbdbgr.el e31465421704fb9879c5a2fc538c3ed74efe0eae rocky rockyb@rubyforge.org http://github.com/rocky/emacs-dbgr/commit/97bd5c1d6943b5849a47542755972b921784323a 97bd5c1d6943b5849a47542755972b921784323a 2009-11-09T02:06:48-08:00 2009-11-09T02:06:48-08:00 Use require-relative now. 27f9372dac16c11e5e62a5621c2e00c5fcd11409 rocky rockyb@rubyforge.org