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
This commit is contained in:
commit
6a2bd1a501
263 changed files with 7310 additions and 2571 deletions
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue