[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/names 6fa3bc1 14/44: Merge branch 'elpa' into dev
From: |
Stefan Monnier |
Subject: |
[elpa] externals/names 6fa3bc1 14/44: Merge branch 'elpa' into dev |
Date: |
Sat, 27 Mar 2021 14:40:10 -0400 (EDT) |
branch: externals/names
commit 6fa3bc1f3514e09b56593b2ca6f764cce990b588
Merge: e2c0bd9 0728e24
Author: Artur Malabarba <bruce.connor.am@gmail.com>
Commit: Artur Malabarba <bruce.connor.am@gmail.com>
Merge branch 'elpa' into dev
---
names.el | 45 +++++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/names.el b/names.el
index 6d25805..4cd23a1 100644
--- a/names.el
+++ b/names.el
@@ -593,28 +593,29 @@ Also adds `version' to `names--fbound' and
`names--bound'."
byte-compile-macro-environment))))))))
;;;###autoload
-(defadvice find-function-search-for-symbol
- (around names-around-find-function-search-for-symbol-advice
- (symbol type library) activate)
- "Make sure `find-function-search-for-symbol' understands namespaces."
- ad-do-it
- (ignore-errors
- (unless (cdr ad-return-value)
- (with-current-buffer (car ad-return-value)
- (search-forward-regexp "^(define-namespace\\_>")
- (skip-chars-forward "\r\n[:blank:]")
- (let* ((names--regexp
- (concat "\\`" (regexp-quote
- (symbol-name (read (current-buffer))))))
- (short-symbol
- ;; We manually implement `names--remove-namespace'
- ;; because it might not be loaded.
- (let ((name (symbol-name symbol)))
- (when (string-match names--regexp name)
- (intern (replace-match "" nil nil name))))))
- (when short-symbol
- (ad-set-arg 0 short-symbol)
- ad-do-it))))))
+(eval-after-load 'find-func
+ '(defadvice find-function-search-for-symbol
+ (around names-around-find-function-search-for-symbol-advice
+ (symbol type library) activate)
+ "Make sure `find-function-search-for-symbol' understands namespaces."
+ ad-do-it
+ (ignore-errors
+ (unless (cdr ad-return-value)
+ (with-current-buffer (car ad-return-value)
+ (search-forward-regexp "^(define-namespace\\_>")
+ (skip-chars-forward "\r\n[:blank:]")
+ (let* ((names--regexp
+ (concat "\\`" (regexp-quote
+ (symbol-name (read (current-buffer))))))
+ (short-symbol
+ ;; We manually implement `names--remove-namespace'
+ ;; because it might not be loaded.
+ (let ((name (symbol-name symbol)))
+ (when (string-match names--regexp name)
+ (intern (replace-match "" nil nil name))))))
+ (when short-symbol
+ (ad-set-arg 0 short-symbol)
+ ad-do-it)))))))
(defun names--extract-autoloads (body)
"Return a list of the forms in BODY preceded by :autoload."
- [elpa] externals/names 787c1f1 26/44: Merge branch 'dev', (continued)
- [elpa] externals/names 787c1f1 26/44: Merge branch 'dev', Stefan Monnier, 2021/03/27
- [elpa] externals/names d8baba5 43/44: Merge pull request #30 from jabranham/byte-compiler-warns, Stefan Monnier, 2021/03/27
- [elpa] externals/names 00862c5 38/44: Merge branch 'dev', Stefan Monnier, 2021/03/27
- [elpa] externals/names 1d45ec5 41/44: Merge branch 'elpa', Stefan Monnier, 2021/03/27
- [elpa] externals/names b269f61 44/44: Merge remote-tracking branch 'upstream/names/main' into externals/names, Stefan Monnier, 2021/03/27
- [elpa] externals/names 48ed6aa 03/44: Merge branch 'elpa' into dev, Stefan Monnier, 2021/03/27
- [elpa] externals/names e2c0bd9 13/44: Merge branch 'elpa' into dev, Stefan Monnier, 2021/03/27
- [elpa] externals/names 9ebceab 39/44: Add file tests/.nosearch, Stefan Monnier, 2021/03/27
- [elpa] externals/names 7cad62b 42/44: Silence the byte compiler, Stefan Monnier, 2021/03/27
- [elpa] externals/names 7663049 12/44: Merge branch 'elpa' into dev, Stefan Monnier, 2021/03/27
- [elpa] externals/names 6fa3bc1 14/44: Merge branch 'elpa' into dev,
Stefan Monnier <=
- [elpa] externals/names eca83e8 19/44: Merge branch 'elpa' into dev, Stefan Monnier, 2021/03/27
- [elpa] externals/names 3ed0901 21/44: Merge branch 'elpa' into dev, Stefan Monnier, 2021/03/27
- [elpa] externals/names a6932f0 27/44: Merge branch 'elpa' into dev, Stefan Monnier, 2021/03/27
- [elpa] externals/names a36b4b3 35/44: Update Readme.org, Stefan Monnier, 2021/03/27
- [elpa] externals/names a970ce6 37/44: Merge branch 'elpa' into dev, Stefan Monnier, 2021/03/27
- [elpa] externals/names 6a9b829 06/44: Merge branch 'elpa', Stefan Monnier, 2021/03/27
- [elpa] externals/names e7ed674 16/44: Travis badge, Stefan Monnier, 2021/03/27
- [elpa] externals/names bcec847 11/44: Merge branch 'elpa' into dev, Stefan Monnier, 2021/03/27
- [elpa] externals/names d8ec653 32/44: Merge branch 'dev', Stefan Monnier, 2021/03/27