diff options
| author | Miles Bader <[email protected]> | 2007-06-14 09:59:49 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2007-06-14 09:59:49 +0000 |
| commit | 7e76cdd807ee8253c2115ca9cdcd457f98ef01ac (patch) | |
| tree | 4b2e2d804e0cdb552223b4e00c964539cc5618fb | |
| parent | 446ba96f1f6d175e07f388fb8e571355dd00465f (diff) | |
| parent | 524705ae2da95c571fedb83b3a1c3a80e1335a72 (diff) | |
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 <[email protected]>
* lisp/font-lock.el (font-lock-add-keywords): In case font-lock was only
half-activated, forcefully activate it completely.
2007-06-11 Richard M. Stallman <[email protected]>
* lisp/cus-edit.el (custom-variable-type): Doc fix.
Revision: [email protected]/emacs--devo--0--patch-797
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/cus-edit.el | 3 | ||||
| -rw-r--r-- | lisp/font-lock.el | 8 |
3 files changed, 19 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cfe2b2ee82..d30fbe8785 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -212,6 +212,15 @@ 2007-06-11 Stefan Monnier <[email protected]> + * font-lock.el (font-lock-add-keywords): In case font-lock was only + half-activated, forcefully activate it completely. + +2007-06-11 Richard Stallman <[email protected]> + + * cus-edit.el (custom-variable-type): Doc fix. + +2007-06-11 Stefan Monnier <[email protected]> + * 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 diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 4dae3bab01..0984fc73e4 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -2500,7 +2500,8 @@ However, setting it through Custom sets the default value.") (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)) diff --git a/lisp/font-lock.el b/lisp/font-lock.el index c826a5f20c..265cc4bf68 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -698,6 +698,14 @@ see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types', ;; 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. |