[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/integration-of-dictionary-el 81ebe86 04/17: Show error message w
From: |
Torsten Hilbrich |
Subject: |
feature/integration-of-dictionary-el 81ebe86 04/17: Show error message when asking to match for nothing |
Date: |
Mon, 14 Dec 2020 05:46:37 -0500 (EST) |
branch: feature/integration-of-dictionary-el
commit 81ebe86d8deace5cc39979a42dcf062bdaa830c4
Author: Torsten Hilbrich <torsten.hilbrich@gmx.net>
Commit: Torsten Hilbrich <torsten.hilbrich@gmx.net>
Show error message when asking to match for nothing
* lisp/net/dictionary.el (dictionary-popup-matching-words): Show error
if neither the parameter nor the word at point are defined
This avoids an error later on when the nil value is used as string
within dictionary-encode-charset.
---
lisp/net/dictionary.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index 12b11cb..d910dab 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -1179,7 +1179,7 @@ It presents the word at point as default input and allows
editing it."
(defun dictionary-popup-matching-words (&optional word)
"Display entries matching the word at the point"
(interactive)
- (dictionary-do-matching (or word (current-word))
+ (dictionary-do-matching (or word (current-word) (error "Nothing to search
for"))
dictionary-default-dictionary
dictionary-default-popup-strategy
'dictionary-process-popup-replies))
- feature/integration-of-dictionary-el updated (7ca331a -> 62d14e1), Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el a25a12d 12/17: Use when where else case returns nil, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el ffa7d66 09/17: * lisp/net/dictionary.el: Prefer defsubst over defmacro, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el a557a10 08/17: * lisp/net/dictionary-connection.el: Prefer defsubst, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el f584437 06/17: * lisp/net/dictionary-connection.el: Remove obsolete Version, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el 54a3964 07/17: Update GPL version, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el d5a4da2 01/17: * lisp/net/dictionary.el: Remove remnants of package, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el cc5f280 02/17: * lisp/net/dictionary.el: Add lexical-binding:t, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el 81ebe86 04/17: Show error message when asking to match for nothing,
Torsten Hilbrich <=
- feature/integration-of-dictionary-el 09952ce 03/17: Removed useless check for popup-menu, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el 4deb861 10/17: * lisp/net/dictionary.el (dictionary-mode): Use setq-local, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el 0044a2e 05/17: * lisp/net/dictionary-connection.el: Add lexical-binding:t, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el ca0de4d 16/17: * etc/NEWS: Add entry for dictionary.el, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el 62d14e1 17/17: * lisp/net/dictionary.el (dictionary-pre-buffer): Unify casing, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el 89e9c16 13/17: * lisp/net/dictionary.el (dictionary-display-more-info): Spelling fix, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el d466231 14/17: A number of docstring fixes, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el d30618c 11/17: * lisp/net/dictionary.el (dictionary-tooltip-mode): Use setq-local, Torsten Hilbrich, 2020/12/14
- feature/integration-of-dictionary-el b18217e 15/17: A number of docstring fixes, Torsten Hilbrich, 2020/12/14