| Newsgroups |
gmane.emacs.xemacs.patches |
| Message-ID |
<[email protected]> |
5 new commits in ocaml:
https://bitbucket.org/xemacs/ocaml/commits/a77bb9f9b6e1/
Changeset: a77bb9f9b6e1
User: Norbert Koch
Date: 2014-06-29 20:58:34
Summary: XEmacs Package Release 0.09
Affected #: 2 files
diff -r c4cb09505870daade773d501aa59d4abd04265c5 -r a77bb9f9b6e1965a98c9909401b40fdace0f0d76 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-29 Norbert Koch <[email protected]>
+
+ * Makefile (VERSION): XEmacs package 0.09 released.
+
2014-05-15 Norbert Koch <[email protected]>
* Makefile (VERSION): XEmacs package 0.08 released.
diff -r c4cb09505870daade773d501aa59d4abd04265c5 -r a77bb9f9b6e1965a98c9909401b40fdace0f0d76 Makefile
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 0.08
+VERSION = 0.09
AUTHOR_VERSION = 3.06
MAINTAINER = XEmacs Development Team <[email protected]>
PACKAGE = ocaml
https://bitbucket.org/xemacs/ocaml/commits/e368a3129481/
Changeset: e368a3129481
User: Norbert Koch
Date: 2014-06-29 20:58:35
Summary: Added tag ocaml-0_09 for changeset a77bb9f9b6e1
Affected #: 1 file
diff -r a77bb9f9b6e1965a98c9909401b40fdace0f0d76 -r e368a31294812f5f0a821362284cfe7814a57296 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -28,3 +28,4 @@
239fcb229018d795a8b7a5f13d5adf49b54c213d sumo-2006-05-10
9d5c83f688067944c50d7ebe198443f3a836373d ocaml-0_07
aef44e4306b25dbc67b083dabdaa59efc8c54d12 ocaml-0_08
+a77bb9f9b6e1965a98c9909401b40fdace0f0d76 ocaml-0_09
https://bitbucket.org/xemacs/ocaml/commits/a24dd5900c11/
Changeset: a24dd5900c11
User: Norbert Koch
Date: 2014-06-29 21:46:27
Summary: Merge outstanding stuff into my workspace
Affected #: 3 files
diff -r e368a31294812f5f0a821362284cfe7814a57296 -r a24dd5900c111965a9c555ed456c1b4271b67206 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
* Makefile (VERSION): XEmacs package 0.09 released.
+2014-06-05 Jerry James <[email protected]>
+
+ * caml-font.el: Define faces the XEmacs way.
+
2014-05-15 Norbert Koch <[email protected]>
* Makefile (VERSION): XEmacs package 0.08 released.
diff -r e368a31294812f5f0a821362284cfe7814a57296 -r a24dd5900c111965a9c555ed456c1b4271b67206 caml-font.el
--- a/caml-font.el
+++ b/caml-font.el
@@ -28,13 +28,11 @@
(setq font-lock-type-face 'DarkOliveGreen)
(setq font-lock-reference-face 'CadetBlue)))
; extra faces for documention
- (make-face 'Stop)
- (set-face-foreground 'Stop "White")
- (set-face-background 'Stop "Red")
- (make-face 'Doc)
- (set-face-foreground 'Doc "Red")
- (setq font-lock-stop-face 'Stop)
- (setq font-lock-doccomment-face 'Doc)
+ (make-face 'font-lock-stop-face)
+ (set-face-foreground 'font-lock-stop-face "White")
+ (set-face-background 'font-lock-stop-face "Red")
+ (make-face 'font-lock-doccomment-face)
+ (set-face-foreground 'font-lock-doccomment-face "Red")
))
; The same definition is in caml.el:
diff -r e368a31294812f5f0a821362284cfe7814a57296 -r a24dd5900c111965a9c555ed456c1b4271b67206 caml-font.el.upstream
--- /dev/null
+++ b/caml-font.el.upstream
@@ -0,0 +1,125 @@
+;; useful colors
+
+(cond
+ ((x-display-color-p)
+ (cond
+ ((not (memq 'font-lock-type-face (face-list)))
+ ; make the necessary faces
+ (make-face 'Firebrick)
+ (set-face-foreground 'Firebrick "Firebrick")
+ (make-face 'RosyBrown)
+ (set-face-foreground 'RosyBrown "RosyBrown")
+ (make-face 'Purple)
+ (set-face-foreground 'Purple "Purple")
+ (make-face 'MidnightBlue)
+ (set-face-foreground 'MidnightBlue "MidnightBlue")
+ (make-face 'DarkGoldenRod)
+ (set-face-foreground 'DarkGoldenRod "DarkGoldenRod")
+ (make-face 'DarkOliveGreen)
+ (set-face-foreground 'DarkOliveGreen "DarkOliveGreen4")
+ (make-face 'CadetBlue)
+ (set-face-foreground 'CadetBlue "CadetBlue")
+ ; assign them as standard faces
+ (setq font-lock-comment-face 'Firebrick)
+ (setq font-lock-string-face 'RosyBrown)
+ (setq font-lock-keyword-face 'Purple)
+ (setq font-lock-function-name-face 'MidnightBlue)
+ (setq font-lock-variable-name-face 'DarkGoldenRod)
+ (setq font-lock-type-face 'DarkOliveGreen)
+ (setq font-lock-reference-face 'CadetBlue)))
+ ; extra faces for documention
+ (make-face 'Stop)
+ (set-face-foreground 'Stop "White")
+ (set-face-background 'Stop "Red")
+ (make-face 'Doc)
+ (set-face-foreground 'Doc "Red")
+ (setq font-lock-stop-face 'Stop)
+ (setq font-lock-doccomment-face 'Doc)
+))
+
+; The same definition is in caml.el:
+; we don't know in which order they will be loaded.
+(defvar caml-quote-char "'"
+ "*Quote for character constants. \"'\" for Objective Caml, \"`\" for Caml-Light.")
+
+(defconst caml-font-lock-keywords
+ (list
+;stop special comments
+ '("\\(^\\|[^\"]\\)\\((\\*\\*/\\*\\*)\\)"
+ 2 font-lock-stop-face)
+;doccomments
+ '("\\(^\\|[^\"]\\)\\((\\*\\*[^*]*\\([^)*][^*]*\\*+\\)*)\\)"
+ 2 font-lock-doccomment-face)
+;comments
+ '("\\(^\\|[^\"]\\)\\((\\*[^*]*\\*+\\([^)*][^*]*\\*+\\)*)\\)"
+ 2 font-lock-comment-face)
+;character literals
+ (cons (concat caml-quote-char "\\(\\\\\\([ntbr" caml-quote-char "\\]\\|"
+ "[0-9][0-9][0-9]\\)\\|.\\)" caml-quote-char
+ "\\|\"[^\"\\]*\\(\\\\\\(.\\|\n\\)[^\"\\]*\\)*\"")
+ 'font-lock-string-face)
+;modules and constructors
+ '("`?\\<[A-Z][A-Za-z0-9_']*\\>" . font-lock-function-name-face)
+;definition
+ (cons (concat
+ "\\<\\(a\\(nd\\|s\\)\\|c\\(onstraint\\|lass\\)"
+ "\\|ex\\(ception\\|ternal\\)\\|fun\\(ct\\(ion\\|or\\)\\)?"
+ "\\|in\\(herit\\|itializer\\)?\\|let"
+ "\\|m\\(ethod\\|utable\\|odule\\)"
+ "\\|of\\|p\\(arser\\|rivate\\)\\|rec\\|type"
+ "\\|v\\(al\\(ue\\)?\\|irtual\\)\\)\\>")
+ 'font-lock-type-face)
+;blocking
+ '("\\<\\(begin\\|end\\|object\\|s\\(ig\\|truct\\)\\)\\>"
+ . font-lock-keyword-face)
+;control
+ (cons (concat
+ "\\<\\(do\\(ne\\|wnto\\)?\\|else\\|for\\|i\\(f\\|gnore\\)"
+ "\\|lazy\\|match\\|new\\|or\\|t\\(hen\\|o\\|ry\\)"
+ "\\|w\\(h\\(en\\|ile\\)\\|ith\\)\\)\\>"
+ "\\|\|\\|->\\|&\\|#")
+ 'font-lock-reference-face)
+ '("\\<raise\\>" . font-lock-comment-face)
+;labels (and open)
+ '("\\(\\([~?]\\|\\<\\)[a-z][a-zA-Z0-9_']*:\\)[^:=]" 1
+ font-lock-variable-name-face)
+ '("\\<\\(assert\\|open\\|include\\)\\>\\|[~?][ (]*[a-z][a-zA-Z0-9_']*"
+ . font-lock-variable-name-face)))
+
+(defconst inferior-caml-font-lock-keywords
+ (append
+ (list
+;inferior
+ '("^[#-]" . font-lock-comment-face))
+ caml-font-lock-keywords))
+
+;; font-lock commands are similar for caml-mode and inferior-caml-mode
+(setq caml-mode-hook
+ '(lambda ()
+ (cond
+ ((fboundp 'global-font-lock-mode)
+ (make-local-variable 'font-lock-defaults)
+ (setq font-lock-defaults
+ '(caml-font-lock-keywords nil nil ((?' . "w") (?_ . "w")))))
+ (t
+ (setq font-lock-keywords caml-font-lock-keywords)))
+ (make-local-variable 'font-lock-keywords-only)
+ (setq font-lock-keywords-only t)
+ (font-lock-mode 1)))
+
+(defun inferior-caml-mode-font-hook ()
+ (cond
+ ((fboundp 'global-font-lock-mode)
+ (make-local-variable 'font-lock-defaults)
+ (setq font-lock-defaults
+ '(inferior-caml-font-lock-keywords
+ nil nil ((?' . "w") (?_ . "w")))))
+ (t
+ (setq font-lock-keywords inferior-caml-font-lock-keywords)))
+ (make-local-variable 'font-lock-keywords-only)
+ (setq font-lock-keywords-only t)
+ (font-lock-mode 1))
+
+(add-hook 'inferior-caml-mode-hooks 'inferior-caml-mode-font-hook)
+
+(provide 'caml-font)
https://bitbucket.org/xemacs/ocaml/commits/6084a457be74/
Changeset: 6084a457be74
User: Norbert Koch
Date: 2014-06-29 21:46:45
Summary: XEmacs Package Release 0.10
Affected #: 2 files
diff -r a24dd5900c111965a9c555ed456c1b4271b67206 -r 6084a457be746b6907ac3431a48f3e09448a2a25 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-29 Norbert Koch <[email protected]>
+
+ * Makefile (VERSION): XEmacs package 0.10 released.
+
2014-06-29 Norbert Koch <[email protected]>
* Makefile (VERSION): XEmacs package 0.09 released.
diff -r a24dd5900c111965a9c555ed456c1b4271b67206 -r 6084a457be746b6907ac3431a48f3e09448a2a25 Makefile
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 0.09
+VERSION = 0.10
AUTHOR_VERSION = 3.06
MAINTAINER = XEmacs Development Team <[email protected]>
PACKAGE = ocaml
https://bitbucket.org/xemacs/ocaml/commits/5587cf240080/
Changeset: 5587cf240080
User: Norbert Koch
Date: 2014-06-29 21:46:45
Summary: Added tag ocaml-0_10 for changeset 6084a457be74
Affected #: 1 file
diff -r 6084a457be746b6907ac3431a48f3e09448a2a25 -r 5587cf2400807f0fb496b072465fa054c680aa73 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -29,3 +29,4 @@
9d5c83f688067944c50d7ebe198443f3a836373d ocaml-0_07
aef44e4306b25dbc67b083dabdaa59efc8c54d12 ocaml-0_08
a77bb9f9b6e1965a98c9909401b40fdace0f0d76 ocaml-0_09
+6084a457be746b6907ac3431a48f3e09448a2a25 ocaml-0_10
Repository URL: https://bitbucket.org/xemacs/ocaml/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.