Mercurial > emacs
comparison lisp/newcomment.el @ 51734:400a9c7868fd
(uncomment-region): Remove padding coming from
comment-start rather than just from comment-padding.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 04 Jul 2003 22:45:26 +0000 |
| parents | 0237e2420453 |
| children | 695cf19ef79e |
comparison
equal
deleted
inserted
replaced
| 51733:2b72fd42f02e | 51734:400a9c7868fd |
|---|---|
| 667 (goto-char beg) | 667 (goto-char beg) |
| 668 (setq end (copy-marker end)) | 668 (setq end (copy-marker end)) |
| 669 (let* ((numarg (prefix-numeric-value arg)) | 669 (let* ((numarg (prefix-numeric-value arg)) |
| 670 (ccs comment-continue) | 670 (ccs comment-continue) |
| 671 (srei (comment-padright ccs 're)) | 671 (srei (comment-padright ccs 're)) |
| 672 (csre (comment-padright comment-start 're)) | |
| 672 (sre (and srei (concat "^\\s-*?\\(" srei "\\)"))) | 673 (sre (and srei (concat "^\\s-*?\\(" srei "\\)"))) |
| 673 spt) | 674 spt) |
| 674 (while (and (< (point) end) | 675 (while (and (< (point) end) |
| 675 (setq spt (comment-search-forward end t))) | 676 (setq spt (comment-search-forward end t))) |
| 676 (let ((ipt (point)) | 677 (let ((ipt (point)) |
| 695 (not (eq (char-before (point-max)) ?\n)) | 696 (not (eq (char-before (point-max)) ?\n)) |
| 696 (skip-chars-forward "=")) | 697 (skip-chars-forward "=")) |
| 697 (> (- (point) (point-min) (length comment-start)) 7)) | 698 (> (- (point) (point-min) (length comment-start)) 7)) |
| 698 (> (count-lines (point-min) (point-max)) 2)) | 699 (> (count-lines (point-min) (point-max)) 2)) |
| 699 (setq box t)) | 700 (setq box t)) |
| 700 (when (looking-at (regexp-quote comment-padding)) | 701 ;; Skip the padding. Padding can come from comment-padding and/or |
| 701 (goto-char (match-end 0))) | 702 ;; from comment-start, so we first check comment-start. |
| 703 (if (or (save-excursion (goto-char (point-min)) (looking-at csre)) | |
| 704 (looking-at (regexp-quote comment-padding))) | |
| 705 (goto-char (match-end 0))) | |
| 702 (when (and sre (looking-at (concat "\\s-*\n\\s-*" srei))) | 706 (when (and sre (looking-at (concat "\\s-*\n\\s-*" srei))) |
| 703 (goto-char (match-end 0))) | 707 (goto-char (match-end 0))) |
| 704 (if (null arg) (delete-region (point-min) (point)) | 708 (if (null arg) (delete-region (point-min) (point)) |
| 705 (skip-syntax-backward " ") | 709 (skip-syntax-backward " ") |
| 706 (delete-char (- numarg)) | 710 (delete-char (- numarg)) |