[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 6a2cc870d2: Revert "Allow commenting out white space lines in lat
From: |
Lars Ingebrigtsen |
Subject: |
master 6a2cc870d2: Revert "Allow commenting out white space lines in latex-mode" |
Date: |
Tue, 31 May 2022 14:27:08 -0400 (EDT) |
branch: master
commit 6a2cc870d23485a8f440a8b58768eefdf16c8912
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Revert "Allow commenting out white space lines in latex-mode"
This reverts commit 0870ebb3cbfcb097d85eea5eacaf992dd88ed204.
This was the wrong way to try to fix this -- see bug#55716.
---
lisp/newcomment.el | 30 +++++++++---------------------
lisp/textmodes/tex-mode.el | 7 +------
2 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 95adf9f90a..385dd80beb 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -1235,33 +1235,21 @@ changed with `comment-style'."
;; FIXME: maybe we should call uncomment depending on ARG.
(funcall comment-region-function beg end arg)))
-(defun comment-region-default-1 (beg end &optional arg noadjust)
- "Comment region between BEG and END.
-See `comment-region' for ARG. If NOADJUST, do not skip past
-leading/trailing space when determining the region to comment
-out."
+(defun comment-region-default-1 (beg end &optional arg)
(let* ((numarg (prefix-numeric-value arg))
(style (cdr (assoc comment-style comment-styles)))
(lines (nth 2 style))
(block (nth 1 style))
(multi (nth 0 style)))
- (if noadjust
- (when (bolp)
- (setq end (1- end)))
- ;; We use `chars' instead of `syntax' because `\n' might be
- ;; of end-comment syntax rather than of whitespace syntax.
- ;; sanitize BEG and END
- (goto-char beg)
- (skip-chars-forward " \t\n\r")
- (beginning-of-line)
- (setq beg (max beg (point)))
- (goto-char end)
- (skip-chars-backward " \t\n\r")
- (end-of-line)
- (setq end (min end (point)))
- (when (>= beg end)
- (error "Nothing to comment")))
+ ;; We use `chars' instead of `syntax' because `\n' might be
+ ;; of end-comment syntax rather than of whitespace syntax.
+ ;; sanitize BEG and END
+ (goto-char beg) (skip-chars-forward " \t\n\r") (beginning-of-line)
+ (setq beg (max beg (point)))
+ (goto-char end) (skip-chars-backward " \t\n\r") (end-of-line)
+ (setq end (min end (point)))
+ (if (>= beg end) (error "Nothing to comment"))
;; sanitize LINES
(setq lines
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index da4d7cc442..473643bb48 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1178,12 +1178,7 @@ subshell is initiated, `tex-shell-hook' is run."
(setq-local outline-regexp latex-outline-regexp)
(setq-local outline-level #'latex-outline-level)
(setq-local forward-sexp-function #'latex-forward-sexp)
- (setq-local skeleton-end-hook nil)
- (setq-local comment-region-function #'latex--comment-region)
- (setq-local comment-style 'plain))
-
-(defun latex--comment-region (beg end &optional arg)
- (comment-region-default-1 beg end arg t))
+ (setq-local skeleton-end-hook nil))
;;;###autoload
(define-derived-mode slitex-mode latex-mode "SliTeX"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 6a2cc870d2: Revert "Allow commenting out white space lines in latex-mode",
Lars Ingebrigtsen <=