[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/crm.el
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/crm.el |
Date: |
Tue, 04 Feb 2003 07:53:41 -0500 |
Index: emacs/lisp/emacs-lisp/crm.el
diff -c emacs/lisp/emacs-lisp/crm.el:1.3 emacs/lisp/emacs-lisp/crm.el:1.4
*** emacs/lisp/emacs-lisp/crm.el:1.3 Thu Nov 29 20:13:59 2001
--- emacs/lisp/emacs-lisp/crm.el Tue Feb 4 07:53:34 2003
***************
*** 85,91 ****
;; -tip: use M-f and M-b for ease of navigation among elements.
;;; History:
! ;;
;; 2000-04-10:
;;
;; first revamped version
--- 85,91 ----
;; -tip: use M-f and M-b for ease of navigation among elements.
;;; History:
! ;;
;; 2000-04-10:
;;
;; first revamped version
***************
*** 211,217 ****
;; no candidate found
nil
(progn
! ;;
(setq crm-beginning-of-element (match-beginning 1))
(setq crm-end-of-element end-index)
;; string to the left of the current element
--- 211,217 ----
;; no candidate found
nil
(progn
! ;;
(setq crm-beginning-of-element (match-beginning 1))
(setq crm-end-of-element end-index)
;; string to the left of the current element
***************
*** 226,232 ****
"Return t if CANDIDATE is an exact match for a valid completion."
(let ((completions
;; TODO: verify whether the arguments are appropriate
! (all-completions
candidate crm-completion-table minibuffer-completion-predicate)))
(if (member candidate completions)
t
--- 226,232 ----
"Return t if CANDIDATE is an exact match for a valid completion."
(let ((completions
;; TODO: verify whether the arguments are appropriate
! (all-completions
candidate crm-completion-table minibuffer-completion-predicate)))
(if (member candidate completions)
t
***************
*** 271,290 ****
minibuffer-completion-predicate))
(setq last crm-last-exact-completion)
(setq crm-last-exact-completion nil)
!
(catch 'crm-exit
!
(if (null completion) ; no possible completion
(progn
(crm-temp-echo-area-glyphs " [No match]")
(throw 'crm-exit 0)))
!
(if (eq completion t) ; was already an exact and unique completion
(throw 'crm-exit 1))
!
(setq completedp
(null (string-equal completion crm-current-element)))
!
(if completedp
(progn
(erase-buffer)
--- 271,290 ----
minibuffer-completion-predicate))
(setq last crm-last-exact-completion)
(setq crm-last-exact-completion nil)
!
(catch 'crm-exit
!
(if (null completion) ; no possible completion
(progn
(crm-temp-echo-area-glyphs " [No match]")
(throw 'crm-exit 0)))
!
(if (eq completion t) ; was already an exact and unique completion
(throw 'crm-exit 1))
!
(setq completedp
(null (string-equal completion crm-current-element)))
!
(if completedp
(progn
(erase-buffer)
***************
*** 295,301 ****
(backward-char (length crm-right-of-element))
;; TODO: is this correct?
(setq crm-current-element completion)))
!
(if (null (crm-test-completion crm-current-element))
(progn
(if completedp ; some completion happened
--- 295,301 ----
(backward-char (length crm-right-of-element))
;; TODO: is this correct?
(setq crm-current-element completion)))
!
(if (null (crm-test-completion crm-current-element))
(progn
(if completedp ; some completion happened
***************
*** 306,318 ****
(throw 'crm-exit 6))
(if completedp
(throw 'crm-exit 4)))
!
(setq crm-last-exact-completion completion)
(if (not (null last))
(progn
(if (not (null (equal crm-current-element last)))
(crm-minibuffer-completion-help))))
!
;; returning -- was already an exact completion
(throw 'crm-exit 3)))))
--- 306,318 ----
(throw 'crm-exit 6))
(if completedp
(throw 'crm-exit 4)))
!
(setq crm-last-exact-completion completion)
(if (not (null last))
(progn
(if (not (null (equal crm-current-element last)))
(crm-minibuffer-completion-help))))
!
;; returning -- was already an exact completion
(throw 'crm-exit 3)))))
***************
*** 472,495 ****
This function is modeled after `minibuffer_complete_and_exit' in
src/minibuf.c"
(interactive)
!
(if (not (crm-find-current-element))
nil
(let (result)
!
(setq result
(catch 'crm-exit
!
(if (eq (point-min) (point-max))
(throw 'crm-exit t))
!
;; TODO: this test is suspect?
(if (not (null (crm-test-completion crm-current-element)))
(throw 'crm-exit "check"))
!
;; TODO: determine how to detect errors
(let ((result (crm-do-completion)))
!
(cond
((or (eq 1 result)
(eq 3 result))
--- 472,495 ----
This function is modeled after `minibuffer_complete_and_exit' in
src/minibuf.c"
(interactive)
!
(if (not (crm-find-current-element))
nil
(let (result)
!
(setq result
(catch 'crm-exit
!
(if (eq (point-min) (point-max))
(throw 'crm-exit t))
!
;; TODO: this test is suspect?
(if (not (null (crm-test-completion crm-current-element)))
(throw 'crm-exit "check"))
!
;; TODO: determine how to detect errors
(let ((result (crm-do-completion)))
!
(cond
((or (eq 1 result)
(eq 3 result))
***************
*** 501,507 ****
nil)
(throw 'crm-exit "check")))
(nil)))))
!
(if (null result)
nil
(if (equal result "check")
--- 501,507 ----
nil)
(throw 'crm-exit "check")))
(nil)))))
!
(if (null result)
nil
(if (equal result "check")
***************
*** 541,547 ****
(define-key crm-local-completion-map
(kbd "TAB")
(function crm-minibuffer-complete)))
!
(unless crm-local-must-match-map
(setq crm-local-must-match-map (make-sparse-keymap))
(set-keymap-parent crm-local-must-match-map
--- 541,547 ----
(define-key crm-local-completion-map
(kbd "TAB")
(function crm-minibuffer-complete)))
!
(unless crm-local-must-match-map
(setq crm-local-must-match-map (make-sparse-keymap))
(set-keymap-parent crm-local-must-match-map
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/crm.el,
Juanma Barranquero <=