(idlwave-shell-break-in): Simplify module calc.

(idlwave-shell-set-bp-in-module): Compute module.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a2e3b41ccc492b68d418e0aee1116aceefd5e8a..92a130b5b271db4653ddc2c654f10de7f7b1d8d2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-01  J.D. Smith  <jdsmith@as.arizona.edu>
+
+       * progmodes/idlw-shell.el (idlwave-shell-break-in): Simplify
+       module calc.
+       (idlwave-shell-set-bp-in-module): Compute module.
+
 2007-03-31  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/timer.el (run-at-time): Doc fix.

diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index aa2d1b32d1076d13862c9296d60abe38eb8691db..bcecdeafa0f1e3813c821f1287a0ba7f2e88f835 100644 (file)
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -2698,7 +2698,7 @@ in the current routine."
         (class (nth 2 module)))
     (if module
        (progn 
-         (setq module (idlwave-make-full-name (nth 2 module) (car module)))
+         (setq module (idlwave-make-full-name class name))
          (idlwave-shell-module-source-query module type)
          (idlwave-shell-set-bp-in-module name type class))
       (error "No identifier at point"))))
@@ -2707,14 +2707,15 @@ in the current routine."
 (defun idlwave-shell-set-bp-in-module (name type class)
   "Set breakpoint in module.  Assumes that `idlwave-shell-sources-alist'
 contains an entry for that module."
-  (let ((source-file 
-        (car-safe (cdr-safe
-                   (or
-                    (assoc (upcase (idlwave-make-full-name class name))
-                           idlwave-shell-sources-alist)
-                    (nth 3 (idlwave-best-rinfo-assoc name type class 
-                                                     (idlwave-routines)))))))
-       buf)
+  (let* ((module (idlwave-make-full-name class name))
+        (source-file 
+         (car-safe (cdr-safe
+                    (or
+                     (assoc (upcase module)
+                            idlwave-shell-sources-alist)
+                     (nth 3 (idlwave-best-rinfo-assoc name type class 
+                                                      (idlwave-routines)))))))
+        buf)
     (if (or (not source-file)
            (not (file-regular-p source-file))
            (not (setq buf