1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-20 13:00:51 -07:00

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

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)