[elpa] externals/dict-tree d6ea2b5 088/154: Fixed interactive argument handling in predictive-fast-learn-from-buffer.

[Stefan Monnier]

branch: externals/dict-tree
commit d6ea2b53bd76b569bcbba9c37e78158d37b0ff0c
Author: Toby S. Cubitt <toby-predict...@dr-qubit.org>
Commit: Toby S. Cubitt <toby-predict...@dr-qubit.org>

    Fixed interactive argument handling in predictive-fast-learn-from-buffer.
    
    Although the read-dict prompt claimed to default to all dictionaries, it
    didn't in fact handle an emptry input properly.
---
 dict-tree.el | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/dict-tree.el b/dict-tree.el
index e8b7545..fd769fd 100644
--- a/dict-tree.el
+++ b/dict-tree.el
@@ -2,10 +2,10 @@
 ;;; dict-tree.el --- dictionary data structure package
 
 
-;; Copyright (C) 2004-2010 Toby Cubitt
+;; Copyright (C) 2004-2011 Toby Cubitt
 
 ;; Author: Toby Cubitt <toby-predict...@dr-qubit.org>
-;; Version: 0.12.4
+;; Version: 0.12.5
 ;; Keywords: dictionary, tree
 ;; URL: http://www.dr-qubit.org/emacs.php
 
@@ -53,6 +53,9 @@
 
 ;;; Change log:
 ;;
+;; Version 0.12.5
+;; * fixed default value handling in `read-dict'
+;;
 ;; Version 0.12.4
 ;; * minor bug-fix to `dictree--edebug-pretty-print' to print "nil"
 ;;   instead of "()"
@@ -3536,7 +3539,9 @@ extension, suitable for passing to `load-library'."
        (void-variable nil))
       (eval (intern-soft dictname)))
      ;; if user selected an unloaded dictionary, return dict name
-     (allow-unloaded dictname)
+     ((and allow-unloaded (stringp dictname)) dictname)
+     ;; if DEFAULT was specified, return that
+     (default default)
      ;; should never get here!
      (t (error "Unknown error reading dictionary")))
     ))
@@ -3602,7 +3607,7 @@ extension, suitable for passing to `load-library'."
    ))
 
 
-(ad-define-subr-args 'edebug-prin1 '(object &optional printcharfun))
+;(ad-define-subr-args 'edebug-prin1 '(object &optional printcharfun))
 
 (defadvice edebug-prin1
   (around dictree activate compile preactivate)
@@ -3614,7 +3619,7 @@ extension, suitable for passing to `load-library'."
     ad-do-it)))
 
 
-(ad-define-subr-args 'edebug-prin1-to-string '(object &optional noescape))
+;(ad-define-subr-args 'edebug-prin1-to-string '(object &optional noescape))
 
 (defadvice edebug-prin1-to-string
   (around dictree activate compile preactivate)