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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f54e2da78f1f896b1bc845878218acf8f5b5164a..467e7f0645768157b0a544b2036280c65144f71a 100644 (file)
--- 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 87a03fd24da46626c0a2741f6022ddba0529e69c..ab886edac25de810798572bc9fb7b40228fa8ae6 100644 (file)
--- 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))))