[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 9b0662d: * lisp/emacs-lisp/cl-indent.el: Don't requ
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master 9b0662d: * lisp/emacs-lisp/cl-indent.el: Don't require CL. Use lexical-binding. |
Date: |
Tue, 23 May 2017 09:24:01 -0400 (EDT) |
branch: master
commit 9b0662d3698692f99384cfc8d1bd0b41b0625e09
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* lisp/emacs-lisp/cl-indent.el: Don't require CL. Use lexical-binding.
(common-lisp-indent-function-1): Remove unused var `last-point`.
(lisp-indent-error-function): Move defvar before first use.
---
lisp/emacs-lisp/cl-indent.el | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 33ecf3f..9941d17 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -1,4 +1,4 @@
-;;; cl-indent.el --- enhanced lisp-indent mode
+;;; cl-indent.el --- Enhanced lisp-indent mode -*- lexical-binding:t -*-
;; Copyright (C) 1987, 2000-2017 Free Software Foundation, Inc.
@@ -35,7 +35,7 @@
;;; Code:
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
(defgroup lisp-indent nil
"Indentation in Lisp."
@@ -187,13 +187,13 @@ the standard lisp indent package."
(when (and (eq lisp-indent-backquote-substitution-mode 'corrected))
(save-excursion
(goto-char (elt state 1))
- (incf loop-indentation
- (cond ((eq (char-before) ?,) -1)
- ((and (eq (char-before) ?@)
- (progn (backward-char)
- (eq (char-before) ?,)))
- -2)
- (t 0)))))
+ (cl-incf loop-indentation
+ (cond ((eq (char-before) ?,) -1)
+ ((and (eq (char-before) ?@)
+ (progn (backward-char)
+ (eq (char-before) ?,)))
+ -2)
+ (t 0)))))
(goto-char indent-point)
(beginning-of-line)
@@ -315,7 +315,6 @@ instead."
;; If non-nil, this is an indentation to use
;; if nothing else specifies it more firmly.
tentative-calculated
- (last-point indent-point)
;; the position of the open-paren of the innermost containing list
(containing-form-start (elt state 1))
;; the column of the above
@@ -410,9 +409,9 @@ instead."
;; ",(...)" or ",@(...)"
(when (eq lisp-indent-backquote-substitution-mode
'corrected)
- (incf sexp-column -1)
+ (cl-incf sexp-column -1)
(when (eq (char-after (1- containing-sexp)) ?\@)
- (incf sexp-column -1)))
+ (cl-incf sexp-column -1)))
(cond (lisp-indent-backquote-substitution-mode
(setf tentative-calculated normal-indent)
(setq depth lisp-indent-maximum-backtracking)
@@ -465,7 +464,6 @@ instead."
function method path state indent-point
sexp-column normal-indent)))))
(goto-char containing-sexp)
- (setq last-point containing-sexp)
(unless calculated
(condition-case ()
(progn (backward-up-list 1)
@@ -474,6 +472,9 @@ instead."
(or calculated tentative-calculated))))
+;; Dynamically bound in common-lisp-indent-call-method.
+(defvar lisp-indent-error-function)
+
(defun common-lisp-indent-call-method (function method path state indent-point
sexp-column normal-indent)
(let ((lisp-indent-error-function function))
@@ -484,9 +485,6 @@ instead."
(lisp-indent-259 method path state indent-point
sexp-column normal-indent))))
-;; Dynamically bound in common-lisp-indent-call-method.
-(defvar lisp-indent-error-function)
-
(defun lisp-indent-report-bad-format (m)
(error "%s has a badly-formed %s property: %s"
;; Love those free variable references!!
@@ -717,7 +715,7 @@
optional\\|rest\\|key\\|allow-other-keys\\|aux\\|whole\\|body\\|environment\
(forward-sexp 2)
(skip-chars-forward " \t\n")
(while (looking-at "\\sw\\|\\s_")
- (incf nqual)
+ (cl-incf nqual)
(forward-sexp)
(skip-chars-forward " \t\n"))
(> nqual 0)))
@@ -726,7 +724,7 @@
optional\\|rest\\|key\\|allow-other-keys\\|aux\\|whole\\|body\\|environment\
path state indent-point sexp-column normal-indent))
-(defun lisp-indent-function-lambda-hack (path state indent-point
+(defun lisp-indent-function-lambda-hack (path _state _indent-point
sexp-column normal-indent)
;; indent (function (lambda () <newline> <body-forms>)) kludgily.
(if (or (cdr path) ; wtf?
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 9b0662d: * lisp/emacs-lisp/cl-indent.el: Don't require CL. Use lexical-binding.,
Stefan Monnier <=