diff options
| author | Michael R. Mauger <michael@mauger.com> | 2017-07-07 16:26:35 -0400 |
|---|---|---|
| committer | Michael R. Mauger <michael@mauger.com> | 2017-07-07 16:26:35 -0400 |
| commit | eb27fc4d49e8c914cd0e6a8a2d02159601542141 (patch) | |
| tree | f57209aa49d05f15c3d71563d2021a38935c663d /lisp/emacs-lisp/lisp-mode.el | |
| parent | 7f62a4a7440aee6aacf04036feb3384a6515e48f (diff) | |
| parent | c24748ada08ffdb2921826f2b954a230e25d1d60 (diff) | |
| download | emacs-eb27fc4d49e8c914cd0e6a8a2d02159601542141.tar.gz emacs-eb27fc4d49e8c914cd0e6a8a2d02159601542141.tar.bz2 emacs-eb27fc4d49e8c914cd0e6a8a2d02159601542141.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
| -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." (defun lisp-comment-indent () "Like `comment-indent-default', but don't put space after open paren." - (let ((pt (point))) - (skip-syntax-backward " ") - (if (eq (preceding-char) ?\() - (cons (current-column) (current-column)) - (goto-char pt) - (comment-indent-default)))) + (or (when (looking-at "\\s<\\s<") + (let ((pt (point))) + (skip-syntax-backward " ") + (if (eq (preceding-char) ?\() + (cons (current-column) (current-column)) + (goto-char pt) + nil))) + (comment-indent-default))) (define-obsolete-function-alias 'lisp-mode-auto-fill 'do-auto-fill "23.1") |