diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 6102e1f7400..3e4e0dcb1b6 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -1504,10 +1504,9 @@ You can then feed the file name(s) to other commands with \\[yank]."
 (defun ibuffer-locked-buffer-p (&optional buf)
   "Return non-nil if BUF is locked.
 When BUF nil, default to the buffer at current line."
-  (let ((_buffer (or buf (ibuffer-current-buffer)))
-        char)
-    (when _buffer
-      (with-current-buffer _buffer
+  (let ((cbuffer (or buf (ibuffer-current-buffer))))
+    (when cbuffer
+      (with-current-buffer cbuffer
         (and (boundp 'emacs-lock-mode) emacs-lock-mode)))))
 
 ;;;###autoload
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 37f72bc1aaa..8e246297ff7 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1348,8 +1348,8 @@ With optional ARG, make read-only only if ARG is not negative."
 	 t)))
      ((not (char-equal mark ?\r))
       (ibuffer-map-lines
-       (lambda (_buf _mark)
-	 (when (char-equal _mark mark)
+       (lambda (_buf cmark)
+	 (when (char-equal cmark mark)
 	   (ibuffer-set-mark-1 ?\s))
 	 t)))
      (t