diff options
| author | Pavel Janík | 2002-03-11 13:39:02 +0000 |
|---|---|---|
| committer | Pavel Janík | 2002-03-11 13:39:02 +0000 |
| commit | b3f1e48a47d5ef1a397a4244e3203acc7aa29f87 (patch) | |
| tree | 798d2ee37d89966c88d69a042aaf5f73297e8f4a | |
| parent | ee485a83873b03aa98b31e27c7b8224470b46565 (diff) | |
| download | emacs-b3f1e48a47d5ef1a397a4244e3203acc7aa29f87.tar.gz emacs-b3f1e48a47d5ef1a397a4244e3203acc7aa29f87.zip | |
(java-font-lock-extra-types): Add "URL" as separate item. Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/font-lock.el | 7 |
2 files changed, 15 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 600dbcd1957..7cb73baa7d1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2002-03-11 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | ||
| 2 | |||
| 3 | * font-lock.el (java-font-lock-extra-types): Add "URL" as separate | ||
| 4 | item. Doc fix. | ||
| 5 | |||
| 6 | * image.el (image-type-from-file-header): Make temporary buffer | ||
| 7 | unibyte. | ||
| 8 | |||
| 9 | * subr.el (add-to-list): Doc fix. | ||
| 10 | |||
| 1 | 2002-03-07 Miles Bader <miles@gnu.org> | 11 | 2002-03-07 Miles Bader <miles@gnu.org> |
| 2 | 12 | ||
| 3 | * pcomplete.el (pcomplete-entries): Expand environment variables | 13 | * pcomplete.el (pcomplete-entries): Expand environment variables |
| @@ -10,7 +20,7 @@ | |||
| 10 | 2002-03-10 Jan D. <Jan.Djarv@mbox200.swipnet.se> | 20 | 2002-03-10 Jan D. <Jan.Djarv@mbox200.swipnet.se> |
| 11 | 21 | ||
| 12 | * startup.el (command-line): Add call to emacs-session-restore if | 22 | * startup.el (command-line): Add call to emacs-session-restore if |
| 13 | both x-session-id and x-session-previous-id are strings | 23 | both x-session-id and x-session-previous-id are strings. |
| 14 | 24 | ||
| 15 | * term/x-win.el (x-handle-smid): New function. | 25 | * term/x-win.el (x-handle-smid): New function. |
| 16 | (emacs-session-filename): New function. | 26 | (emacs-session-filename): New function. |
diff --git a/lisp/font-lock.el b/lisp/font-lock.el index fbacb7590c9..308a3e2789c 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el | |||
| @@ -2209,11 +2209,12 @@ The value of this variable is used when Font Lock mode is turned on." | |||
| 2209 | :group 'font-lock-extra-types) | 2209 | :group 'font-lock-extra-types) |
| 2210 | 2210 | ||
| 2211 | (defcustom java-font-lock-extra-types | 2211 | (defcustom java-font-lock-extra-types |
| 2212 | '("[A-Z\300-\326\330-\337]\\sw*[a-zA-Z]\\sw*") | 2212 | '("[A-Z\300-\326\330-\337]\\sw*[a-z]\\sw*" "URL") |
| 2213 | "*List of extra types to fontify in Java mode. | 2213 | "*List of extra types to fontify in Java mode. |
| 2214 | Each list item should be a regexp not containing word-delimiters. | 2214 | Each list item should be a regexp not containing word-delimiters. |
| 2215 | For example, a value of (\"[A-Z\300-\326\330-\337]\\\\sw*[a-z]\\\\sw*\") means capitalised | 2215 | For example, a value of (\"[A-Z\300-\326\330-\337]\\\\sw*[a-z]\\\\sw*\" \"URL\") means |
| 2216 | words (and words conforming to the Java id spec) are treated as type names. | 2216 | capitalised words (that conform to the Java id spec) and URL are treated as |
| 2217 | type names. | ||
| 2217 | 2218 | ||
| 2218 | The value of this variable is used when Font Lock mode is turned on." | 2219 | The value of this variable is used when Font Lock mode is turned on." |
| 2219 | :type 'font-lock-extra-types-widget | 2220 | :type 'font-lock-extra-types-widget |