[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 06/16: * packages/trie/trie.el (edebug-prin1, edebug-prin1-to-str
From: |
Stefan Monnier |
Subject: |
[elpa] 06/16: * packages/trie/trie.el (edebug-prin1, edebug-prin1-to-string): Use advice-add when available. |
Date: |
Wed, 15 Oct 2014 21:05:55 +0000 |
monnier pushed a commit to branch master
in repository elpa.
commit 7e2200f74dbe63ad8d2bc00f85cb5b84a41b8d05
Author: Stefan Monnier <address@hidden>
Date: Wed Oct 15 16:35:25 2014 -0400
* packages/trie/trie.el (edebug-prin1, edebug-prin1-to-string): Use
advice-add when available.
---
packages/trie/trie.el | 52 ++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/packages/trie/trie.el b/packages/trie/trie.el
index 894aa60..d428fda 100644
--- a/packages/trie/trie.el
+++ b/packages/trie/trie.el
@@ -1,6 +1,6 @@
;;; trie.el --- Trie data structure
-;; Copyright (C) 2008-2010, 2012 Free Software Foundation, Inc
+;; Copyright (C) 2008-2010, 2012, 2014 Free Software Foundation, Inc
;; Author: Toby Cubitt <address@hidden>
;; Version: 0.2.6
@@ -1871,29 +1871,41 @@ elements that matched the corresponding groups, in
order."
;; "]")))
))
-
-(when (fboundp 'ad-define-subr-args)
- (ad-define-subr-args 'edebug-prin1 '(object &optional printcharfun)))
-
-(defadvice edebug-prin1
- (around trie activate compile preactivate)
+(defun trie--edebug-prin1 (orig object &optional printcharfun)
(let ((pretty (trie--edebug-pretty-print object)))
(if pretty
(progn
(prin1 pretty printcharfun)
- (setq ad-return-value pretty))
- ad-do-it)))
-
-
-(when (fboundp 'ad-define-subr-args)
- (ad-define-subr-args 'edebug-prin1-to-string '(object &optional noescape)))
-
-(defadvice edebug-prin1-to-string
- (around trie activate compile preactivate)
- (let ((pretty (trie--edebug-pretty-print object)))
- (if pretty
- (setq ad-return-value pretty)
- ad-do-it)))
+ pretty)
+ (funcall orig object printcharfun))))
+
+(defun trie--edebug-prin1-to-string (orig object &optional noescape)
+ (or (trie--edebug-pretty-print object)
+ (funcall orig object noescape)))
+
+(if (fboundp 'advice-add)
+ (progn
+ (advice-add 'edebug-prin1 :around #'trie--edebug-prin1)
+ (advice-add 'edebug-prin1-to-string
+ :around #'trie--edebug-prin1-to-string))
+
+ (when (fboundp 'ad-define-subr-args)
+ (ad-define-subr-args 'edebug-prin1 '(object &optional printcharfun)))
+
+ (defadvice edebug-prin1
+ (around trie activate compile preactivate)
+ (setq ad-return-value
+ (trie--edebug-prin1 (lambda (object printcharfun) ad-do-it)
+ object printcharfun)))
+
+ (when (fboundp 'ad-define-subr-args)
+ (ad-define-subr-args 'edebug-prin1-to-string '(object &optional noescape)))
+
+ (defadvice edebug-prin1-to-string
+ (around trie activate compile preactivate)
+ (setq ad-return-value
+ (trie--edebug-prin1-to-string (lambda (object noescape) ad-do-it)
+ object noescape))))
- [elpa] branch master updated (25c579d -> e7e02c2), Stefan Monnier, 2014/10/15
- [elpa] 01/16: * packages/register-list/register-list.el (register-list): Pass arg to called-interactively-p., Stefan Monnier, 2014/10/15
- [elpa] 02/16: * packages/rainbow-mode/rainbow-mode.el (ansi-color-context) (xterm-color-current): Declare., Stefan Monnier, 2014/10/15
- [elpa] 03/16: * poker/poker.el (poker-combinations, poker-possible-hands): Fix tests., Stefan Monnier, 2014/10/15
- [elpa] 04/16: * packages/num3-mode/num3-mode.el (num3-mode): Use font-lock-flush if available., Stefan Monnier, 2014/10/15
- [elpa] 05/16: * packages/shen-mode/inf-shen.el: Don't require `cl'. (shen-remember-functions): Avoid `flet'., Stefan Monnier, 2014/10/15
- [elpa] 08/16: * packages/uni-confusables/uni-confusables.el: Fix up comment convention. * packages/uni-confusables/gen-confusables.el (gen-confusables-write): Idem., Stefan Monnier, 2014/10/15
- [elpa] 06/16: * packages/trie/trie.el (edebug-prin1, edebug-prin1-to-string): Use advice-add when available.,
Stefan Monnier <=
- [elpa] 09/16: * GNUmakefile (%-pkg.el): Silence the emacs command line again. (all-in-place): Remove debug message., Stefan Monnier, 2014/10/15
- [elpa] 10/16: * packages/f90-interface-browser/f90-interface-browser.el (f90-fontify-arglist): Use font-lock-ensure when available., Stefan Monnier, 2014/10/15
- [elpa] 11/16: * packages/flylisp/flylisp.el (jit-lock-start): Declare., Stefan Monnier, 2014/10/15
- [elpa] 12/16: * packages/jgraph-mode/jgraph-mode.el: Use lexical-binding. (jgraph-extract-commands): Avoid add-to-list on local var., Stefan Monnier, 2014/10/15
- [elpa] 13/16: * packages/markchars/markchars.el (markchars-mode): Use font-lock-flush when available., Stefan Monnier, 2014/10/15
- [elpa] 14/16: * packages/vlf/vlf-occur.el, vlf-search.el, vlf-write.el (tramp-verbose): Declare., Stefan Monnier, 2014/10/15
- [elpa] 07/16: * packages/tNFA/tNFA.el (tNFA--DFA-state-create): Avoid add-to-list on local var., Stefan Monnier, 2014/10/15
- [elpa] 16/16: Miscellaneous cleanup., Stefan Monnier, 2014/10/15
- [elpa] 15/16: * packages/js2-mode/js2-imenu-extras.el: Use Unix-style EOL., Stefan Monnier, 2014/10/15