mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merged from miles@gnu.org--gnu-2005 (patch 187, 704)

Browse source 
Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--base-0
   tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704

 * emacs@sv.gnu.org/emacs--devo--0--patch-1
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-2
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-3
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-4
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-5
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-6
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-7
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-8
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-9
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-10
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-11
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-12
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-13
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-14
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-15
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-16
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-17
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-18
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-19
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-20
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-21
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-22
   Install ERC.

 * emacs@sv.gnu.org/emacs--devo--0--patch-23
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-24
   Fix ERC compiler warnings.

 * emacs@sv.gnu.org/emacs--devo--0--patch-25
   Use utf-8 encoding in ERC ChangeLogs.

 * emacs@sv.gnu.org/emacs--devo--0--patch-26
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-27
   Merge ERC-related Viper hacks into Viper.

 * emacs@sv.gnu.org/emacs--devo--0--patch-28
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-29
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-30
   Merge from erc--main--0

 * emacs@sv.gnu.org/gnus--rel--5.10--base-0
   tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-1
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-2
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-3
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-4
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-5
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-6
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-7
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-501
This commit is contained in:
Karoly Lorentey 2006-01-30 18:06:22 +00:00
commit e31331e5cb
214 changed files with 47385 additions and 15270 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/font-lock.el
View file

@ -2043,14 +2043,14 @@ other modes in which C preprocessor directives are used. e.g. `asm-mode' and
`(;; Definitions.
(,(concat "(\\(def\\("
;; Function declarations.
"\\(advice\\|varalias\\|alias\\|generic\\|macro\\*?\\|method\\|"
"\\(advice\\|alias\\|generic\\|macro\\*?\\|method\\|"
"setf\\|subst\\*?\\|un\\*?\\|"
"ine-\\(condition\\|"
"\\(?:derived\\|\\(?:global-\\)?minor\\|generic\\)-mode\\|"
"method-combination\\|setf-expander\\|skeleton\\|widget\\|"
"function\\|\\(compiler\\|modify\\|symbol\\)-macro\\)\\)\\|"
;; Variable declarations.
"\\(const\\(ant\\)?\\|custom\\|face\\|parameter\\|var\\)\\|"
"\\(const\\(ant\\)?\\|custom\\|varalias\\|face\\|parameter\\|var\\)\\|"
;; Structure declarations.
"\\(class\\|group\\|theme\\|package\\|struct\\|type\\)"
"\\)\\)\\>"
@ -2126,7 +2126,7 @@ other modes in which C preprocessor directives are used. e.g. `asm-mode' and
;; Constant values.
("\\<:\\sw+\\>" 0 font-lock-builtin-face)
;; ELisp and CLisp `&' keywords as types.
("\\&\\sw+\\>" . font-lock-type-face)
("\\<\\&\\sw+\\>" . font-lock-type-face)
;; ELisp regexp grouping constructs
((lambda (bound)
(catch 'found