summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-05-11 13:31:30 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2012-05-11 13:31:30 -0400
commitaa0382bd67c77578fc2e589ba802f5f1330a4a0a (patch)
tree097a988250216c866d9d3d6472422c6b355a3484 /lisp
parentc8e321795a3c7028204a05c81c3a4869103a004e (diff)
downloademacs-aa0382bd67c77578fc2e589ba802f5f1330a4a0a.tar.gz
emacs-aa0382bd67c77578fc2e589ba802f5f1330a4a0a.tar.bz2
emacs-aa0382bd67c77578fc2e589ba802f5f1330a4a0a.zip
* lisp/dabbrev.el (dabbrev-expand): Make "no expansion found" a user-error.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/dabbrev.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f54e2da78f1..467e7f06457 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
2012-05-11 Stefan Monnier <monnier@iro.umontreal.ca>
+ * dabbrev.el (dabbrev-expand): Make "no expansion found" a user-error.
+
* minibuffer.el (completion--twq-all): Again, allow case differences.
* term.el: Move keymap initialization code to be more idiomatic.
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 87a03fd24da..ab886edac25 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -527,8 +527,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
(search-backward old)
(insert abbrev)
(delete-region (point) (+ (point) (length old)))))
- (error "No%s dynamic expansion for `%s' found"
- (if old " further" "") abbrev))
+ (user-error "No%s dynamic expansion for `%s' found"
+ (if old " further" "") abbrev))
(t
(if (not (or (eq dabbrev--last-buffer dabbrev--last-buffer-found)
(minibuffer-window-active-p (selected-window))))