[Emacs-diffs] /srv/bzr/emacs/trunk r110114: * lisp/calc/calc.el: Fix last change by removing the whole chunk, since it

[Stefan Monnier]

------------------------------------------------------------
revno: 110114
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-09-20 09:44:45 -0400
message:
  * lisp/calc/calc.el: Fix last change by removing the whole chunk, since it
  was only needed back when Calc was not bundled.
modified:
  lisp/ChangeLog
  lisp/calc/calc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-20 13:35:13 +0000
+++ b/lisp/ChangeLog    2012-09-20 13:44:45 +0000
@@ -1,3 +1,8 @@
+2012-09-20  Stefan Monnier  <address@hidden>
+
+       * calc/calc.el: Fix last change by removing the whole chunk, since it
+       was only needed back when Calc was not bundled.
+
 2012-09-20  Martin Rudalics  <address@hidden>
 
        * emacs-lisp/debug.el (debug): Restore assignment to

=== modified file 'lisp/calc/calc.el'
--- a/lisp/calc/calc.el 2012-09-20 03:44:57 +0000
+++ b/lisp/calc/calc.el 2012-09-20 13:44:45 +0000
@@ -912,34 +912,6 @@
 (defvar calc-embedded-mode-hook nil
   "Hook run when starting embedded mode.")
 
-;; Set up the autoloading linkage.
-(let ((name (and (fboundp 'calc-dispatch)
-                 (autoloadp (symbol-function 'calc-dispatch))))
-      (p load-path))
-
-  ;; If Calc files exist on the load-path, we're all set.
-  (while (and p (not (file-exists-p
-                      (expand-file-name "calc-misc.elc" (car p)))))
-    (setq p (cdr p)))
-  (or p
-
-      ;; If Calc is autoloaded using a path name, look there for Calc files.
-      ;; This works for both relative ("calc/calc.elc") and absolute paths.
-      (and name (file-name-directory name)
-           (let ((p2 load-path)
-                 (name2 (concat (file-name-directory name)
-                                "calc-misc.elc")))
-             (while (and p2 (not (file-exists-p
-                                  (expand-file-name name2 (car p2)))))
-               (setq p2 (cdr p2)))
-             (when p2
-               (setq load-path (nconc load-path
-                                      (list
-                                       (directory-file-name
-                                        (file-name-directory
-                                         (expand-file-name
-                                          name (car p2))))))))))))
-
 ;; The following modes use specially-formatted data.
 (put 'calc-mode 'mode-class 'special)
 (put 'calc-trail-mode 'mode-class 'special)