From f5fab556d45e13d12f83b2d8cd49fe343546c2f6 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Sun, 16 Oct 2005 09:31:48 +0000 Subject: * message.el (message-expand-group): Pass the common prefix substring of completion to `display-completion-list'. * mh-comp.el (mh-complete-word): Pass the common prefix substring of completion to `display-completion-list'. * dabbrev.el (dabbrev-completion): Pass the common prefix substring of completion to `display-completion-list'. * filecache.el (file-cache-minibuffer-complete) (file-cache-complete): Ditto. * tempo.el (tempo-display-completions): Ditto. * wid-edit.el (widget-file-complete, widget-color-complete): Ditto. * emacs-lisp/lisp.el (lisp-complete-symbol): Ditto. * eshell/em-hist.el (eshell-list-history): Ditto. * mail/mailabbrev.el (mail-abbrev-complete-alias): Ditto. * progmodes/etags.el (complete-tag): Ditto. * progmodes/make-mode.el (makefile-complete): Ditto. * progmodes/meta-mode.el (meta-complete-symbol): Ditto. * progmodes/octave-mod.el (octave-complete-symbol): Ditto. * progmodes/pascal.el (pascal-complete-word) (pascal-show-completions): Ditto. * textmodes/bibtex.el (bibtex-complete-internal): Ditto. * simple.el (completion-common-substring): New variable. (completion-setup-function): Use `completion-common-substring' to put faces. * minibuf.c (Fdisplay_completion_list): Add new optional argument COMMON_SUBSTRING. Bind `completion-common-substring' to the optional argument during running `completion-setup-hook'. --- lisp/emacs-lisp/lisp.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index d248882d882..4b799ebfedf 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -586,7 +586,7 @@ considered." (setq list (cdr list))) (setq list (nreverse new)))) (with-output-to-temp-buffer "*Completions*" - (display-completion-list list))) + (display-completion-list list pattern))) (message "Making completion list...%s" "done"))))))) ;;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e -- cgit v1.2.3 From 889c5dad201c98a3eefc91b1ec9f2f7595d03ec0 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 21 Oct 2005 06:01:22 +0000 Subject: (syntax-ppss-flush-cache): Fix corner boundary case. Suggested by Martin Rudalics . --- lisp/emacs-lisp/syntax.el | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index 126c8d50dd9..6c897319433 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -83,10 +83,14 @@ point (where the PPSS is equivalent to nil).") (setq syntax-ppss-cache (cdr syntax-ppss-cache))) ;; Throw away `last' value if made invalid. (when (< beg (or (car syntax-ppss-last) 0)) - (if (< beg (or (car (nth 10 syntax-ppss-last)) - (nth 9 syntax-ppss-last) - (nth 2 syntax-ppss-last) - 0)) + ;; If syntax-begin-function jumped to BEG, then the old state at BEG can + ;; depend on the text after BEG (which is presumably changed). So if + ;; BEG=(car (nth 10 syntax-ppss-last)) don't reuse that data because the + ;; assumed nil state at BEG may not be valid any more. + (if (<= beg (or (car (nth 10 syntax-ppss-last)) + (nth 9 syntax-ppss-last) + (nth 2 syntax-ppss-last) + 0)) (setq syntax-ppss-last nil) (setcar syntax-ppss-last nil))) ;; Unregister if there's no cache left. Sadly this doesn't work @@ -293,5 +297,5 @@ Point is at POS when this function returns." (provide 'syntax) -;;; arch-tag: 302f1eeb-e77c-4680-a8c5-c543e01161a5 +;; arch-tag: 302f1eeb-e77c-4680-a8c5-c543e01161a5 ;;; syntax.el ends here -- cgit v1.2.3 From 8debde6e208dfab075de1e975839fcdc2e350ca5 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 21 Oct 2005 06:05:09 +0000 Subject: (syntax-ppss-flush-cache): Fix typo. Suggested by Martin Rudalics . --- lisp/emacs-lisp/syntax.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index 6c897319433..9c2ac336b9b 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -89,7 +89,7 @@ point (where the PPSS is equivalent to nil).") ;; assumed nil state at BEG may not be valid any more. (if (<= beg (or (car (nth 10 syntax-ppss-last)) (nth 9 syntax-ppss-last) - (nth 2 syntax-ppss-last) + (nth 3 syntax-ppss-last) 0)) (setq syntax-ppss-last nil) (setcar syntax-ppss-last nil))) -- cgit v1.2.3 From b44da9f16bbb5fb1a220a5ed76107cad061a13d3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 21 Oct 2005 17:22:25 +0000 Subject: (find-library-name): Doc fix. --- lisp/emacs-lisp/find-func.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index dea72fc7567..0cebeeb6f7f 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -141,7 +141,7 @@ See the functions `find-function' and `find-variable'." (unless (string-match "elc" suffix) (push suffix suffixes))))) (defun find-library-name (library) - "Return the full name of the elisp source of LIBRARY." + "Return the absolute file name of the Lisp source of LIBRARY." ;; If the library is byte-compiled, try to find a source library by ;; the same name. (if (string-match "\\.el\\(c\\(\\..*\\)?\\)\\'" library) -- cgit v1.2.3