emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] scratch/yasnippet 9c52efc14a 6/8: * yasnippet-debug.el: Use `advi


From: Stefan Monnier
Subject: [elpa] scratch/yasnippet 9c52efc14a 6/8: * yasnippet-debug.el: Use `advice-add` i.s.o `defadvice`.
Date: Wed, 28 Jun 2023 11:06:06 -0400 (EDT)

branch: scratch/yasnippet
commit 9c52efc14a85248d040d7ebac5aa16f886884709
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * yasnippet-debug.el: Use `advice-add` i.s.o `defadvice`.
    
    Now that we use `add-function`, we may as well avoid using the deprecated
    `defadvice`
    
    (cl-flet): Remove confusing `cl-flet` fallback, always provided by `cl-lib`.
    (yas--snippet-parse-create, yas--commit-snippet):
    Use `advice-add` i.s.o `defadvice`.
---
 yasnippet-debug.el | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/yasnippet-debug.el b/yasnippet-debug.el
index d33e8a5f6f..798c7ce263 100644
--- a/yasnippet-debug.el
+++ b/yasnippet-debug.el
@@ -1,6 +1,6 @@
 ;;; yasnippet-debug.el --- debug functions for yasnippet -*- lexical-binding: 
t -*-
 
-;; Copyright (C) 2010, 2013-2014, 2017-2018  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2023  Free Software Foundation, Inc.
 
 ;; Author: João Távora
 ;; Keywords: emulations, convenience
@@ -40,9 +40,6 @@
                         ;; Don't require '-L <path>' when debugging.
                         (expand-file-name "yasnippet" yas--loaddir)))
 (require 'cl-lib)
-(eval-when-compile
-  (unless (fboundp 'cl-flet)
-    (defalias 'cl-flet 'flet)))
 (require 'color nil t)
 (require 'edebug)
 (eval-when-compile
@@ -224,13 +221,15 @@
   (setq yas-debug-undo value)
   (yas--message 3 "debug undo %sabled" (if yas-debug-undo "en" "dis")))
 
-(defadvice yas--snippet-parse-create (before yas-debug-target-snippet 
(snippet))
+(advice-add 'yas--snippet-parse-create :before #'yas-debug--target-snippet)
+(defun yas-debug--target-snippet (snippet)
   (add-to-list 'yas-debug-target-snippets snippet))
 
-(defadvice yas--commit-snippet (after yas-debug-untarget-snippet (snippet))
+(advice-add 'yas--commit-snippet :after #'yas-debug--untarget-snippet)
+(defun yas-debug--untarget-snippet (snippet)
   (setq yas-debug-target-snippets
         (remq snippet yas-debug-target-snippets))
-  (maphash (lambda (k color-ov)
+  (maphash (lambda (_k color-ov)
              (delete-overlay (cdr color-ov)))
            yas-debug-live-indicators)
   (clrhash yas-debug-live-indicators))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]