procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(comment-region-default): Don't triple the

Browse source 
comment starter if the first region line isn't indented enough.
This commit is contained in:
Richard M. Stallman 2007-12-22 18:39:16 +00:00
parent d4e67bc5cb
commit 9f15f6766b
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2007-12-22 Richard Stallman <rms@gnu.org>
* newcomment.el (comment-region-default): Don't triple the
comment starter if the first region line isn't indented enough.
2007-12-21 Martin Rudalics <rudalics@gmx.at>
* autoinsert.el (auto-insert-alist): Remove nonsensical precision

12
lisp/newcomment.el
View file

@ -1095,16 +1095,22 @@ The strings used as comment starts are built from
((< numarg 0) (uncomment-region beg end (- numarg)))
(t
(let ((multi-char (/= (string-match "[ \t]*\\'" comment-start) 1))
indent)
indent triple)
(if (eq (nth 3 style) 'multi-char)
(setq indent multi-char)
(save-excursion
(goto-char beg)
(setq indent multi-char
;; Triple if we will put the comment starter at the margin
;; and the first line of the region isn't indented
;; at least two spaces.
triple (and (not multi-char) (looking-at "\t\\| "))))
(setq indent (nth 3 style)))
;; In Lisp and similar modes with one-character comment starters,
;; double it by default if `comment-add' says so.
;; If it isn't indented, triple it.
(if (and (null arg) (not multi-char))
(setq numarg (* comment-add (if indent 1 2)))
(setq numarg (* comment-add (if triple 2 1)))
(setq numarg (1- (prefix-numeric-value arg))))
(comment-region-internal