summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorPavel Janík <Pavel@Janik.cz>2002-03-11 13:39:02 +0000
committerPavel Janík <Pavel@Janik.cz>2002-03-11 13:39:02 +0000
commitb3f1e48a47d5ef1a397a4244e3203acc7aa29f87 (patch)
tree798d2ee37d89966c88d69a042aaf5f73297e8f4a /lisp
parentee485a83873b03aa98b31e27c7b8224470b46565 (diff)
downloademacs-b3f1e48a47d5ef1a397a4244e3203acc7aa29f87.tar.gz
(java-font-lock-extra-types): Add "URL" as separate item. Doc fix.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/font-lock.el7
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 @@
+2002-03-11 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
+
+ * font-lock.el (java-font-lock-extra-types): Add "URL" as separate
+ item. Doc fix.
+
+ * image.el (image-type-from-file-header): Make temporary buffer
+ unibyte.
+
+ * subr.el (add-to-list): Doc fix.
+
2002-03-07 Miles Bader <miles@gnu.org>
* pcomplete.el (pcomplete-entries): Expand environment variables
@@ -10,7 +20,7 @@
2002-03-10 Jan D. <Jan.Djarv@mbox200.swipnet.se>
* startup.el (command-line): Add call to emacs-session-restore if
- both x-session-id and x-session-previous-id are strings
+ both x-session-id and x-session-previous-id are strings.
* term/x-win.el (x-handle-smid): New function.
(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."
:group 'font-lock-extra-types)
(defcustom java-font-lock-extra-types
- '("[A-Z\300-\326\330-\337]\\sw*[a-zA-Z]\\sw*")
+ '("[A-Z\300-\326\330-\337]\\sw*[a-z]\\sw*" "URL")
"*List of extra types to fontify in Java mode.
Each list item should be a regexp not containing word-delimiters.
-For example, a value of (\"[A-Z\300-\326\330-\337]\\\\sw*[a-z]\\\\sw*\") means capitalised
-words (and words conforming to the Java id spec) are treated as type names.
+For example, a value of (\"[A-Z\300-\326\330-\337]\\\\sw*[a-z]\\\\sw*\" \"URL\") means
+capitalised words (that conform to the Java id spec) and URL are treated as
+type names.
The value of this variable is used when Font Lock mode is turned on."
:type 'font-lock-extra-types-widget