From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 11 May 2012 17:31:30 +0000 (-0400)
Subject: * lisp/dabbrev.el (dabbrev-expand): Make "no expansion found" a user-error.
X-Git-Tag: emacs-24.2.90~471^2~116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aa0382bd67c77578fc2e589ba802f5f1330a4a0a;p=emacs.git

* lisp/dabbrev.el (dabbrev-expand): Make "no expansion found" a user-error.
---

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))))