[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 297/299: Minor fix to previous change.
From: |
Stefan Monnier |
Subject: |
[elpa] 297/299: Minor fix to previous change. |
Date: |
Sun, 02 Nov 2014 03:12:05 +0000 |
monnier pushed a commit to branch externals/auctex
in repository elpa.
commit c60dfc155b25c390a1d85783bc67942389539cea
Author: Matthew Leach <address@hidden>
Date: Wed Oct 29 19:58:21 2014 +0100
Minor fix to previous change.
Signed-off-by: Mosè Giordano <address@hidden>
---
latex.el | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/latex.el b/latex.el
index b56abf3..af1c676 100644
--- a/latex.el
+++ b/latex.el
@@ -6291,35 +6291,35 @@ i.e. you do _not_ have to cater for this yourself by
adding \\\\' or $."
(defun LaTeX-indent-tabular ()
"Return indent column for the current tabular-like line."
- (destructuring-bind (beg-pos . beg-col)
- (LaTeX-env-beginning-pos-col)
- (let ((tabular-like-end-regex
- (format "\\\\end{%s}"
- (regexp-opt
- (let (out)
- (mapcar (lambda (x)
- (when (eq (cadr x) 'LaTeX-indent-tabular)
- (push (car x) out)))
- LaTeX-indent-environment-list)
- (pp out)
- out)))))
- (cond ((looking-at tabular-like-end-regex)
- beg-col)
-
- ((looking-at "\\\\\\\\")
- (+ 2 beg-col))
-
- ((looking-at "&")
- (LaTeX-hanging-ampersand-position))
-
- (t
- (+ 2
- (let ((any-col (save-excursion
- (when (re-search-backward "\\\\\\\\\\|&"
beg-pos t)
- (current-column)))))
- (if (and any-col (string= "&" (match-string 0)))
- any-col
- beg-col))))))))
+ (destructuring-bind
+ (beg-pos . beg-col)
+ (LaTeX-env-beginning-pos-col)
+ (let ((tabular-like-end-regex
+ (format "\\\\end{%s}"
+ (regexp-opt
+ (let (out)
+ (mapcar (lambda (x)
+ (when (eq (cadr x) 'LaTeX-indent-tabular)
+ (push (car x) out)))
+ LaTeX-indent-environment-list)
+ out)))))
+ (cond ((looking-at tabular-like-end-regex)
+ beg-col)
+
+ ((looking-at "\\\\\\\\")
+ (+ 2 beg-col))
+
+ ((looking-at "&")
+ (LaTeX-hanging-ampersand-position))
+
+ (t
+ (+ 2
+ (let ((any-col (save-excursion
+ (when (re-search-backward "\\\\\\\\\\|&"
beg-pos t)
+ (current-column)))))
+ (if (and any-col (string= "&" (match-string 0)))
+ any-col
+ beg-col))))))))
(provide 'latex)
- [elpa] 290/299: Fix LaTeX-newline when comment-auto-fill-only-comments is non-nil., (continued)
- [elpa] 290/299: Fix LaTeX-newline when comment-auto-fill-only-comments is non-nil., Stefan Monnier, 2014/11/01
- [elpa] 287/299: Docstring fix., Stefan Monnier, 2014/11/01
- [elpa] 276/299: Code cleanup and optimizations., Stefan Monnier, 2014/11/01
- [elpa] 288/299: Avoid duplicate marks in TeX-insert-dollar., Stefan Monnier, 2014/11/01
- [elpa] 289/299: Add style for cleverref., Stefan Monnier, 2014/11/01
- [elpa] 295/299: Fix in LaTeX-largest-level-set for XEmacs compatibility., Stefan Monnier, 2014/11/01
- [elpa] 291/299: Build HTML doc with makeinfo if texi2html is not available., Stefan Monnier, 2014/11/01
- [elpa] 296/299: Fix indentation of tabularx environment closing., Stefan Monnier, 2014/11/01
- [elpa] 292/299: Update for upcoming release., Stefan Monnier, 2014/11/01
- [elpa] 298/299: Release_11.88, Stefan Monnier, 2014/11/01
- [elpa] 297/299: Minor fix to previous change.,
Stefan Monnier <=
- [elpa] 293/299: Use autoconf variables for preview version and date., Stefan Monnier, 2014/11/01
- [elpa] 294/299: Manually adjust preview release version in dtx., Stefan Monnier, 2014/11/01
- [elpa] 282/299: Allow applying style hooks only in a certain context., Stefan Monnier, 2014/11/01
- [elpa] 299/299: Merge from upstream release 11.88., Stefan Monnier, 2014/11/01