From e3d954975bd3b654bb5b577ea96d0b057d27abed Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 16 Jul 2008 02:50:40 +0000 Subject: [PATCH] Simply require 'cl (silences spurious warnings). --- lisp/emacs-lisp/cl-compat.el | 11 +++++++++-- lisp/emacs-lisp/cl-seq.el | 10 +++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lisp/emacs-lisp/cl-compat.el b/lisp/emacs-lisp/cl-compat.el index 6ef26dfc8ed..3276f588e6a 100644 --- a/lisp/emacs-lisp/cl-compat.el +++ b/lisp/emacs-lisp/cl-compat.el @@ -44,8 +44,15 @@ ;;; Code: -;; Require at load-time, but not when compiling cl-compat. -(or (featurep 'cl) (require 'cl)) +;; This used to be: +;; (or (featurep 'cl) (require 'cl)) +;; which just has the effect of fooling the byte-compiler into not +;; loading cl when compiling. However, that leads to some bogus +;; compiler warnings. Loading cl when compiling cannot do any harm, +;; because for a long time bootstrap-emacs contained 'cl, due to being +;; dumped from uncompiled files that eval-when-compile'd cl. So every +;; file was compiled with 'cl loaded. +(require 'cl) ;;; Keyword routines not supported by new package. diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el index 0b156fc01c5..2f5ff258bca 100644 --- a/lisp/emacs-lisp/cl-seq.el +++ b/lisp/emacs-lisp/cl-seq.el @@ -1,7 +1,7 @@ ;;; cl-seq.el --- Common Lisp features, part 3 -;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008 Free Software Foundation, Inc. ;; Author: Dave Gillespie ;; Version: 2.02 @@ -31,8 +31,6 @@ ;; This package was written by Dave Gillespie; it is a complete ;; rewrite of Cesar Quiroz's original cl.el package of December 1986. ;; -;; This package works with Emacs 18, Emacs 19, and Lucid Emacs 19. -;; ;; Bug reports, comments, and suggestions are welcome! ;; This file contains the Common Lisp sequence and list functions @@ -43,9 +41,7 @@ ;;; Code: -(or (memq 'cl-19 features) - (error "Tried to load `cl-seq' before `cl'!")) - +(require 'cl) ;;; Keyword parsing. This is special-cased here so that we can compile ;;; this file independent from cl-macs. -- 2.39.2