diff options
| author | Miles Bader <miles@gnu.org> | 2006-01-16 06:59:21 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-01-16 06:59:21 +0000 |
| commit | 6a2bd1a5019d2130c87ac5cf17f1322bf614b624 (patch) | |
| tree | 8e72a4a1b7c177b494ae7721f00ea27b14f9f439 /lisp/emacs-lisp | |
| parent | 5bb51be51248803e7400837b83c711854fa86648 (diff) | |
| parent | 292f71fe67394186e943783bef808c611699b63c (diff) | |
| download | emacs-6a2bd1a5019d2130c87ac5cf17f1322bf614b624.tar.gz emacs-6a2bd1a5019d2130c87ac5cf17f1322bf614b624.tar.bz2 emacs-6a2bd1a5019d2130c87ac5cf17f1322bf614b624.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-95
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 598-615)
- Update from CVS
- Remove lisp/toolbar directory
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 142-146)
- Update from CVS
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/find-func.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/syntax.el | 14 |
3 files changed, 11 insertions, 7 deletions
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) 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 diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index 126c8d50dd9..9c2ac336b9b 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 3 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 |