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

Remove ignored argument from lisp-indent-line

Browse source 
* lisp/emacs-lisp/lisp-mode.el (lisp-indent-line): Remove WHOLE-EXP
argument, the behavior has long since been handled in
`indent-for-tab-command'.  Also remove redundant `beg' and `shift-amt'
variables and use `indent-line-to'.
This commit is contained in:
Noam Postavsky 2017-03-15 21:59:13 -04:00
parent 8bb5d7adaf
commit 2f6769f9cd
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lisp/emacs-lisp/lisp-mode.el
View file

@ -748,14 +748,12 @@ function is `common-lisp-indent-function'."
:type 'function
:group 'lisp)
(defun lisp-indent-line (&optional _whole-exp)
"Indent current line as Lisp code.
With argument, indent any additional lines of the same expression
rigidly along with this one."
(interactive "P")
(let ((indent (calculate-lisp-indent)) shift-amt
(pos (- (point-max) (point)))
(beg (progn (beginning-of-line) (point))))
(defun lisp-indent-line ()
"Indent current line as Lisp code."
(interactive)
(let ((indent (calculate-lisp-indent))
(pos (- (point-max) (point))))
(beginning-of-line)
(skip-chars-forward " \t")
(if (or (null indent) (looking-at "\\s<\\s<\\s<"))
;; Don't alter indentation of a ;;; comment line
@ -767,11 +765,7 @@ rigidly along with this one."
;; as comment lines, not as code.
(progn (indent-for-comment) (forward-char -1))
(if (listp indent) (setq indent (car indent)))
(setq shift-amt (- indent (current-column)))
(if (zerop shift-amt)
nil
(delete-region beg (point))
(indent-to indent)))
(indent-line-to indent))
;; If initial point was within line's indentation,
;; position after the indentation. Else stay at same point in text.
(if (> (- (point-max) pos) (point))