diff options
| author | Noam Postavsky | 2017-07-06 08:52:24 -0400 |
|---|---|---|
| committer | Noam Postavsky | 2017-07-06 08:59:32 -0400 |
| commit | 386918f0b807116051facbe51a2bee342de37841 (patch) | |
| tree | d4cd72365995b96cba6af47b5d3720dcda668077 /lisp | |
| parent | 20e9a00fb5d12ad408f9dd15adcfcd205783c1b0 (diff) | |
| download | emacs-386918f0b807116051facbe51a2bee342de37841.tar.gz emacs-386918f0b807116051facbe51a2bee342de37841.zip | |
Fix lisp-comment-indent for single-semicolon case
* lisp/emacs-lisp/lisp-mode.el (lisp-comment-indent): Only check for
open paren if we're looking at multiple comment characters.
* test/lisp/emacs-lisp/lisp-mode-tests.el (lisp-comment-indent-1)
(lisp-comment-indent-2): New tests.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 985b7513a3b..fa25a0c3975 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el | |||
| @@ -738,12 +738,14 @@ or to switch back to an existing one." | |||
| 738 | 738 | ||
| 739 | (defun lisp-comment-indent () | 739 | (defun lisp-comment-indent () |
| 740 | "Like `comment-indent-default', but don't put space after open paren." | 740 | "Like `comment-indent-default', but don't put space after open paren." |
| 741 | (let ((pt (point))) | 741 | (or (when (looking-at "\\s<\\s<") |
| 742 | (skip-syntax-backward " ") | 742 | (let ((pt (point))) |
| 743 | (if (eq (preceding-char) ?\() | 743 | (skip-syntax-backward " ") |
| 744 | (cons (current-column) (current-column)) | 744 | (if (eq (preceding-char) ?\() |
| 745 | (goto-char pt) | 745 | (cons (current-column) (current-column)) |
| 746 | (comment-indent-default)))) | 746 | (goto-char pt) |
| 747 | nil))) | ||
| 748 | (comment-indent-default))) | ||
| 747 | 749 | ||
| 748 | (define-obsolete-function-alias 'lisp-mode-auto-fill 'do-auto-fill "23.1") | 750 | (define-obsolete-function-alias 'lisp-mode-auto-fill 'do-auto-fill "23.1") |
| 749 | 751 | ||