aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-09-19 16:31:54 -0400
committerGlenn Morris2013-09-19 16:31:54 -0400
commita2c501b84eae05b1c7cb820537c12f201379648c (patch)
tree1b9b213fb9be3559c1d515c503e451d06044e6ee
parentc440407a90b70ef278113f502f6e2fd57ad38f26 (diff)
downloademacs-a2c501b84eae05b1c7cb820537c12f201379648c.tar.gz
emacs-a2c501b84eae05b1c7cb820537c12f201379648c.zip
* lisp/emacs-lisp/cl-macs.el (cl-defsubst): Remove unused local `pbody'.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/cl-macs.el6
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0d7480371b..2da4ea8f360 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12013-09-19 Glenn Morris <rgm@gnu.org> 12013-09-19 Glenn Morris <rgm@gnu.org>
2 2
3 * emacs-lisp/cl-macs.el (cl-defsubst): Remove unused local `pbody'.
4
3 * simple.el (x-selection-owner-p, x-selection-exists-p): Declare. 5 * simple.el (x-selection-owner-p, x-selection-exists-p): Declare.
4 6
5 * emacs-lisp/eieio.el (class-parent): Undo previous change. 7 * emacs-lisp/eieio.el (class-parent): Undo previous change.
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index af7c41d5c4c..7e50b5bbc9e 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2701,8 +2701,10 @@ The function's arguments should be treated as immutable.
2701 2701
2702\(fn NAME ARGLIST [DOCSTRING] BODY...)" 2702\(fn NAME ARGLIST [DOCSTRING] BODY...)"
2703 (declare (debug cl-defun) (indent 2)) 2703 (declare (debug cl-defun) (indent 2))
2704 (let* ((argns (cl--arglist-args args)) (p argns) 2704 (let* ((argns (cl--arglist-args args))
2705 (pbody (cons 'progn body))) 2705 (p argns)
2706 ;; (pbody (cons 'progn body))
2707 )
2706 (while (and p (eq (cl--expr-contains args (car p)) 1)) (pop p)) 2708 (while (and p (eq (cl--expr-contains args (car p)) 1)) (pop p))
2707 `(progn 2709 `(progn
2708 ,(if p nil ; give up if defaults refer to earlier args 2710 ,(if p nil ; give up if defaults refer to earlier args