diff options
| author | Alan Mackenzie <acm@muc.de> | 2019-05-10 07:28:54 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2019-05-10 07:28:54 +0000 |
| commit | a8d17f35a29d9875e94e28c8405d350b57fd1e80 (patch) | |
| tree | a98b6eccb273b79325ffc6b653c3b70412bf5ace /lisp/newcomment.el | |
| parent | eda8ea685802e4e07e28351f65b5e24661a384fe (diff) | |
| download | emacs-a8d17f35a29d9875e94e28c8405d350b57fd1e80.tar.gz emacs-a8d17f35a29d9875e94e28c8405d350b57fd1e80.tar.bz2 emacs-a8d17f35a29d9875e94e28c8405d350b57fd1e80.zip | |
Make uncomment-region remove obtrusive spaces before tabs.
These spaces were typically inserted earlier by comment-region. This patch
makes these two complementary functions closer to inverses.
* lisp/newcomment.el (uncomment-region-default-1): Remove spaces before a tab
where the comment opener has just been removed.
Diffstat (limited to 'lisp/newcomment.el')
| -rw-r--r-- | lisp/newcomment.el | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/newcomment.el b/lisp/newcomment.el index 9d919ccbbea..ab2be080a33 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el @@ -1001,7 +1001,15 @@ This function is the default value of `uncomment-region-function'." (re-search-forward sre (line-end-position) t)) (replace-match "" t t nil (if (match-end 2) 2 1))))) ;; Go to the end for the next comment. - (goto-char (point-max)))))) + (goto-char (point-max))) + ;; Remove any obtrusive spaces left preceding a tab at `spt'. + (when (and (eq (char-after spt) ?\t) (eq (char-before spt) ? ) + (> tab-width 0)) + (save-excursion + (goto-char spt) + (let* ((fcol (current-column)) + (slim (- (point) (mod fcol tab-width)))) + (delete-char (- (skip-chars-backward " " slim))))))))) (set-marker end nil)) (defun uncomment-region-default (beg end &optional arg) |