[Emacs-commit] emacs/lisp ChangeLog cus-edit.el font-lock.el

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/06/14 09:59:49

Modified files:
        lisp           : ChangeLog cus-edit.el font-lock.el 

Log message:
        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  <address@hidden>
        
           * 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  <address@hidden>
        
           * lisp/cus-edit.el (custom-variable-type): Doc fix.
        
        Revision: address@hidden/emacs--devo--0--patch-797

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.11204&r2=1.11205
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cus-edit.el?cvsroot=emacs&r1=1.319&r2=1.320
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/font-lock.el?cvsroot=emacs&r1=1.317&r2=1.318