Mercurial > emacs
changeset 81414:92493f24adc9
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 43-44)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 229)
- Merge from emacs--devo--0, emacs--rel--22
2007-06-11 Stefan Monnier <monnier@iro.umontreal.ca>
* lisp/font-lock.el (font-lock-add-keywords): In case font-lock was only
half-activated, forcefully activate it completely.
2007-06-11 Richard Stallman <rms@gnu.org>
* lisp/cus-edit.el (custom-variable-type): Doc fix.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-797
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 14 Jun 2007 09:59:49 +0000 |
| parents | 31af2b21fdfe (current diff) a8c400af8ac9 (diff) |
| children | 7e22155b3083 |
| files | lisp/ChangeLog |
| diffstat | 3 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jun 14 08:40:24 2007 +0000 +++ b/lisp/ChangeLog Thu Jun 14 09:59:49 2007 +0000 @@ -212,6 +212,15 @@ 2007-06-11 Stefan Monnier <monnier@iro.umontreal.ca> + * font-lock.el (font-lock-add-keywords): In case font-lock was only + half-activated, forcefully activate it completely. + +2007-06-11 Richard Stallman <rms@gnu.org> + + * cus-edit.el (custom-variable-type): Doc fix. + +2007-06-11 Stefan Monnier <monnier@iro.umontreal.ca> + * progmodes/sh-script.el (sh-font-lock-backslash-quote) (sh-font-lock-flush-syntax-ppss-cache): New functions. (sh-font-lock-syntactic-keywords): Use them to distinguish the
--- a/lisp/cus-edit.el Thu Jun 14 08:40:24 2007 +0000 +++ b/lisp/cus-edit.el Thu Jun 14 09:59:49 2007 +0000 @@ -2500,7 +2500,8 @@ (defun custom-variable-type (symbol) "Return a widget suitable for editing the value of SYMBOL. If SYMBOL has a `custom-type' property, use that. -Otherwise, look up symbol in `custom-guess-type-alist'." +Otherwise, try matching SYMBOL against `custom-guess-name-alist' and +try matching its doc string against `custom-guess-doc-alist'." (let* ((type (or (get symbol 'custom-type) (and (not (get symbol 'standard-value)) (custom-guess-type symbol))
--- a/lisp/font-lock.el Thu Jun 14 08:40:24 2007 +0000 +++ b/lisp/font-lock.el Thu Jun 14 09:59:49 2007 +0000 @@ -698,6 +698,14 @@ ;; contain the new keywords. (font-lock-update-removed-keyword-alist mode keywords how)) (t + (when (and font-lock-mode + (not (or font-lock-keywords font-lock-defaults))) + ;; The major mode has not set any keywords, so when we enabled + ;; font-lock-mode it only enabled the font-core.el part, not the + ;; font-lock-mode-internal. Try again. + (font-lock-mode -1) + (set (make-local-variable 'font-lock-defaults) '(nil t)) + (font-lock-mode 1)) ;; Otherwise set or add the keywords now. ;; This is a no-op if it has been done already in this buffer ;; for the correct major mode.