[Emacs-diffs] Changes to emacs/lisp/mh-e/mh-acros.el

[Bill Wohler]

Index: emacs/lisp/mh-e/mh-acros.el
diff -c emacs/lisp/mh-e/mh-acros.el:1.3 emacs/lisp/mh-e/mh-acros.el:1.4
*** emacs/lisp/mh-e/mh-acros.el:1.3     Sun Aug 22 05:11:27 2004
--- emacs/lisp/mh-e/mh-acros.el Wed Aug 25 05:55:39 2004
***************
*** 51,62 ****
  \(setf (gethash ...) ...) that uses functions in `cl' at run time.  This macro
  recognizes that and loads `cl' where appropriate."
    (if (eq (car (macroexpand '(setf (gethash foo bar) baz))) 'cl-puthash)
!       `(progn
!          (require 'cl)
!          ;; Autoloads of CL functions go here...
!          (autoload 'cl-puthash "cl")
!          (autoload 'values "cl")
!          (autoload 'copy-tree "cl"))
      `(eval-when-compile (require 'cl))))
  
  ;;; Macros to generate correct code for different emacs variants
--- 51,57 ----
  \(setf (gethash ...) ...) that uses functions in `cl' at run time.  This macro
  recognizes that and loads `cl' where appropriate."
    (if (eq (car (macroexpand '(setf (gethash foo bar) baz))) 'cl-puthash)
!       `(require 'cl)
      `(eval-when-compile (require 'cl))))
  
  ;;; Macros to generate correct code for different emacs variants
***************
*** 130,135 ****
--- 125,136 ----
                            (list 'nth ,x z)))
         (quote ,struct-name))))
  
+ (defadvice require (around mh-prefer-el activate)
+   "Modify `require' to load uncompiled MH-E files."
+   (or (featurep (ad-get-arg 0))
+       (and (string-match "^mh-" (symbol-name (ad-get-arg 0)))
+            (load (format "%s.el" (ad-get-arg 0)) t t))
+       ad-do-it))
  
  (provide 'mh-acros)