Index: emacs/lisp/emacs-lisp/crm.el
diff -c emacs/lisp/emacs-lisp/crm.el:1.5 emacs/lisp/emacs-lisp/crm.el:1.6
*** emacs/lisp/emacs-lisp/crm.el:1.5 Mon Sep 1 15:45:20 2003
--- emacs/lisp/emacs-lisp/crm.el Fri Jul 1 01:10:42 2005
***************
*** 197,205 ****
respectively,
and return t."
! (let* ((minibuffer-string (buffer-string))
! (end-index (or (string-match "," minibuffer-string (1- (point)))
! (1- (point-max))))
(target-string (substring minibuffer-string 0 end-index))
(index (or (string-match
(concat crm-separator "\\([^" crm-separator "]*\\)$")
--- 197,206 ----
respectively,
and return t."
! (let* ((prompt-end (minibuffer-prompt-end))
! (minibuffer-string (buffer-substring prompt-end (point-max)))
! (end-index (or (string-match "," minibuffer-string (- (point)
prompt-end))
! (- (point-max) prompt-end)))
(target-string (substring minibuffer-string 0 end-index))
(index (or (string-match
(concat crm-separator "\\([^" crm-separator "]*\\)$")
***************
*** 215,221 ****
(setq crm-beginning-of-element (match-beginning 1))
(setq crm-end-of-element end-index)
;; string to the left of the current element
! (setq crm-left-of-element (substring target-string 0 (match-beginning
1)))
;; the current element
(setq crm-current-element (match-string 1 target-string))
;; string to the right of the current element
--- 216,223 ----
(setq crm-beginning-of-element (match-beginning 1))
(setq crm-end-of-element end-index)
;; string to the left of the current element
! (setq crm-left-of-element
! (substring target-string 0 (match-beginning 1)))
;; the current element
(setq crm-current-element (match-string 1 target-string))
;; string to the right of the current element
***************
*** 287,293 ****
(if completedp
(progn
! (erase-buffer)
(insert crm-left-of-element completion)
;; (if crm-complete-up-to-point
;; (insert crm-separator))
--- 289,295 ----
(if completedp
(progn
! (delete-region (minibuffer-prompt-end) (point-max))
(insert crm-left-of-element completion)
;; (if crm-complete-up-to-point
;; (insert crm-separator))
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
