Show
Ignore:
Timestamp:
05/13/06 11:31:18 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/emacs-lisp/crm.el

    r4037 r4079  
    593593PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HIST, DEF, and 
    594594INHERIT-INPUT-METHOD." 
    595   (let ((minibuffer-completion-table (function crm-collection-fn)) 
    596         (minibuffer-completion-predicate predicate) 
    597         ;; see completing_read in src/minibuf.c 
    598         (minibuffer-completion-confirm 
    599          (unless (eq require-match t) require-match)) 
    600         (crm-completion-table table) 
    601         crm-last-exact-completion 
    602         crm-current-element 
    603         crm-left-of-element 
    604         crm-right-of-element 
    605         crm-beginning-of-element 
    606         crm-end-of-element 
    607         (map (if require-match 
    608                  crm-local-must-match-map 
    609                crm-local-completion-map))) 
    610     (split-string (read-from-minibuffer 
    611                    prompt initial-input map 
    612                    nil hist def inherit-input-method) 
    613                   crm-separator))) 
     595  (let* ((minibuffer-completion-table (function crm-collection-fn)) 
     596         (minibuffer-completion-predicate predicate) 
     597         ;; see completing_read in src/minibuf.c 
     598         (minibuffer-completion-confirm 
     599          (unless (eq require-match t) require-match)) 
     600         (crm-completion-table table) 
     601         crm-last-exact-completion 
     602         crm-current-element 
     603         crm-left-of-element 
     604         crm-right-of-element 
     605         crm-beginning-of-element 
     606         crm-end-of-element 
     607         (map (if require-match 
     608                  crm-local-must-match-map 
     609                crm-local-completion-map)) 
     610         ;; If the user enters empty input, read-from-minibuffer returns 
     611         ;; the empty string, not DEF. 
     612         (input (read-from-minibuffer 
     613                 prompt initial-input map 
     614                 nil hist def inherit-input-method))) 
     615    (and def (string-equal input "") (setq input def)) 
     616    (split-string input crm-separator))) 
    614617 
    615618;; testing and debugging