X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=devel%2Ftry-emacs-mua;h=585d6242deb198a83be227bab381a425c5fa4799;hb=785745783345d3ed56f0b435fcea44515aae8bea;hp=b0a62c25b28f1e13a34a3ea04b21887ebb79cd16;hpb=3959d98535b1a3fa61d45a457cce23aa7569b942;p=notmuch

diff --git a/devel/try-emacs-mua b/devel/try-emacs-mua
index b0a62c25..585d6242 100755
--- a/devel/try-emacs-mua
+++ b/devel/try-emacs-mua
@@ -7,7 +7,7 @@
 ;;
 ;; Authors: Tomi Ollila <tomi.ollila@iki.fi>
 ;;
-;; http://www.emacswiki.org/emacs/EmacsScripts was a useful starting point...
+;; https://www.emacswiki.org/emacs/EmacsScripts was a useful starting point...
 ;;
 ;; Licence: GPLv3+
 ;;
@@ -44,28 +44,10 @@ while looking at: " pdir "emacs\n\nexit emacs (y or n)? ")
 	try-notmuch-emacs-directory (concat pdir "emacs/")
 	load-path (cons try-notmuch-emacs-directory load-path)))
 
-;; they say advice doesn't work for primitives (functions from c source)
-;; well, these 'before' advice works for emacs 23.1 - 24.5 (at least)
-;; ...and for our purposes 24.3 is enough (there is no load-prefer-newer there)
-;; note also that the old, "obsolete" defadvice mechanism was used, but that
-;; is the only one available for emacs 23 and 24 up to 24.3.
-
-(if (boundp 'load-prefer-newer)
-    (defadvice require (before before-require activate)
-      (unless (featurep feature)
-	(message "require: %s" feature)))
-  ;; else: special require "short-circuit"; after load feature is provided...
-  ;; ... in notmuch sources we always use require and there are no loops
-  (defadvice require (before before-require activate)
-    (unless (featurep feature)
-      (message "require: %s" feature)
-      (let ((name (symbol-name feature)))
-	(if (and (string-match "^notmuch" name)
-		 (file-newer-than-file-p
-		  (concat try-notmuch-emacs-directory name ".el")
-		  (concat try-notmuch-emacs-directory name ".elc")))
-	    (load (concat try-notmuch-emacs-directory name ".el") nil nil t t)
-	  )))))
+(define-advice require
+    (:before (feature &optional _filename _noerror) notmuch)
+  (unless (featurep feature)
+    (message "require: %s" feature)))
 
 (insert "Found notmuch emacs client in " try-notmuch-emacs-directory "\n")