diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2012-08-13 01:41:10 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2012-08-13 01:41:10 +0000 |
| commit | 9086f7082dfea2d01eb856224ee4066ced7b510f (patch) | |
| tree | e51b9fe3e8a318ecf770a0128bbcee06f3ffda43 /lang/tuareg-mode.el | |
| parent | - Update to 1.0.5 (diff) | |
- Add patch to fix breakage with Emacs 24.x
- Bump PORTREVISION
Reported by: beat
Approved by: Michael Grünewald <michael.grunewald@laposte.net>
Notes
Notes:
svn path=/head/; revision=302456
Diffstat (limited to 'lang/tuareg-mode.el')
| -rw-r--r-- | lang/tuareg-mode.el/Makefile | 2 | ||||
| -rw-r--r-- | lang/tuareg-mode.el/files/patch-tuareg.el | 39 |
2 files changed, 40 insertions, 1 deletions
diff --git a/lang/tuareg-mode.el/Makefile b/lang/tuareg-mode.el/Makefile index f3050044f028..4a8876ef8673 100644 --- a/lang/tuareg-mode.el/Makefile +++ b/lang/tuareg-mode.el/Makefile @@ -7,7 +7,7 @@ PORTNAME= tuareg-mode PORTVERSION= 1.45.6 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= lang elisp MASTER_SITES= http://www-rocq.inria.fr/~acohen/tuareg/mode/ diff --git a/lang/tuareg-mode.el/files/patch-tuareg.el b/lang/tuareg-mode.el/files/patch-tuareg.el new file mode 100644 index 000000000000..1bcb3156baaf --- /dev/null +++ b/lang/tuareg-mode.el/files/patch-tuareg.el @@ -0,0 +1,39 @@ + +$FreeBSD$ + +--- tuareg.el.orig ++++ tuareg.el +@@ -1245,8 +1245,7 @@ + possible." + (if (eq major-mode 'tuareg-mode) + (let ((beg nil) (end nil)) +- (save-excursion +- (set-buffer compilation-last-buffer) ++ (with-current-buffer compilation-last-buffer + (save-excursion + (goto-char (window-point (get-buffer-window (current-buffer) t))) + (if (looking-at tuareg-error-chars-regexp) +@@ -1438,11 +1437,11 @@ + (defun tuareg-find-match () + (tuareg-find-kwop tuareg-find-kwop-regexp)) + +-(defconst tuareg-find-,-match-regexp ++(defconst tuareg-find-comma-match-regexp + (tuareg-make-find-kwop-regexp + "\\<\\(and\\|match\\|begin\\|else\\|exception\\|then\\|try\\|with\\|or\\|fun\\|function\\|let\\|do\\)\\>\\|->\\|[[{(]")) +-(defun tuareg-find-,-match () +- (tuareg-find-kwop tuareg-find-,-match-regexp)) ++(defun tuareg-find-comma-match () ++ (tuareg-find-kwop tuareg-find-comma-match-regexp)) + + (defconst tuareg-find-with-match-regexp + (tuareg-make-find-kwop-regexp +@@ -1922,7 +1921,7 @@ + ((string= kwop ",") + (if (looking-at ",[ \t]*\\((\\*\\|$\\)") + (progn +- (setq kwop (tuareg-find-,-match)) ++ (setq kwop (tuareg-find-comma-match)) + (if (or (looking-at "[[{(]\\|\\.<") + (and (looking-at "[<|]") + (char-equal ?\[ (preceding-char)) |