[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2f6769f 3/5: Remove ignored argument from lisp-inde
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] master 2f6769f 3/5: Remove ignored argument from lisp-indent-line |
Date: |
Sat, 22 Apr 2017 14:17:51 -0400 (EDT) |
branch: master
commit 2f6769f9cdb799e880fdcc09057353a0a2349bfc
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Remove ignored argument from lisp-indent-line
* 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'.
---
lisp/emacs-lisp/lisp-mode.el | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 810fc95..89d5659 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -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))