* lisp/emacs-lisp/ring.el: Use lexical-binding

* lisp/emacs-lisp/ring.el (ring-elements): Don't use the RESULT
argument of `dotimes' when the iteration variable isn't referred by
it.
(ring-member): Don't pass nil as the RESULT argument of `dotimes'
since it's the default.

diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index b1b66262d45ee1d0831ffd44ce1e7ebace862438..c6684ec949365b593301778f80fe95a393d845a7 100644 (file)
--- a/lisp/emacs-lisp/ring.el
+++ b/lisp/emacs-lisp/ring.el
@@ -1,4 +1,4 @@
-;;; ring.el --- handle rings of items
+;;; ring.el --- handle rings of items   -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 1992, 2001-2016 Free Software Foundation, Inc.
 
@@ -160,14 +160,15 @@ will be performed."
        (size (ring-size ring))
        (vect (cddr ring))
        lst)
-    (dotimes (var (cadr ring) lst)
-      (push (aref vect (mod (+ start var) size)) lst))))
+    (dotimes (var (cadr ring))
+      (push (aref vect (mod (+ start var) size)) lst))
+    lst))
 
 (defun ring-member (ring item)
   "Return index of ITEM if on RING, else nil.
 Comparison is done via `equal'.  The index is 0-based."
   (catch 'found
-    (dotimes (ind (ring-length ring) nil)
+    (dotimes (ind (ring-length ring))
       (when (equal item (ring-ref ring ind))
        (throw 'found ind)))))
 

diff --git a/test/lisp/emacs-lisp/ring-tests.el b/test/lisp/emacs-lisp/ring-tests.el
index 705bfe5cffe4963577d278bed7d7d2d51b99bc9c..affde8914bd75099bea929010b76ea8d0ba8baf3 100644 (file)
--- a/test/lisp/emacs-lisp/ring-tests.el
+++ b/test/lisp/emacs-lisp/ring-tests.el
@@ -5,6 +5,8 @@
 ;; Author: Simen Heggestøyl <simenheg@gmail.com>
 ;; Keywords:
 
+;; This file is part of GNU Emacs.
+
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or