mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-21 18:23:59 +00:00
Code Issues Releases Activity

Merge from emacs--rel--22

Browse Source 
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 M. Stallman  <rms@gnu.org>

   * lisp/cus-edit.el (custom-variable-type): Doc fix.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-797
This commit is contained in:
Miles Bader 2007-06-14 09:59:49 +00:00
commit 7e76cdd807
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/ChangeLog
View File

@ -210,6 +210,15 @@
keysyms rather than byte sequences.
(tpu-copy-keyfile): Don't force the user to use tpu-mapper.el.
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)

3
lisp/cus-edit.el
View File

@ -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))

8
lisp/font-lock.el
View File

@ -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.