branch: externals/caml
commit 64a3c0268e6d504460715d33be14906e618ef3a2
Author: Yuri Albuquerque <[email protected]>
Commit: Yuri Albuquerque <[email protected]>
Fixing some Emacs startup warnings.
---
caml.el | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/caml.el b/caml.el
index e91417d..2b6645f 100644
--- a/caml.el
+++ b/caml.el
@@ -866,24 +866,24 @@ possible."
(if (eq major-mode 'caml-mode)
(let (skip bol beg end)
(save-excursion
- (set-buffer
- (if (boundp 'compilation-last-buffer)
- compilation-last-buffer ;Emacs 19
- "*compilation*")) ;Emacs 18
- (save-excursion
- (goto-char (window-point (get-buffer-window (current-buffer))))
- (if (looking-at caml-error-chars-regexp)
- (setq beg
- (caml-string-to-int
- (buffer-substring (match-beginning 1) (match-end 1)))
- end
- (caml-string-to-int
- (buffer-substring (match-beginning 2) (match-end 2)))))
- (next-line)
- (beginning-of-line)
- (if (and (looking-at "Warning")
- caml-next-error-skip-warnings-flag)
- (setq skip 't))))
+ (with-current-buffer
+ (if (boundp 'compilation-last-buffer)
+ compilation-last-buffer ;Emacs 19
+ "*compilation*") ;Emacs 18
+ (save-excursion
+ (goto-char (window-point (get-buffer-window (current-buffer))))
+ (if (looking-at caml-error-chars-regexp)
+ (setq beg
+ (caml-string-to-int
+ (buffer-substring (match-beginning 1) (match-end 1)))
+ end
+ (caml-string-to-int
+ (buffer-substring (match-beginning 2) (match-end 2)))))
+ (forward-line 1)
+ (beginning-of-line)
+ (if (and (looking-at "Warning")
+ caml-next-error-skip-warnings-flag)
+ (setq skip 't)))))
(cond
(skip (next-error))
(beg
