branch: elpa/tuareg
commit 4b38b9ba3a8d66eaa4aa561b877d945cddb13928
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
(tuareg-mode-version): Try and compute it automatically
Use `package-get-version` when available to automatically get the
actual package-version rather than relying on a manually updated duplicate
of
the authoritative data.
Update that manual duplicate while at it (and update the duplicate license
blurb as well).
---
tuareg.el | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/tuareg.el b/tuareg.el
index 7c7ef4c66d..aaf2c26849 100644
--- a/tuareg.el
+++ b/tuareg.el
@@ -1,7 +1,7 @@
;;; tuareg.el --- OCaml mode -*- coding: utf-8; lexical-binding:t -*-
;; Copyright (C) 1997-2006 Albert Cohen, all rights reserved.
-;; Copyright (C) 2011-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2022 Free Software Foundation, Inc.
;; Copyright (C) 2009-2010 Jane Street Holding, LLC.
;; Licensed under the GNU General Public License.
@@ -99,11 +99,14 @@
"Tuareg revision from the control system used.")
(defconst tuareg-mode-version
- (let ((version "Tuareg Version 2.2.0"))
- (if (null tuareg-mode-revision)
- version
- (concat version " (" tuareg-mode-revision ")")
- ))
+ (let ((version (or (if (fboundp 'package-get-version)
+ (package-get-version))
+ "2.3.0")))
+ (concat "Tuareg Version " version
+ (when tuareg-mode-revision
+ (concat " (" tuareg-mode-revision ")"))))
+ ;; FIXME: Do we really want to have this copy of the license blurb
+ ;; as the docstring?
" Copyright (C) 1997-2006 Albert Cohen, all rights reserved.
Copyright (C) 2009-2010 Jane Street Holding, LLC.
Copyright (C) 2011- Stefan Monnier & Christophe Troestler
@@ -111,7 +114,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -392,7 +395,7 @@ Valid names are `browse-url', `browse-url-firefox', etc."
'tuareg-font-lock-module-face)
(defface tuareg-font-lock-constructor-face
- '((t (:inherit default)))
+ '((t (:inherit default))) ;FIXME: Why not just nil?
"Face description for constructors of (polymorphic) variants and exceptions."
:group 'tuareg-faces)
(defvar tuareg-font-lock-constructor-face
@@ -2516,7 +2519,7 @@ Return a non-nil value if a comment was skipped."
nil)))
(defun tuareg--skip-backward-comments-semicolon ()
- "Skip 'sticky' comments and ';;' after a definition."
+ "Skip `sticky' comments and `;;' after a definition."
;; Comments after the definition not separated by a blank like
;; ("sticking") are considered part of the definition.
(when (looking-at-p "[ \t]*(\\*")
@@ -2538,7 +2541,7 @@ Return a non-nil value if a comment was skipped."
nil)))
(defun tuareg--skip-forward-comments-semicolon ()
- "Skip ';;' and then 'sticky' comments after a definition."
+ "Skip `;;' and then `sticky' comments after a definition."
(when (looking-at (rx (* (in " \t\n")) ";;"))
(goto-char (match-end 0)))
(while (tuareg--skip-forward-comment)))
@@ -3253,7 +3256,7 @@ You have better byte-compile tuareg.el.
For customization purposes, you should use `tuareg-mode-hook'
\(run for every file) or `tuareg-load-hook' (run once) and not patch
the mode itself. You should add to your configuration file something like:
- (add-hook 'tuareg-mode-hook
+ (add-hook \\='tuareg-mode-hook
(lambda ()
... ; your customization code
))
@@ -4104,8 +4107,8 @@ See `imenu-create-index-function'."
(when (require 'speedbar nil t)
(speedbar-add-supported-extension
'(".ml" ".mli" ".mll" ".mly" ".mlp" ".ls"))
- (push '("\\.mli$" . ".cmi") speedbar-obj-alist)
- (push '("\\.ml$" . ".cmo") speedbar-obj-alist))
+ (push '("\\.mli\\'" . ".cmi") speedbar-obj-alist)
+ (push '("\\.ml\\'" . ".cmo") speedbar-obj-alist))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Hooks and Exit
