[AUCTeX-diffs] GNU AUCTeX branch, master, updated. f4723786f2d2ec58bdb94bd8112f6437f33c1d36

[Mosè Giordano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  f4723786f2d2ec58bdb94bd8112f6437f33c1d36 (commit)
      from  0e4ad85b8998f3898e218045e3215d21c46a3484 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f4723786f2d2ec58bdb94bd8112f6437f33c1d36
Author: Mosè Giordano <address@hidden>
Date:   Sat May 6 20:21:27 2017 +0200

    Work around bug#26694
    
    * preview.el.in (preview-at-point): Let-bind `TeX-source-correlate-mode' to 
nil.
    * tex-buf.el (TeX-region-create): Move point only when
    `TeX-source-correlate-mode' is non-nil.

diff --git a/preview.el.in b/preview.el.in
index 8a58104..e4bcd7f 100644
--- a/preview.el.in
+++ b/preview.el.in
@@ -1622,8 +1622,11 @@ through `preview-region'."
            (unless (eq preview-state 'disabled)
              (preview-toggle ovr 'toggle (selected-window))
              (throw 'exit t)))))
-      (preview-region (preview-next-border t)
-                     (preview-next-border nil)))))
+      ;; Let-bind `TeX-source-correlate-mode' to nil in order to work around
+      ;; bug#26694.
+      (let ((TeX-source-correlate-mode nil))
+       (preview-region (preview-next-border t)
+                       (preview-next-border nil))))))
 
 (defun preview-disabled-string (ov)
   "Generate a before-string for disabled preview overlay OV."
diff --git a/tex-buf.el b/tex-buf.el
index 8c9c7ef..ef0b3dd 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -2094,13 +2094,16 @@ original file."
                trailer)
        (setq TeX-region-orig-buffer orig-buffer)
        ;; Position point at the line/col that corresponds to point's line in
-       ;; orig-buffer in order to make forward search work.
-       (let ((line-col (with-current-buffer orig-buffer
-                         (cons (TeX-line-number-at-pos)
-                               (current-column)))))
-          (goto-char (point-min))
-          (forward-line (1- (abs (- header-offset (car line-col)))))
-         (forward-char (cdr line-col)))
+       ;; orig-buffer in order to make forward search work.  Move point only
+       ;; when `TeX-source-correlate-mode' is non-nil, in order to work around
+       ;; bug#26694.
+       (when TeX-source-correlate-mode
+           (let ((line-col (with-current-buffer orig-buffer
+                          (cons (TeX-line-number-at-pos)
+                                (current-column)))))
+          (goto-char (point-min))
+          (forward-line (1- (abs (- header-offset (car line-col)))))
+          (forward-char (cdr line-col))))
        (run-hooks 'TeX-region-hook)
        (if (string-equal (buffer-string) original-content)
            (set-buffer-modified-p nil)

-----------------------------------------------------------------------

Summary of changes:
 preview.el.in |  7 +++++--
 tex-buf.el    | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX