From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Rocky Bernstein Newsgroups: gmane.emacs.devel Subject: Re: [elpa] master d7bac58 3/5: Wrong require again. Date: Thu, 04 Aug 2016 22:05:48 +0000 Message-ID: References: <20160804030326.16920.78136@vcs.savannah.gnu.org> <20160804030326.B379D220169@vcs.savannah.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a113d3bd4a815e405394627e4 X-Trace: blaine.gmane.org 1470348448 28118 195.159.176.226 (4 Aug 2016 22:07:28 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 4 Aug 2016 22:07:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Aug 05 00:07:19 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bVQnJ-0005Eg-Qz for ged-emacs-devel@m.gmane.org; Fri, 05 Aug 2016 00:07:14 +0200 Original-Received: from localhost ([::1]:41904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVQnD-00049Q-Ez for ged-emacs-devel@m.gmane.org; Thu, 04 Aug 2016 18:07:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVQmK-000490-Av for emacs-devel@gnu.org; Thu, 04 Aug 2016 18:06:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVQm8-0000AT-Ki for emacs-devel@gnu.org; Thu, 04 Aug 2016 18:06:11 -0400 Original-Received: from mail-vk0-f54.google.com ([209.85.213.54]:34806) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVQm8-0000AN-9k for emacs-devel@gnu.org; Thu, 04 Aug 2016 18:06:00 -0400 Original-Received: by mail-vk0-f54.google.com with SMTP id s189so178580839vkh.1 for ; Thu, 04 Aug 2016 15:06:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=MobB90vlfZ3BaxnHBE0TnUkMSpttBkeZ9gnG1RTQLSw=; b=YMl0KeCJfseZFQW0XhChqgdrYZe06dZZL9rqSSyzkSlb5tyPDXstJw0Q3Nb12TDmc+ qrIBSiLR/9dxZ1T+Bh13XTLkzy9hxcW4EXOwPUoBYnjzJ9bJOPPWu+m6BCVg/4ZqWZ4C s2yuVpXY49kU1BPHJO4yAPA+qrhhsfz7NmJ8uS8kqJ3DvGdfbJy3jKpkS0Jh9GZuSly4 d9ut3+cRhi/OC6IyjBnbuyvZ5mFD9UOmDv5O2sVkJ45SDFTMjcG9I8azc5Sh9nn/sxWl T2QkU7K4Ii8IM3/0BKL6fxEE0TcxRYFcEngUEuXl2yInQY8eGtRheRFBjdChPIRghF8a p6fg== X-Gm-Message-State: AEkoouuS8uI8/1SqBG9xVV8Ey3Azrn1fJ3dnuS+F1I8yBWhZ1Hn22d/2XmmHQI4Z2QlFe4bnM/LRizBA7wAQBQ== X-Received: by 10.31.148.198 with SMTP id w189mr38446353vkd.127.1470348359372; Thu, 04 Aug 2016 15:05:59 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.213.54 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:206415 Archived-At: --001a113d3bd4a815e405394627e4 Content-Type: text/plain; charset=UTF-8 Yes please. I will test and amend if needed. On Thu, Aug 4, 2016, 6:03 PM Stefan Monnier wrote: > >> Do you want me to update the code to use `cl-lib' exclusively? > > Yes, please. You know more about this than I. See also: > > The (untested) patch below should do it. Do you want me to push it to > elpa.git? > > > Stefan > > > diff --git a/packages/realgud/ChangeLog b/packages/realgud/ChangeLog > index bc3f48c..d0bb58b 100644 > --- a/packages/realgud/ChangeLog > +++ b/packages/realgud/ChangeLog > @@ -1,3 +1,26 @@ > +2016-08-04 Stefan Monnier > + > + * realgud.el: Add missing cl-lib dependency. > + * : Remove unneeded (require 'cl) and replace the > + other ones with (require 'cl-lib) > + > + * test/test-common-helper.el (realgud-test-info): > + * realgud/common/regexp.el (realgud-loc-pat): > + * realgud/common/lochist.el (realgud-loc-hist): > + * realgud/common/buffer/info.el (realgud-backtrace-info): > + * realgud/common/loc.el (realgud-loc): Use `cl-defstruct'. > + > + * realgud/common/run.el (realgud:run-process, > realgud:run-debugger): > + Use cl-remove-if and cl-remove-duplicates. > + > + * realgud/common/track.el (realgud-track-bp-loc): Fix typo. > + > + * test/test-track.el: > + * test/test-regexp.el: > + * test/test-regexp-ruby.el: > + * test/test-regexp-rdebug.el: > + * test/test-core.el: Use lexical-binding rather than lexical-let. > + > 2010-11-27 rocky > > * dbgr/debugger/trepan/init.el, dbgr/lang/ruby.el, > diff --git a/packages/realgud/realgud.el b/packages/realgud/realgud.el > index b16cc48..026dbb4 100644 > --- a/packages/realgud/realgud.el > +++ b/packages/realgud/realgud.el > @@ -3,11 +3,10 @@ > ;; Author: Rocky Bernstein > ;; Version: 1.4.3 > ;; Package-Type: multi > -;; Package-Requires: ((load-relative "1.2") (loc-changes "1.2") > (test-simple "1.2.0")) > +;; Package-Requires: ((load-relative "1.2") (loc-changes "1.2") > (test-simple "1.2.0") (cl-lib "0.5") (emacs "24")) > ;; URL: http://github.com/realgud/realgud/ > -;; Compatibility: GNU Emacs 24.x > > -;; Copyright (C) 2015, 2016 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; This program is free software; you can redistribute it and/or modify > ;; it under the terms of the GNU General Public License as published by > diff --git a/packages/realgud/realgud/common/attach.el > b/packages/realgud/realgud/common/attach.el > index f0efbff..aefd62f 100644 > --- a/packages/realgud/realgud/common/attach.el > +++ b/packages/realgud/realgud/common/attach.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -17,7 +17,6 @@ > ;;; Emacs Commands to associate or attach a source buffer to a command > ;;; buffer and vice versa. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '("buffer/command" "buffer/source") > "realgud-buffer-") > diff --git a/packages/realgud/realgud/common/backtrack-mode.el > b/packages/realgud/realgud/common/backtrack-mode.el > index aaf89c9..a4bbfc5 100644 > --- a/packages/realgud/realgud/common/backtrack-mode.el > +++ b/packages/realgud/realgud/common/backtrack-mode.el > @@ -20,7 +20,6 @@ > ;; process shell arround Compare with backtrace-mode.el which > ;; handles backtraces inside the debugger > > -(eval-when-compile (require 'cl)) > (require 'shell) > > (require 'load-relative) > diff --git a/packages/realgud/realgud/common/buffer/info.el > b/packages/realgud/realgud/common/buffer/info.el > index 571b614..246f302 100644 > --- a/packages/realgud/realgud/common/buffer/info.el > +++ b/packages/realgud/realgud/common/buffer/info.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015, 2016 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; This program is free software; you can redistribute it and/or modify > ;; it under the terms of the GNU General Public License as published by > @@ -16,12 +16,12 @@ > > ;;; A mode based off of org mode to show debugger information > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) > (require 'org) > > (require 'load-relative) > > -(defstruct realgud-backtrace-info > +(cl-defstruct realgud-backtrace-info > "debugger object/structure specific to debugger info." > (cmdbuf nil) ;; buffer of the associated debugger process > ) > diff --git a/packages/realgud/realgud/common/cmds.el > b/packages/realgud/realgud/common/cmds.el > index 4b2f3eb..8f02555 100644 > --- a/packages/realgud/realgud/common/cmds.el > +++ b/packages/realgud/realgud/common/cmds.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015, 2016 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > diff --git a/packages/realgud/realgud/common/fringe.el > b/packages/realgud/realgud/common/fringe.el > index 745d85b..c50153b 100644 > --- a/packages/realgud/realgud/common/fringe.el > +++ b/packages/realgud/realgud/common/fringe.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2010, 2012, 2014-2015 Free Software Foundation, Inc > +;; Copyright (C) 2010, 2012, 2014-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -86,9 +86,6 @@ position.") > "Overlay arrow variable which contains the 3rd most recent debugger > position.") > > -(eval-when-compile (require 'cl)) > - > - > ;; FIXME: since overlay overlay-arrow-list can be global, and perhaps > ;; has to stay that way since some Emacs code may expect that, we > ;; should use different global overlay arrow variables for the > diff --git a/packages/realgud/realgud/common/helper.el > b/packages/realgud/realgud/common/helper.el > index 705100d..7467b2b 100644 > --- a/packages/realgud/realgud/common/helper.el > +++ b/packages/realgud/realgud/common/helper.el > @@ -12,8 +12,7 @@ > ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > ;; GNU General Public License for more details. > > -(require 'cl-lib) > -(require 'cl) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > ;;; Miscellaneous utility functions > (require 'load-relative) > diff --git a/packages/realgud/realgud/common/loc.el > b/packages/realgud/realgud/common/loc.el > index 00c75a0..76584c0 100644 > --- a/packages/realgud/realgud/common/loc.el > +++ b/packages/realgud/realgud/common/loc.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -18,6 +18,8 @@ > ;; This describes a debugger location structure and has code for > ;; working with them. > > +(eval-when-compile (require 'cl-lib)) > + > (require 'load-relative) > (require 'loc-changes) > (require-relative-list '("fringe" "follow") "realgud-") > @@ -30,7 +32,7 @@ > (declare-function realgud-get-cmdbuf-from-srcbuf 'realgud-buffer-helper) > (declare-function realgud-srcbuf? 'realgud-buffer-source) > > -(defstruct realgud-loc > +(cl-defstruct realgud-loc > "Our own location type. Even though a mark contains a > file-name (via a buffer) and a line number (via an offset), we > want to save the values that were seen/requested originally." > diff --git a/packages/realgud/realgud/common/lochist.el > b/packages/realgud/realgud/common/lochist.el > index 33fcf49..786e8e3 100644 > --- a/packages/realgud/realgud/common/lochist.el > +++ b/packages/realgud/realgud/common/lochist.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2010, 2012, 2014-2015 Free Software Foundation, Inc > +;; Copyright (C) 2010, 2012, 2014-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -20,6 +20,7 @@ > > ;;; Code: > > +(eval-when-compile (require 'cl-lib)) > (require 'ring) > (require 'org) > (require 'load-relative) > @@ -32,7 +33,7 @@ > :type 'integer > :group 'realgud) > > -(defstruct realgud-loc-hist > +(cl-defstruct realgud-loc-hist > "A list of source-code positions recently encountered" > (position -1) > (ring (make-ring realgud-loc-hist-size))) > diff --git a/packages/realgud/realgud/common/regexp.el > b/packages/realgud/realgud/common/regexp.el > index 127d7c2..e21de25 100644 > --- a/packages/realgud/realgud/common/regexp.el > +++ b/packages/realgud/realgud/common/regexp.el > @@ -27,9 +27,9 @@ > ;; Variables defining regular expressions (regexp:s). > ;; > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) > > -(defstruct realgud-loc-pat > +(cl-defstruct realgud-loc-pat > "Information to match and extract position and other related > information typically > output by a debugger inside a process shell" > (num) ;; General number. Could be for example > diff --git a/packages/realgud/realgud/common/run.el > b/packages/realgud/realgud/common/run.el > index a24e123..f78bd35 100644 > --- a/packages/realgud/realgud/common/run.el > +++ b/packages/realgud/realgud/common/run.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015, 2016 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -17,7 +17,7 @@ > > ; (require 'term) > > -(require 'cl) > +(require 'cl-lib) > (require 'shell) > (require 'load-relative) > (require-relative-list '("core" "track" "utils") "realgud-") > @@ -152,7 +152,7 @@ marginal icons is reset." > (if (boundp 'starting-directory) > (realgud-cmdbuf-info-starting-directory= > starting-directory)) > (set minibuffer-history > - (remove-duplicates > + (cl-remove-duplicates > (cons cmd-str (eval minibuffer-history)) :from-end) > )) > ))) > @@ -191,7 +191,7 @@ Otherwise nil is returned. > (script-args (caddr parsed-args)) > (script-name (or opt-script-name (car script-args))) > (parsed-cmd-args > - (remove-if 'nil (realgud:flatten parsed-args))) > + (cl-remove-if 'nil (realgud:flatten parsed-args))) > ) > (realgud:run-process debugger-name script-name parsed-cmd-args > minibuffer-history no-reset) > diff --git a/packages/realgud/realgud/common/send.el > b/packages/realgud/realgud/common/send.el > index b8b1f7e..81edf16 100644 > --- a/packages/realgud/realgud/common/send.el > +++ b/packages/realgud/realgud/common/send.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015, 2016 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > diff --git a/packages/realgud/realgud/common/track-mode.el > b/packages/realgud/realgud/common/track-mode.el > index bf0888b..4f58428 100644 > --- a/packages/realgud/realgud/common/track-mode.el > +++ b/packages/realgud/realgud/common/track-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -16,7 +16,6 @@ > ;; along with this program. If not, see . > ;; tracks shell output > > -(eval-when-compile (require 'cl)) > (require 'shell) > > (require 'load-relative) > diff --git a/packages/realgud/realgud/common/track.el > b/packages/realgud/realgud/common/track.el > index 36f8e98..badb83f 100644 > --- a/packages/realgud/realgud/common/track.el > +++ b/packages/realgud/realgud/common/track.el > @@ -481,7 +481,7 @@ Otherwise return nil. CMD-MARK is set in the > realgud-loc object created. > (message "line number not found -- using 1")) > (if (and filename lineno) > (let* ((directory > - (cond ((boundp 'starting-directory) > staring-directory) > + (cond ((boundp 'starting-directory) > starting-directory) > (t nil))) > (loc-or-error > (realgud:file-loc-from-line > diff --git a/packages/realgud/realgud/debugger/bashdb/core.el > b/packages/realgud/realgud/debugger/bashdb/core.el > index 899eec0..87c371c 100644 > --- a/packages/realgud/realgud/debugger/bashdb/core.el > +++ b/packages/realgud/realgud/debugger/bashdb/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -14,7 +14,6 @@ > > ;; You should have received a copy of the GNU General Public License > ;; along with this program. If not, see . > -(eval-when-compile (require 'cl)) > > (require 'load-relative) > (require-relative-list '("../../common/track" "../../common/core") > diff --git a/packages/realgud/realgud/debugger/bashdb/init.el > b/packages/realgud/realgud/debugger/bashdb/init.el > index 2e3f8a3..2c7769f 100644 > --- a/packages/realgud/realgud/debugger/bashdb/init.el > +++ b/packages/realgud/realgud/debugger/bashdb/init.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015, 2016 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -17,8 +17,7 @@ > > ;; Regular expressions for Bash shell debugger: bashdb > > -(eval-when-compile (require 'cl)) > - > +(eval-when-compile (require 'cl-lib)) ;For setf. > (require 'load-relative) > (require-relative-list '("../../common/regexp" > "../../common/loc" > diff --git a/packages/realgud/realgud/debugger/bashdb/track-mode.el > b/packages/realgud/realgud/debugger/bashdb/track-mode.el > index 0e3dfef..d01d6c7 100644 > --- a/packages/realgud/realgud/debugger/bashdb/track-mode.el > +++ b/packages/realgud/realgud/debugger/bashdb/track-mode.el > @@ -16,7 +16,6 @@ > > ;; Bash Debugger tracking in a comint or eshell buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/gdb/core.el > b/packages/realgud/realgud/debugger/gdb/core.el > index 5a36a23..35fc492 100644 > --- a/packages/realgud/realgud/debugger/gdb/core.el > +++ b/packages/realgud/realgud/debugger/gdb/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015, 2016 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -15,9 +15,6 @@ > ;; You should have received a copy of the GNU General Public License > ;; along with this program. If not, see . > > -(eval-when-compile (require 'cl)) > - > -(require 'files) > (require 'load-relative) > (require-relative-list '("../../common/track" > "../../common/core" > diff --git a/packages/realgud/realgud/debugger/gdb/gdb.el > b/packages/realgud/realgud/debugger/gdb/gdb.el > index 91776a0..4c2853f 100644 > --- a/packages/realgud/realgud/debugger/gdb/gdb.el > +++ b/packages/realgud/realgud/debugger/gdb/gdb.el > @@ -16,7 +16,6 @@ > ;; along with this program. If not, see . > > ;; `realgud:gdb' Main interface to gdb via Emacs > -(require 'cl) > (require 'load-relative) > (require-relative-list '("../../common/helper" "../../common/utils") > "realgud-") > diff --git a/packages/realgud/realgud/debugger/gdb/init.el > b/packages/realgud/realgud/debugger/gdb/init.el > index 8b7ac86..92bb5d6 100644 > --- a/packages/realgud/realgud/debugger/gdb/init.el > +++ b/packages/realgud/realgud/debugger/gdb/init.el > @@ -17,7 +17,7 @@ > > ;;; gdb debugger > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) > > (require 'load-relative) > (require-relative-list '("../../common/regexp" "../../common/loc") > "realgud-") > diff --git a/packages/realgud/realgud/debugger/gdb/track-mode.el > b/packages/realgud/realgud/debugger/gdb/track-mode.el > index d56e4b2..9497657 100644 > --- a/packages/realgud/realgud/debugger/gdb/track-mode.el > +++ b/packages/realgud/realgud/debugger/gdb/track-mode.el > @@ -19,7 +19,6 @@ > > ;; gdb tracking a comint or eshell buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/gub/core.el > b/packages/realgud/realgud/debugger/gub/core.el > index 12dc8ff..d6d13da 100644 > --- a/packages/realgud/realgud/debugger/gub/core.el > +++ b/packages/realgud/realgud/debugger/gub/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2013-2014 Free Software Foundation, Inc > +;; Copyright (C) 2013-2014, 2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -7,8 +7,6 @@ > ;; the Free Software Foundation, either version 3 of the License, or > ;; (at your option) any later version. > > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../../common/track" "../../common/lang" > "../../common/core") "realgud-") > diff --git a/packages/realgud/realgud/debugger/gub/init.el > b/packages/realgud/realgud/debugger/gub/init.el > index 01f71a3..f244267 100644 > --- a/packages/realgud/realgud/debugger/gub/init.el > +++ b/packages/realgud/realgud/debugger/gub/init.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > ;; Author: Rocky Bernstein > > ;; This program is free software: you can redistribute it and/or > @@ -17,7 +17,7 @@ > > ;; Regular expressions for Go SSA debugger: gub > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/gub/track-mode.el > b/packages/realgud/realgud/debugger/gub/track-mode.el > index 3f74cbc..b48bb0c 100644 > --- a/packages/realgud/realgud/debugger/gub/track-mode.el > +++ b/packages/realgud/realgud/debugger/gub/track-mode.el > @@ -9,7 +9,6 @@ > > ;;; Golang SSA gub tracking a comint buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/ipdb/core.el > b/packages/realgud/realgud/debugger/ipdb/core.el > index 789920b..8d64e6a 100644 > --- a/packages/realgud/realgud/debugger/ipdb/core.el > +++ b/packages/realgud/realgud/debugger/ipdb/core.el > @@ -11,8 +11,6 @@ > ;; along with this program. If not, see . > > > -(eval-when-compile (require 'cl)) > - > (require 'comint) > (require 'load-relative) > (require-relative-list '("../../common/track" > diff --git a/packages/realgud/realgud/debugger/ipdb/init.el > b/packages/realgud/realgud/debugger/ipdb/init.el > index 07ae8ad..b1cd04f 100644 > --- a/packages/realgud/realgud/debugger/ipdb/init.el > +++ b/packages/realgud/realgud/debugger/ipdb/init.el > @@ -17,7 +17,7 @@ > ;; along with this program. If not, see . > ;; Stock Python debugger ipdb > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/ipdb/track-mode.el > b/packages/realgud/realgud/debugger/ipdb/track-mode.el > index 17133b3..b723a07 100644 > --- a/packages/realgud/realgud/debugger/ipdb/track-mode.el > +++ b/packages/realgud/realgud/debugger/ipdb/track-mode.el > @@ -17,7 +17,6 @@ > ;; along with this program. If not, see . > ;; Python "ipdb" Debugger tracking a comint buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/jdb/backtrack-mode.el > b/packages/realgud/realgud/debugger/jdb/backtrack-mode.el > index 179ac63..1454edc 100644 > --- a/packages/realgud/realgud/debugger/jdb/backtrack-mode.el > +++ b/packages/realgud/realgud/debugger/jdb/backtrack-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -16,7 +16,6 @@ > ;; along with this program. If not, see . > ;; Mode for parsing various kinds of backtraces found in Java > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/jdb/core.el > b/packages/realgud/realgud/debugger/jdb/core.el > index f4c35d2..9199c23 100644 > --- a/packages/realgud/realgud/debugger/jdb/core.el > +++ b/packages/realgud/realgud/debugger/jdb/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2014 Free Software Foundation, Inc > +;; Copyright (C) 2014, 2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -7,8 +7,6 @@ > ;; the Free Software Foundation, either version 3 of the License, or > ;; (at your option) any later version. > > -(eval-when-compile (require 'cl)) > - > ;; We use gud to handle the classpath-to-filename mapping > (require 'gud) > (require 'compile) ;; for compilation-find-file > diff --git a/packages/realgud/realgud/debugger/jdb/init.el > b/packages/realgud/realgud/debugger/jdb/init.el > index 13548e0..82bfe4a 100644 > --- a/packages/realgud/realgud/debugger/jdb/init.el > +++ b/packages/realgud/realgud/debugger/jdb/init.el > @@ -7,7 +7,7 @@ > ;; the Free Software Foundation, either version 3 of the License, or > ;; (at your option) any later version. > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/jdb/jdb.el > b/packages/realgud/realgud/debugger/jdb/jdb.el > index bb6d41c..62afcea 100644 > --- a/packages/realgud/realgud/debugger/jdb/jdb.el > +++ b/packages/realgud/realgud/debugger/jdb/jdb.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2014-2015 Free Software Foundation, Inc > +;; Copyright (C) 2014-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -10,7 +10,6 @@ > ;; `jdb' Main interface to jdb via Emacs > > (require 'gud) ;; For class-path and source-path handling > -(require 'cl) > > (require 'load-relative) > (require-relative-list '("../../common/run") "realgud:") > diff --git a/packages/realgud/realgud/debugger/jdb/track-mode.el > b/packages/realgud/realgud/debugger/jdb/track-mode.el > index 208b6cf..e35a134 100644 > --- a/packages/realgud/realgud/debugger/jdb/track-mode.el > +++ b/packages/realgud/realgud/debugger/jdb/track-mode.el > @@ -9,7 +9,6 @@ > > ;; Java "jdb" Debugger tracking a comint or eshell buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/kshdb/core.el > b/packages/realgud/realgud/debugger/kshdb/core.el > index 5571583..afcb119 100644 > --- a/packages/realgud/realgud/debugger/kshdb/core.el > +++ b/packages/realgud/realgud/debugger/kshdb/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2010, 2014-2015 Free Software Foundation, Inc > +;; Copyright (C) 2010, 2014-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -7,8 +7,6 @@ > ;; the Free Software Foundation, either version 3 of the License, or > ;; (at your option) any later version. > > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../../common/track" "../../common/core") > "realgud-") > (require-relative-list '("init") "realgud:kshdb-") > diff --git a/packages/realgud/realgud/debugger/kshdb/init.el > b/packages/realgud/realgud/debugger/kshdb/init.el > index 44fcdb8..e6f6f74 100644 > --- a/packages/realgud/realgud/debugger/kshdb/init.el > +++ b/packages/realgud/realgud/debugger/kshdb/init.el > @@ -9,7 +9,7 @@ > > ;;Regular expressions for Korn shell debugger: kshdb > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/kshdb/track-mode.el > b/packages/realgud/realgud/debugger/kshdb/track-mode.el > index ea62baf..a80da63 100644 > --- a/packages/realgud/realgud/debugger/kshdb/track-mode.el > +++ b/packages/realgud/realgud/debugger/kshdb/track-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -16,7 +16,6 @@ > ;; along with this program. If not, see . > ;;; "kshdb" Debugger tracking a comint or eshell buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/nodejs/core.el > b/packages/realgud/realgud/debugger/nodejs/core.el > index 1ff8b71..065ac37 100644 > --- a/packages/realgud/realgud/debugger/nodejs/core.el > +++ b/packages/realgud/realgud/debugger/nodejs/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -15,8 +15,6 @@ > ;; You should have received a copy of the GNU General Public License > ;; along with this program. If not, see . > > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../../common/track" "../../common/core") > "realgud-") > diff --git a/packages/realgud/realgud/debugger/nodejs/init.el > b/packages/realgud/realgud/debugger/nodejs/init.el > index e20211e..70634af 100644 > --- a/packages/realgud/realgud/debugger/nodejs/init.el > +++ b/packages/realgud/realgud/debugger/nodejs/init.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015, 2016 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -16,7 +16,7 @@ > ;; along with this program. If not, see . > ;;; Regular expressions for nodejs Javascript debugger. > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/nodejs/track-mode.el > b/packages/realgud/realgud/debugger/nodejs/track-mode.el > index 753e20d..6afaa62 100644 > --- a/packages/realgud/realgud/debugger/nodejs/track-mode.el > +++ b/packages/realgud/realgud/debugger/nodejs/track-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -16,7 +16,6 @@ > ;; along with this program. If not, see . > ;;; nodejs tracking a comint buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/pdb/core.el > b/packages/realgud/realgud/debugger/pdb/core.el > index 8964cf6..16c5dbd 100644 > --- a/packages/realgud/realgud/debugger/pdb/core.el > +++ b/packages/realgud/realgud/debugger/pdb/core.el > @@ -7,8 +7,6 @@ > ;; the Free Software Foundation, either version 3 of the License, or > ;; (at your option) any later version. > > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../../common/track" > "../../common/core" > diff --git a/packages/realgud/realgud/debugger/pdb/init.el > b/packages/realgud/realgud/debugger/pdb/init.el > index ac346b8..7068758 100644 > --- a/packages/realgud/realgud/debugger/pdb/init.el > +++ b/packages/realgud/realgud/debugger/pdb/init.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -16,7 +16,7 @@ > ;; along with this program. If not, see . > ;; Stock Python debugger pdb > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/pdb/pdb.el > b/packages/realgud/realgud/debugger/pdb/pdb.el > index 1946478..8ddd380 100644 > --- a/packages/realgud/realgud/debugger/pdb/pdb.el > +++ b/packages/realgud/realgud/debugger/pdb/pdb.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015, 2016 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > diff --git a/packages/realgud/realgud/debugger/pdb/track-mode.el > b/packages/realgud/realgud/debugger/pdb/track-mode.el > index 7958eae..b18172f 100644 > --- a/packages/realgud/realgud/debugger/pdb/track-mode.el > +++ b/packages/realgud/realgud/debugger/pdb/track-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -16,7 +16,6 @@ > ;; along with this program. If not, see . > ;; Python "pdb" Debugger tracking a comint buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/perldb/core.el > b/packages/realgud/realgud/debugger/perldb/core.el > index 2df3533..04f6f0c 100644 > --- a/packages/realgud/realgud/debugger/perldb/core.el > +++ b/packages/realgud/realgud/debugger/perldb/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2011, 2013-2014 Free Software Foundation, Inc > +;; Copyright (C) 2011, 2013-2014, 2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -7,8 +7,6 @@ > ;; the Free Software Foundation, either version 3 of the License, or > ;; (at your option) any later version. > > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../../common/track" > "../../common/core" > diff --git a/packages/realgud/realgud/debugger/perldb/init.el > b/packages/realgud/realgud/debugger/perldb/init.el > index 27c47c0..42dbedf 100644 > --- a/packages/realgud/realgud/debugger/perldb/init.el > +++ b/packages/realgud/realgud/debugger/perldb/init.el > @@ -16,7 +16,7 @@ > ;;; Regular expressions for nodejs Javascript debugger. > ;;; Stock Perl debugger perldb > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" "../../common/loc") > "realgud-") > diff --git a/packages/realgud/realgud/debugger/perldb/track-mode.el > b/packages/realgud/realgud/debugger/perldb/track-mode.el > index 39c2ec7..ce80a23 100644 > --- a/packages/realgud/realgud/debugger/perldb/track-mode.el > +++ b/packages/realgud/realgud/debugger/perldb/track-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -16,7 +16,6 @@ > ;; along with this program. If not, see . > ;; Stock Perl Debugger "perldb5" tracking a comint or eshell buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/rdebug/core.el > b/packages/realgud/realgud/debugger/rdebug/core.el > index 78a5a2d..bd66518 100644 > --- a/packages/realgud/realgud/debugger/rdebug/core.el > +++ b/packages/realgud/realgud/debugger/rdebug/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2010, 2015 Free Software Foundation, Inc > +;; Copyright (C) 2010, 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -7,8 +7,6 @@ > ;; the Free Software Foundation, either version 3 of the License, or > ;; (at your option) any later version. > > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../../common/track" > "../../common/core" > diff --git a/packages/realgud/realgud/debugger/rdebug/init.el > b/packages/realgud/realgud/debugger/rdebug/init.el > index ec28401..4b4a024 100644 > --- a/packages/realgud/realgud/debugger/rdebug/init.el > +++ b/packages/realgud/realgud/debugger/rdebug/init.el > @@ -9,7 +9,7 @@ > > ;; Ruby 1.8 debugger: ruby-debug (rdebug) > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For stef. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" "../../common/loc") > "realgud-") > diff --git a/packages/realgud/realgud/debugger/rdebug/track-mode.el > b/packages/realgud/realgud/debugger/rdebug/track-mode.el > index 142836f..87d6986 100644 > --- a/packages/realgud/realgud/debugger/rdebug/track-mode.el > +++ b/packages/realgud/realgud/debugger/rdebug/track-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2010, 2012, 2015, 2016 Free Software Foundation, Inc > +;; Copyright (C) 2010, 2012, 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -9,7 +9,6 @@ > > ;;; Ruby "rdebug" Debugger tracking a comint or eshell buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/remake/core.el > b/packages/realgud/realgud/debugger/remake/core.el > index cb78f55..7f2772c 100644 > --- a/packages/realgud/realgud/debugger/remake/core.el > +++ b/packages/realgud/realgud/debugger/remake/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2011, 2014-2015 Free Software Foundation, Inc > +;; Copyright (C) 2011, 2014-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -7,8 +7,6 @@ > ;; the Free Software Foundation, either version 3 of the License, or > ;; (at your option) any later version. > > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../../common/track" "../../common/core" > "../../common/lang") > "realgud-") > diff --git a/packages/realgud/realgud/debugger/remake/init.el > b/packages/realgud/realgud/debugger/remake/init.el > index 6e398a2..0c650cf 100644 > --- a/packages/realgud/realgud/debugger/remake/init.el > +++ b/packages/realgud/realgud/debugger/remake/init.el > @@ -15,7 +15,7 @@ > ;; along with this program. If not, see . > ;;; Regular expressions for GNU Make debugger: remake > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/remake/track-mode.el > b/packages/realgud/realgud/debugger/remake/track-mode.el > index 50829a9..2bc649f 100644 > --- a/packages/realgud/realgud/debugger/remake/track-mode.el > +++ b/packages/realgud/realgud/debugger/remake/track-mode.el > @@ -9,7 +9,6 @@ > > ;;; GNU Make Debugger tracking a comint buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/trepan.pl/backtrack-mode.el > b/packages/realgud/realgud/debugger/trepan.pl/backtrack-mode.el > index 7340c6f..7f7728b 100644 > --- a/packages/realgud/realgud/debugger/trepan.pl/backtrack-mode.el > +++ b/packages/realgud/realgud/debugger/trepan.pl/backtrack-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2011, 2014 Free Software Foundation, Inc > +;; Copyright (C) 2011, 2014, 2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -9,7 +9,6 @@ > > ;;; Mode for parsing various kinds of backtraces found in Perl > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/trepan.pl/core.el > b/packages/realgud/realgud/debugger/trepan.pl/core.el > index acd7e13..37ea9a8 100644 > --- a/packages/realgud/realgud/debugger/trepan.pl/core.el > +++ b/packages/realgud/realgud/debugger/trepan.pl/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2011-2012, 2014 Free Software Foundation, Inc > +;; Copyright (C) 2011-2012, 2014, 2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -7,8 +7,6 @@ > ;; the Free Software Foundation, either version 3 of the License, or > ;; (at your option) any later version. > > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../../common/track" > "../../common/core" > diff --git a/packages/realgud/realgud/debugger/trepan.pl/init.el > b/packages/realgud/realgud/debugger/trepan.pl/init.el > index d201d10..2865180 100644 > --- a/packages/realgud/realgud/debugger/trepan.pl/init.el > +++ b/packages/realgud/realgud/debugger/trepan.pl/init.el > @@ -16,7 +16,7 @@ > ;; along with this program. If not, see . > > ;; Trepanning Perl debugger > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/trepan.pl/track-mode.el > b/packages/realgud/realgud/debugger/trepan.pl/track-mode.el > index 9140c56..d29add5 100644 > --- a/packages/realgud/realgud/debugger/trepan.pl/track-mode.el > +++ b/packages/realgud/realgud/debugger/trepan.pl/track-mode.el > @@ -9,7 +9,6 @@ > > ;; Perl trepanning Debugger tracking a comint buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/trepan/backtrack-mode.el > b/packages/realgud/realgud/debugger/trepan/backtrack-mode.el > index c655779..d92b6b7 100644 > --- a/packages/realgud/realgud/debugger/trepan/backtrack-mode.el > +++ b/packages/realgud/realgud/debugger/trepan/backtrack-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -17,7 +17,6 @@ > > ;;; Mode for parsing various kinds of backtraces found in Ruby > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/trepan/core.el > b/packages/realgud/realgud/debugger/trepan/core.el > index 07764a0..a844208 100644 > --- a/packages/realgud/realgud/debugger/trepan/core.el > +++ b/packages/realgud/realgud/debugger/trepan/core.el > @@ -7,8 +7,6 @@ > ;; the Free Software Foundation, either version 3 of the License, or > ;; (at your option) any later version. > > -(eval-when-compile (require 'cl)) > - > (require 'compile) ;; for compilation-find-file > (require 'load-relative) > (require-relative-list '("../../common/track" > diff --git a/packages/realgud/realgud/debugger/trepan/init.el > b/packages/realgud/realgud/debugger/trepan/init.el > index 6a0dd9d..b2cc954 100644 > --- a/packages/realgud/realgud/debugger/trepan/init.el > +++ b/packages/realgud/realgud/debugger/trepan/init.el > @@ -16,7 +16,7 @@ > ;; along with this program. If not, see . > > ;; Ruby Trepanning debugger > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/trepan/track-mode.el > b/packages/realgud/realgud/debugger/trepan/track-mode.el > index 2887c3e..f5fafb2 100644 > --- a/packages/realgud/realgud/debugger/trepan/track-mode.el > +++ b/packages/realgud/realgud/debugger/trepan/track-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2010, 2012-2015 Free Software Foundation, Inc > +;; Copyright (C) 2010, 2012-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -14,7 +14,6 @@ > > ;;; Ruby "trepan" Debugger tracking a comint or eshell buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/trepan2/core.el > b/packages/realgud/realgud/debugger/trepan2/core.el > index eb2a5c6..ddf9011 100644 > --- a/packages/realgud/realgud/debugger/trepan2/core.el > +++ b/packages/realgud/realgud/debugger/trepan2/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2010-2012, 2014-2015 Free Software Foundation, Inc > +;; Copyright (C) 2010-2012, 2014-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -15,8 +15,6 @@ > ;; You should have received a copy of the GNU General Public License > ;; along with this program. If not, see . > > -(eval-when-compile (require 'cl)) > - > (require 'compile) ;; for compilation-find-file > (require 'load-relative) > (require-relative-list '("../../common/track" > diff --git a/packages/realgud/realgud/debugger/trepan2/init.el > b/packages/realgud/realgud/debugger/trepan2/init.el > index 235e47d..2f13fa7 100644 > --- a/packages/realgud/realgud/debugger/trepan2/init.el > +++ b/packages/realgud/realgud/debugger/trepan2/init.el > @@ -9,7 +9,7 @@ > > ;; trepan2: Python 2.5 - 2.7; for 3.0+ see trepan3k > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/trepan2/track-mode.el > b/packages/realgud/realgud/debugger/trepan2/track-mode.el > index d2eb6ed..d10bde5 100644 > --- a/packages/realgud/realgud/debugger/trepan2/track-mode.el > +++ b/packages/realgud/realgud/debugger/trepan2/track-mode.el > @@ -17,7 +17,6 @@ > ;; > ;; Python "trepan2" Debugger tracking in a comint or eshell buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/trepan3k/core.el > b/packages/realgud/realgud/debugger/trepan3k/core.el > index 39a6d13..6806a00 100644 > --- a/packages/realgud/realgud/debugger/trepan3k/core.el > +++ b/packages/realgud/realgud/debugger/trepan3k/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2010, 2012-2015 Free Software Foundation, Inc > +;; Copyright (C) 2010, 2012-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -15,8 +15,6 @@ > ;; You should have received a copy of the GNU General Public License > ;; along with this program. If not, see . > ;; > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../../common/track" > "../../common/core" > diff --git a/packages/realgud/realgud/debugger/trepan3k/init.el > b/packages/realgud/realgud/debugger/trepan3k/init.el > index 5f22174..ef2dfbd 100644 > --- a/packages/realgud/realgud/debugger/trepan3k/init.el > +++ b/packages/realgud/realgud/debugger/trepan3k/init.el > @@ -17,7 +17,7 @@ > > ;; trepan3k: Python 3.2 and beyond > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/trepan3k/track-mode.el > b/packages/realgud/realgud/debugger/trepan3k/track-mode.el > index afb94f1..d7473cd 100644 > --- a/packages/realgud/realgud/debugger/trepan3k/track-mode.el > +++ b/packages/realgud/realgud/debugger/trepan3k/track-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -16,7 +16,6 @@ > ;; along with this program. If not, see . > ;; Python "trepan3k" Debugger tracking a comint buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/trepanjs/backtrack-mode.el > b/packages/realgud/realgud/debugger/trepanjs/backtrack-mode.el > index e3b7e6c..0732dc5 100644 > --- a/packages/realgud/realgud/debugger/trepanjs/backtrack-mode.el > +++ b/packages/realgud/realgud/debugger/trepanjs/backtrack-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -17,7 +17,6 @@ > > ;;; Mode for parsing various kinds of backtraces found in JavaScript > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/trepanjs/core.el > b/packages/realgud/realgud/debugger/trepanjs/core.el > index eac8a0e..b3256c1 100644 > --- a/packages/realgud/realgud/debugger/trepanjs/core.el > +++ b/packages/realgud/realgud/debugger/trepanjs/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -15,8 +15,6 @@ > ;; You should have received a copy of the GNU General Public License > ;; along with this program. If not, see . > > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../../common/track" > "../../common/core" > diff --git a/packages/realgud/realgud/debugger/trepanjs/init.el > b/packages/realgud/realgud/debugger/trepanjs/init.el > index 5281946..8470fe2 100644 > --- a/packages/realgud/realgud/debugger/trepanjs/init.el > +++ b/packages/realgud/realgud/debugger/trepanjs/init.el > @@ -16,7 +16,7 @@ > ;; along with this program. If not, see . > ;;; Regular expressions for nodejs Javascript debugger. > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/trepanjs/track-mode.el > b/packages/realgud/realgud/debugger/trepanjs/track-mode.el > index 4c02965..5d8c8cd 100644 > --- a/packages/realgud/realgud/debugger/trepanjs/track-mode.el > +++ b/packages/realgud/realgud/debugger/trepanjs/track-mode.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -17,7 +17,6 @@ > > ;;; "trepanjs" Debugger tracking a comint or eshell buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/debugger/zshdb/core.el > b/packages/realgud/realgud/debugger/zshdb/core.el > index 20a7cbe..2eefad1 100644 > --- a/packages/realgud/realgud/debugger/zshdb/core.el > +++ b/packages/realgud/realgud/debugger/zshdb/core.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2010-2011, 2014-2015 Free Software Foundation, Inc > +;; Copyright (C) 2010-2011, 2014-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -7,8 +7,6 @@ > ;; the Free Software Foundation, either version 3 of the License, or > ;; (at your option) any later version. > > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../../common/track" "../../common/core") > "realgud-") > diff --git a/packages/realgud/realgud/debugger/zshdb/init.el > b/packages/realgud/realgud/debugger/zshdb/init.el > index 8c0a88e..8a2c0a9 100644 > --- a/packages/realgud/realgud/debugger/zshdb/init.el > +++ b/packages/realgud/realgud/debugger/zshdb/init.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015, 2016 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -15,7 +15,7 @@ > ;; You should have received a copy of the GNU General Public License > ;; along with this program. If not, see . > > -(eval-when-compile (require 'cl)) > +(eval-when-compile (require 'cl-lib)) ;For setf. > > (require 'load-relative) > (require-relative-list '("../../common/regexp" > diff --git a/packages/realgud/realgud/debugger/zshdb/track-mode.el > b/packages/realgud/realgud/debugger/zshdb/track-mode.el > index 31f65dc..ecf0b12 100644 > --- a/packages/realgud/realgud/debugger/zshdb/track-mode.el > +++ b/packages/realgud/realgud/debugger/zshdb/track-mode.el > @@ -9,7 +9,6 @@ > > ;;; "zshdb" Debugger tracking a comint buffer. > > -(eval-when-compile (require 'cl)) > (require 'load-relative) > (require-relative-list '( > "../../common/cmds" > diff --git a/packages/realgud/realgud/lang/js.el > b/packages/realgud/realgud/lang/js.el > index faaf716..ede33ef 100644 > --- a/packages/realgud/realgud/lang/js.el > +++ b/packages/realgud/realgud/lang/js.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -15,8 +15,6 @@ > ;; You should have received a copy of the GNU General Public License > ;; along with this program. If not, see . > > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../common/regexp" "../common/loc" > "../common/track") > "realgud-") > diff --git a/packages/realgud/realgud/lang/perl.el > b/packages/realgud/realgud/lang/perl.el > index ebe6b94..cad3374 100644 > --- a/packages/realgud/realgud/lang/perl.el > +++ b/packages/realgud/realgud/lang/perl.el > @@ -8,8 +8,6 @@ > ;; (at your option) any later version. > > ;;; Common Perl constants and regular expressions. > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../common/regexp" "../common/loc" > "../common/track") > "realgud-") > diff --git a/packages/realgud/realgud/lang/posix-shell.el > b/packages/realgud/realgud/lang/posix-shell.el > index 4f006d2..1ef2313 100644 > --- a/packages/realgud/realgud/lang/posix-shell.el > +++ b/packages/realgud/realgud/lang/posix-shell.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2015, 2016 Free Software Foundation, Inc > +;; Copyright (C) 2015-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -22,8 +22,6 @@ > ;; *only* debuggers I know of for POSIX shells, it's not too much of > ;; a stretch to think of this as for all "shell". > > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../common/regexp" "../common/loc" > "../common/track" "../common/send") > diff --git a/packages/realgud/realgud/lang/python.el > b/packages/realgud/realgud/lang/python.el > index 1ddea17..a2e8b54 100644 > --- a/packages/realgud/realgud/lang/python.el > +++ b/packages/realgud/realgud/lang/python.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2011, 2014, 2015 Free Software Foundation, Inc > +;; Copyright (C) 2011, 2014-2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -16,8 +16,6 @@ > ;; along with this program. If not, see . > > ;;; Common Python constants and regular expressions. > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../common/regexp" "../common/loc" > "../common/track") > "realgud-") > diff --git a/packages/realgud/realgud/lang/ruby.el > b/packages/realgud/realgud/lang/ruby.el > index a0e38d7..9e4699e 100644 > --- a/packages/realgud/realgud/lang/ruby.el > +++ b/packages/realgud/realgud/lang/ruby.el > @@ -1,4 +1,4 @@ > -;; Copyright (C) 2010, 2014 Free Software Foundation, Inc > +;; Copyright (C) 2010, 2014, 2016 Free Software Foundation, Inc > > ;; Author: Rocky Bernstein > > @@ -8,8 +8,6 @@ > ;; (at your option) any later version. > > ;; Common Ruby constants and regular expressions. > -(eval-when-compile (require 'cl)) > - > (require 'load-relative) > (require-relative-list '("../common/regexp" "../common/loc" > "../common/track") > "realgud-") > diff --git a/packages/realgud/test/test-common-helper.el > b/packages/realgud/test/test-common-helper.el > index 815fde2..396edc6 100644 > --- a/packages/realgud/test/test-common-helper.el > +++ b/packages/realgud/test/test-common-helper.el > @@ -1,3 +1,4 @@ > +(eval-when-compile (require 'cl-lib)) > (require 'test-simple) > (load-file "../realgud/common/helper.el") > > @@ -12,7 +13,7 @@ > (defvar realgud-test-info) > ) > > -(defstruct realgud-test-info name) > +(cl-defstruct realgud-test-info name) > (realgud-struct-field-setter "realgud-test-info" "name") > > (set (make-local-variable 'realgud-test-info) > diff --git a/packages/realgud/test/test-core.el > b/packages/realgud/test/test-core.el > index 51ddaa7..d3e6ca2 100644 > --- a/packages/realgud/test/test-core.el > +++ b/packages/realgud/test/test-core.el > @@ -1,3 +1,5 @@ > +;; -*- lexical-binding:t -*- > + > ;; Press C-x C-e at the end of the next line to run this file test > non-interactively > ;; (test-simple-run "emacs -batch -L %s -l %s" (file-name-directory > (locate-library "test-simple.elc")) buffer-file-name) > > @@ -33,7 +35,7 @@ > > (note "realgud-parse-...") > > -(lexical-let ((opt-two-args '("0" "C" "e" "E" "F" "i"))) > +(let ((opt-two-args '("0" "C" "e" "E" "F" "i"))) > (assert-equal '(("-0" "a") nil) > (realgud-parse-command-arg '("-0" "a") '() opt-two-args) > "Two args found, none remain afterwards though.") > diff --git a/packages/realgud/test/test-regexp-rdebug.el > b/packages/realgud/test/test-regexp-rdebug.el > index 26477b7..2c37d41 100644 > --- a/packages/realgud/test/test-regexp-rdebug.el > +++ b/packages/realgud/test/test-regexp-rdebug.el > @@ -1,3 +1,5 @@ > +;; -*- lexical-binding:t -*- > + > ;; Press C-x C-e at the end of the next line to run this file test > non-interactively > ;; (test-simple-run "emacs -batch -L %s -l %s" (file-name-directory > (locate-library "test-simple.elc")) buffer-file-name) > > @@ -15,7 +17,7 @@ > ;; setq however will workaround this. > (setq text " from /usr/local/bin/irb:12:in `
'") > (note "traceback location matching") > -(lexical-let ((text " from /usr/local/bin/irb:12:in `
'")) > +(let ((text " from /usr/local/bin/irb:12:in `
'")) > (assert-t (numberp (loc-match text helper-tb)) "basic traceback > location") > (assert-equal "/usr/local/bin/irb" > (match-string (realgud-loc-pat-file-group helper-tb) > @@ -26,7 +28,7 @@ > text) "extract traceback line number") > ) > > -(lexical-let ((text "Breakpoint 1 file /usr/bin/irb, line 10\n")) > +(let ((text "Breakpoint 1 file /usr/bin/irb, line 10\n")) > (assert-t (numberp (loc-match text helper-bps)) "basic breakpoint > location") > (assert-equal "/usr/bin/irb" > (match-string (realgud-loc-pat-file-group helper-bps) > diff --git a/packages/realgud/test/test-regexp-ruby.el > b/packages/realgud/test/test-regexp-ruby.el > index d15ab9c..a2392b1 100644 > --- a/packages/realgud/test/test-regexp-ruby.el > +++ b/packages/realgud/test/test-regexp-ruby.el > @@ -1,3 +1,5 @@ > +;; -*- lexical-binding:t -*- > + > ;; Press C-x C-e at the end of the next line to run this file test > non-interactively > ;; (test-simple-run "emacs -batch -L %s -l %s" (file-name-directory > (locate-library "test-simple.elc")) buffer-file-name) > > @@ -15,7 +17,7 @@ > ;; setq however will workaround this. > (setq text "/tmp/rails-2.3.5/lib/tasks/databases.rake:360") > > -(lexical-let ((text "/tmp/rails-2.3.5/lib/tasks/databases.rake:360")) > +(let ((text "/tmp/rails-2.3.5/lib/tasks/databases.rake:360")) > > (assert-t (numberp (loc-match text bt)) "basic traceback location") > (assert-equal "/tmp/rails-2.3.5/lib/tasks/databases.rake" > diff --git a/packages/realgud/test/test-regexp.el > b/packages/realgud/test/test-regexp.el > index da9a81a..0cdde95 100644 > --- a/packages/realgud/test/test-regexp.el > +++ b/packages/realgud/test/test-regexp.el > @@ -1,3 +1,5 @@ > +;; -*- lexical-binding:t -*- > + > ;; Press C-x C-e at the end of the next line to run this file test > non-interactively > ;; (test-simple-run "emacs -batch -L %s -l %s" (file-name-directory > (locate-library "test-simple.elc")) buffer-file-name) > > @@ -39,7 +41,7 @@ > :line-group (realgud-loc-pat-line-group loc-pat))) > > > -(lexical-let ((text ".. (./dbgr.rb:73)") > +(let ((text ".. (./dbgr.rb:73)") > (text2 "C> ((eval):1 via /tmp/eval2.rb:2)") > (text3 "-- (:28 remapped prelude.rb:28)") > (text4 "-- > (/src/external-vcs/dbgrr/processor/command/info_subcmd/registers_subcmd/dfp.rb:2)\nrequire_relative > %w(.. .. base subsubcmd)\n") > diff --git a/packages/realgud/test/test-track.el > b/packages/realgud/test/test-track.el > index d0bb147..5e98fec 100644 > --- a/packages/realgud/test/test-track.el > +++ b/packages/realgud/test/test-track.el > @@ -1,3 +1,5 @@ > +;; -*- lexical-binding:t -*- > + > ;; Press C-x C-e at the end of the next line to run this file test > non-interactively > ;; (test-simple-run "emacs -batch -L %s -l %s" (file-name-directory > (locate-library "test-simple.elc")) buffer-file-name) > > @@ -41,7 +43,7 @@ > (setq line-number 7) > (setq debugger-output (format "-> (%s:%d)\nrequire 'foo'\n(trepan):\n" > test-filename line-number)) > -(lexical-let ((loc (realgud-track-loc debugger-output nil))) > +(let ((loc (realgud-track-loc debugger-output nil))) > (assert-t (realgud-loc-p loc) "loc extracted") > (assert-equal "(trepan):\n" > (realgud-track-loc-remaining debugger-output) > --001a113d3bd4a815e405394627e4 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

Yes please. I will test and amend if needed.


On Thu, Aug 4, 2016, 6:03 P= M Stefan Monnier <monnier@ir= o.umontreal.ca> wrote:
>&= gt; Do you want me to update the code to use `cl-lib' exclusively?
> Yes, please.=C2=A0 You know more about this than I. See also:

The (untested) patch below should do it.=C2=A0 Do you want me to push it to=
elpa.git?


=C2=A0 =C2=A0 =C2=A0 =C2=A0 Stefan


diff --git a/packages/realgud/ChangeLog b/packages/realgud/ChangeLog
index bc3f48c..d0bb58b 100644
--- a/packages/realgud/ChangeLog
+++ b/packages/realgud/ChangeLog
@@ -1,3 +1,26 @@
+2016-08-04=C2=A0 Stefan Monnier=C2=A0 <monnier@iro.umontreal.ca>
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0* realgud.el: Add missing cl-lib dependency. +=C2=A0 =C2=A0 =C2=A0 =C2=A0* <most-other-files>: Remove unneeded (re= quire 'cl) and replace the
+=C2=A0 =C2=A0 =C2=A0 =C2=A0other ones with (require 'cl-lib)
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0* test/test-common-helper.el (realgud-test-info= ):
+=C2=A0 =C2=A0 =C2=A0 =C2=A0* realgud/common/regexp.el (realgud-loc-pat): +=C2=A0 =C2=A0 =C2=A0 =C2=A0* realgud/common/lochist.el (realgud-loc-hist):=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0* realgud/common/buffer/info.el (realgud-backtr= ace-info):
+=C2=A0 =C2=A0 =C2=A0 =C2=A0* realgud/common/loc.el (realgud-loc): Use `cl-= defstruct'.
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0* realgud/common/run.el (realgud:run-process, r= ealgud:run-debugger):
+=C2=A0 =C2=A0 =C2=A0 =C2=A0Use cl-remove-if and cl-remove-duplicates.
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0* realgud/common/track.el (realgud-track-bp-loc= ): Fix typo.
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0* test/test-track.el:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0* test/test-regexp.el:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0* test/test-regexp-ruby.el:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0* test/test-regexp-rdebug.el:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0* test/test-core.el: Use lexical-binding rather= than lexical-let.
+
=C2=A02010-11-27=C2=A0 rocky <rocky@gnu.org>

=C2=A0 =C2=A0 =C2=A0 =C2=A0 * dbgr/debugger/trepan/init.el, dbgr/lang/ruby.= el,
diff --git a/packages/realgud/realgud.el b/packages/realgud/realgud.el
index b16cc48..026dbb4 100644
--- a/packages/realgud/realgud.el
+++ b/packages/realgud/realgud.el
@@ -3,11 +3,10 @@
=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>
=C2=A0;; Version: 1.4.3
=C2=A0;; Package-Type: multi
-;; Package-Requires: ((load-relative "1.2") (loc-changes "1= .2") (test-simple=C2=A0 "1.2.0"))
+;; Package-Requires: ((load-relative "1.2") (loc-changes "1= .2") (test-simple=C2=A0 "1.2.0") (cl-lib "0.5") (e= macs "24"))
=C2=A0;; URL: http://github.com/realgud/realgud/
-;; Compatibility: GNU Emacs 24.x

-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; This program is free software; you can redistribute it and/or modi= fy
=C2=A0;; it under the terms of the GNU General Public License as published = by
diff --git a/packages/realgud/realgud/common/attach.el b/packages/realgud/r= ealgud/common/attach.el
index f0efbff..aefd62f 100644
--- a/packages/realgud/realgud/common/attach.el
+++ b/packages/realgud/realgud/common/attach.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -17,7 +17,6 @@
=C2=A0;;; Emacs Commands to associate or attach a source buffer to a comman= d
=C2=A0;;; buffer and vice versa.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list=C2=A0 '("buffer/command" "b= uffer/source")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 "realgud-buffer-")
diff --git a/packages/realgud/realgud/common/backtrack-mode.el b/packages/r= ealgud/realgud/common/backtrack-mode.el
index aaf89c9..a4bbfc5 100644
--- a/packages/realgud/realgud/common/backtrack-mode.el
+++ b/packages/realgud/realgud/common/backtrack-mode.el
@@ -20,7 +20,6 @@
=C2=A0;;=C2=A0 process shell arround Compare with backtrace-mode.el which =C2=A0;;=C2=A0 handles backtraces inside the debugger

-(eval-when-compile (require 'cl))
=C2=A0(require 'shell)

=C2=A0(require 'load-relative)
diff --git a/packages/realgud/realgud/common/buffer/info.el b/packages/real= gud/realgud/common/buffer/info.el
index 571b614..246f302 100644
--- a/packages/realgud/realgud/common/buffer/info.el
+++ b/packages/realgud/realgud/common/buffer/info.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; This program is free software; you can redistribute it and/or modi= fy
=C2=A0;; it under the terms of the GNU General Public License as published = by
@@ -16,12 +16,12 @@

=C2=A0;;; A mode based off of org mode to show debugger information

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
=C2=A0(require 'org)

=C2=A0(require 'load-relative)

-(defstruct realgud-backtrace-info
+(cl-defstruct realgud-backtrace-info
=C2=A0 =C2=A0"debugger object/structure specific to debugger info.&quo= t;
=C2=A0 =C2=A0(cmdbuf=C2=A0 =C2=A0 nil)=C2=A0 ;; buffer of the associated de= bugger process
=C2=A0)
diff --git a/packages/realgud/realgud/common/cmds.el b/packages/realgud/rea= lgud/common/cmds.el
index 4b2f3eb..8f02555 100644
--- a/packages/realgud/realgud/common/cmds.el
+++ b/packages/realgud/realgud/common/cmds.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

diff --git a/packages/realgud/realgud/common/fringe.el b/packages/realgud/r= ealgud/common/fringe.el
index 745d85b..c50153b 100644
--- a/packages/realgud/realgud/common/fringe.el
+++ b/packages/realgud/realgud/common/fringe.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010, 2012, 2014-2015 Free Software Foundation, Inc
+;; Copyright (C) 2010, 2012, 2014-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -86,9 +86,6 @@ position.")
=C2=A0 =C2=A0"Overlay arrow variable which contains the 3rd most recen= t debugger
=C2=A0position.")

-(eval-when-compile (require 'cl))
-
-
=C2=A0;; FIXME: since overlay overlay-arrow-list can be global, and perhaps=
=C2=A0;; has to stay that way since some Emacs code may expect that, we
=C2=A0;; should use different global overlay arrow variables for the
diff --git a/packages/realgud/realgud/common/helper.el b/packages/realgud/r= ealgud/common/helper.el
index 705100d..7467b2b 100644
--- a/packages/realgud/realgud/common/helper.el
+++ b/packages/realgud/realgud/common/helper.el
@@ -12,8 +12,7 @@
=C2=A0;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.=C2=A0 See the=
=C2=A0;; GNU General Public License for more details.

-(require 'cl-lib)
-(require 'cl)
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0;;; Miscellaneous utility functions
=C2=A0(require 'load-relative)
diff --git a/packages/realgud/realgud/common/loc.el b/packages/realgud/real= gud/common/loc.el
index 00c75a0..76584c0 100644
--- a/packages/realgud/realgud/common/loc.el
+++ b/packages/realgud/realgud/common/loc.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -18,6 +18,8 @@
=C2=A0;; This describes a debugger location structure and has code for
=C2=A0;; working with them.

+(eval-when-compile (require 'cl-lib))
+
=C2=A0(require 'load-relative)
=C2=A0(require 'loc-changes)
=C2=A0(require-relative-list '("fringe" "follow") &= quot;realgud-")
@@ -30,7 +32,7 @@
=C2=A0(declare-function realgud-get-cmdbuf-from-srcbuf 'realgud-buffer-= helper)
=C2=A0(declare-function realgud-srcbuf?=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 'realgud-buffer-source)

-(defstruct realgud-loc
+(cl-defstruct realgud-loc
=C2=A0"Our own location type. Even though a mark contains a
=C2=A0file-name (via a buffer) and a line number (via an offset), we
=C2=A0want to save the values that were seen/requested originally." diff --git a/packages/realgud/realgud/common/lochist.el b/packages/realgud/= realgud/common/lochist.el
index 33fcf49..786e8e3 100644
--- a/packages/realgud/realgud/common/lochist.el
+++ b/packages/realgud/realgud/common/lochist.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010, 2012, 2014-2015 Free Software Foundation, Inc
+;; Copyright (C) 2010, 2012, 2014-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -20,6 +20,7 @@

=C2=A0;;; Code:

+(eval-when-compile (require 'cl-lib))
=C2=A0(require 'ring)
=C2=A0(require 'org)
=C2=A0(require 'load-relative)
@@ -32,7 +33,7 @@
=C2=A0 =C2=A0:type 'integer
=C2=A0 =C2=A0:group 'realgud)

-(defstruct realgud-loc-hist
+(cl-defstruct realgud-loc-hist
=C2=A0 =C2=A0"A list of source-code positions recently encountered&quo= t;
=C2=A0 =C2=A0(position -1)
=C2=A0 =C2=A0(ring (make-ring realgud-loc-hist-size)))
diff --git a/packages/realgud/realgud/common/regexp.el b/packages/realgud/r= ealgud/common/regexp.el
index 127d7c2..e21de25 100644
--- a/packages/realgud/realgud/common/regexp.el
+++ b/packages/realgud/realgud/common/regexp.el
@@ -27,9 +27,9 @@
=C2=A0;; Variables defining regular expressions (regexp:s).
=C2=A0;;

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))

-(defstruct realgud-loc-pat
+(cl-defstruct realgud-loc-pat
=C2=A0 =C2=A0"Information to match and extract position and other rela= ted information typically
=C2=A0output by a debugger inside a process shell"
=C2=A0 =C2=A0(num)=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ;= ; General number. Could be for example
diff --git a/packages/realgud/realgud/common/run.el b/packages/realgud/real= gud/common/run.el
index a24e123..f78bd35 100644
--- a/packages/realgud/realgud/common/run.el
+++ b/packages/realgud/realgud/common/run.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -17,7 +17,7 @@

=C2=A0; (require 'term)

-(require 'cl)
+(require 'cl-lib)
=C2=A0(require 'shell)
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("core" "track" "= ;utils") "realgud-")
@@ -152,7 +152,7 @@ marginal icons is reset."
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (if (boundp = 'starting-directory)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 (realgud-cmdbuf-info-starting-directory=3D starting-directory))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (set minibuf= fer-history
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 (remove-duplicates
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 (cl-remove-duplicates
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 (cons cmd-str (eval minibuffer-history)) :from-end)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 )))
@@ -191,7 +191,7 @@ Otherwise nil is returned.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(script-args (caddr parsed-args))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(script-name (or opt-script-name (car scr= ipt-args)))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(parsed-cmd-args
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(remove-if 'nil (realgud:flatten par= sed-args)))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(cl-remove-if 'nil (realgud:flatten = parsed-args)))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0)
=C2=A0 =C2=A0 =C2=A0(realgud:run-process debugger-name script-name parsed-c= md-args
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0minibuffer-history no-reset)
diff --git a/packages/realgud/realgud/common/send.el b/packages/realgud/rea= lgud/common/send.el
index b8b1f7e..81edf16 100644
--- a/packages/realgud/realgud/common/send.el
+++ b/packages/realgud/realgud/common/send.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

diff --git a/packages/realgud/realgud/common/track-mode.el b/packages/realg= ud/realgud/common/track-mode.el
index bf0888b..4f58428 100644
--- a/packages/realgud/realgud/common/track-mode.el
+++ b/packages/realgud/realgud/common/track-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -16,7 +16,6 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;; tracks shell output

-(eval-when-compile (require 'cl))
=C2=A0(require 'shell)

=C2=A0(require 'load-relative)
diff --git a/packages/realgud/realgud/common/track.el b/packages/realgud/re= algud/common/track.el
index 36f8e98..badb83f 100644
--- a/packages/realgud/realgud/common/track.el
+++ b/packages/realgud/realgud/common/track.el
@@ -481,7 +481,7 @@ Otherwise return nil. CMD-MARK is set in the realgud-lo= c object created.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 (message "line number not found -- using 1&qu= ot;))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 (if (and filename lineno)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (let* ((directory
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(cond ((boundp &= #39;starting-directory) staring-directory)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(cond ((boundp &= #39;starting-directory) starting-directory)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 (t nil)))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(loc-or-error =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(realgud:file-lo= c-from-line
diff --git a/packages/realgud/realgud/debugger/bashdb/core.el b/packages/re= algud/realgud/debugger/bashdb/core.el
index 899eec0..87c371c 100644
--- a/packages/realgud/realgud/debugger/bashdb/core.el
+++ b/packages/realgud/realgud/debugger/bashdb/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -14,7 +14,6 @@

=C2=A0;; You should have received a copy of the GNU General Public License<= br> =C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
-(eval-when-compile (require 'cl))

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track" "../= ../common/core")
diff --git a/packages/realgud/realgud/debugger/bashdb/init.el b/packages/re= algud/realgud/debugger/bashdb/init.el
index 2e3f8a3..2c7769f 100644
--- a/packages/realgud/realgud/debugger/bashdb/init.el
+++ b/packages/realgud/realgud/debugger/bashdb/init.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -17,8 +17,7 @@

=C2=A0;; Regular expressions for Bash shell debugger: bashdb

-(eval-when-compile (require 'cl))
-
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/loc"
diff --git a/packages/realgud/realgud/debugger/bashdb/track-mode.el b/packa= ges/realgud/realgud/debugger/bashdb/track-mode.el
index 0e3dfef..d01d6c7 100644
--- a/packages/realgud/realgud/debugger/bashdb/track-mode.el
+++ b/packages/realgud/realgud/debugger/bashdb/track-mode.el
@@ -16,7 +16,6 @@

=C2=A0;; Bash Debugger tracking in a comint or eshell buffer.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/gdb/core.el b/packages/realg= ud/realgud/debugger/gdb/core.el
index 5a36a23..35fc492 100644
--- a/packages/realgud/realgud/debugger/gdb/core.el
+++ b/packages/realgud/realgud/debugger/gdb/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -15,9 +15,6 @@
=C2=A0;; You should have received a copy of the GNU General Public License<= br> =C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.

-(eval-when-compile (require 'cl))
-
-(require 'files)
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/core"
diff --git a/packages/realgud/realgud/debugger/gdb/gdb.el b/packages/realgu= d/realgud/debugger/gdb/gdb.el
index 91776a0..4c2853f 100644
--- a/packages/realgud/realgud/debugger/gdb/gdb.el
+++ b/packages/realgud/realgud/debugger/gdb/gdb.el
@@ -16,7 +16,6 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.

=C2=A0;;=C2=A0 `realgud:gdb' Main interface to gdb via Emacs
-(require 'cl)
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/helper" "..= /../common/utils")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0"realgud-")
diff --git a/packages/realgud/realgud/debugger/gdb/init.el b/packages/realg= ud/realgud/debugger/gdb/init.el
index 8b7ac86..92bb5d6 100644
--- a/packages/realgud/realgud/debugger/gdb/init.el
+++ b/packages/realgud/realgud/debugger/gdb/init.el
@@ -17,7 +17,7 @@

=C2=A0;;; gdb debugger

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp" "..= /../common/loc") "realgud-")
diff --git a/packages/realgud/realgud/debugger/gdb/track-mode.el b/packages= /realgud/realgud/debugger/gdb/track-mode.el
index d56e4b2..9497657 100644
--- a/packages/realgud/realgud/debugger/gdb/track-mode.el
+++ b/packages/realgud/realgud/debugger/gdb/track-mode.el
@@ -19,7 +19,6 @@

=C2=A0;; gdb tracking a comint or eshell buffer.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/gub/core.el b/packages/realg= ud/realgud/debugger/gub/core.el
index 12dc8ff..d6d13da 100644
--- a/packages/realgud/realgud/debugger/gub/core.el
+++ b/packages/realgud/realgud/debugger/gub/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2013-2014 Free Software Foundation, Inc
+;; Copyright (C) 2013-2014, 2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -7,8 +7,6 @@
=C2=A0;; the Free Software Foundation, either version 3 of the License, or<= br> =C2=A0;; (at your option) any later version.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track" "../= ../common/lang"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/core") "realgud-")
diff --git a/packages/realgud/realgud/debugger/gub/init.el b/packages/realg= ud/realgud/debugger/gub/init.el
index 01f71a3..f244267 100644
--- a/packages/realgud/realgud/debugger/gub/init.el
+++ b/packages/realgud/realgud/debugger/gub/init.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc
=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

=C2=A0;; This program is free software: you can redistribute it and/or
@@ -17,7 +17,7 @@

=C2=A0;; Regular expressions for Go SSA debugger: gub

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/gub/track-mode.el b/packages= /realgud/realgud/debugger/gub/track-mode.el
index 3f74cbc..b48bb0c 100644
--- a/packages/realgud/realgud/debugger/gub/track-mode.el
+++ b/packages/realgud/realgud/debugger/gub/track-mode.el
@@ -9,7 +9,6 @@

=C2=A0;;; Golang SSA gub tracking a comint buffer.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/ipdb/core.el b/packages/real= gud/realgud/debugger/ipdb/core.el
index 789920b..8d64e6a 100644
--- a/packages/realgud/realgud/debugger/ipdb/core.el
+++ b/packages/realgud/realgud/debugger/ipdb/core.el
@@ -11,8 +11,6 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.or= /licenses/>.


-(eval-when-compile (require 'cl))
-
=C2=A0(require 'comint)
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track"
diff --git a/packages/realgud/realgud/debugger/ipdb/init.el b/packages/real= gud/realgud/debugger/ipdb/init.el
index 07ae8ad..b1cd04f 100644
--- a/packages/realgud/realgud/debugger/ipdb/init.el
+++ b/packages/realgud/realgud/debugger/ipdb/init.el
@@ -17,7 +17,7 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;; Stock Python debugger ipdb

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/ipdb/track-mode.el b/package= s/realgud/realgud/debugger/ipdb/track-mode.el
index 17133b3..b723a07 100644
--- a/packages/realgud/realgud/debugger/ipdb/track-mode.el
+++ b/packages/realgud/realgud/debugger/ipdb/track-mode.el
@@ -17,7 +17,6 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;; Python "ipdb" Debugger tracking a comint buffer.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 "../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/jdb/backtrack-mode.el b/pack= ages/realgud/realgud/debugger/jdb/backtrack-mode.el
index 179ac63..1454edc 100644
--- a/packages/realgud/realgud/debugger/jdb/backtrack-mode.el
+++ b/packages/realgud/realgud/debugger/jdb/backtrack-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -16,7 +16,6 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;; Mode for parsing various kinds of backtraces found in Java

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/jdb/core.el b/packages/realg= ud/realgud/debugger/jdb/core.el
index f4c35d2..9199c23 100644
--- a/packages/realgud/realgud/debugger/jdb/core.el
+++ b/packages/realgud/realgud/debugger/jdb/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2014 Free Software Foundation, Inc
+;; Copyright (C) 2014, 2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -7,8 +7,6 @@
=C2=A0;; the Free Software Foundation, either version 3 of the License, or<= br> =C2=A0;; (at your option) any later version.

-(eval-when-compile (require 'cl))
-
=C2=A0;; We use gud to handle the classpath-to-filename mapping
=C2=A0(require 'gud)
=C2=A0(require 'compile) ;; for compilation-find-file
diff --git a/packages/realgud/realgud/debugger/jdb/init.el b/packages/realg= ud/realgud/debugger/jdb/init.el
index 13548e0..82bfe4a 100644
--- a/packages/realgud/realgud/debugger/jdb/init.el
+++ b/packages/realgud/realgud/debugger/jdb/init.el
@@ -7,7 +7,7 @@
=C2=A0;; the Free Software Foundation, either version 3 of the License, or<= br> =C2=A0;; (at your option) any later version.

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/jdb/jdb.el b/packages/realgu= d/realgud/debugger/jdb/jdb.el
index bb6d41c..62afcea 100644
--- a/packages/realgud/realgud/debugger/jdb/jdb.el
+++ b/packages/realgud/realgud/debugger/jdb/jdb.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2014-2015 Free Software Foundation, Inc
+;; Copyright (C) 2014-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -10,7 +10,6 @@
=C2=A0;;=C2=A0 `jdb' Main interface to jdb via Emacs

=C2=A0(require 'gud) ;; For class-path and source-path handling
-(require 'cl)

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/run") "real= gud:")
diff --git a/packages/realgud/realgud/debugger/jdb/track-mode.el b/packages= /realgud/realgud/debugger/jdb/track-mode.el
index 208b6cf..e35a134 100644
--- a/packages/realgud/realgud/debugger/jdb/track-mode.el
+++ b/packages/realgud/realgud/debugger/jdb/track-mode.el
@@ -9,7 +9,6 @@

=C2=A0;; Java "jdb" Debugger tracking a comint or eshell buffer.<= br>
-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/kshdb/core.el b/packages/rea= lgud/realgud/debugger/kshdb/core.el
index 5571583..afcb119 100644
--- a/packages/realgud/realgud/debugger/kshdb/core.el
+++ b/packages/realgud/realgud/debugger/kshdb/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010, 2014-2015 Free Software Foundation, Inc
+;; Copyright (C) 2010, 2014-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -7,8 +7,6 @@
=C2=A0;; the Free Software Foundation, either version 3 of the License, or<= br> =C2=A0;; (at your option) any later version.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track" "../= ../common/core") "realgud-")
=C2=A0(require-relative-list '("init") "realgud:kshdb-&q= uot;)
diff --git a/packages/realgud/realgud/debugger/kshdb/init.el b/packages/rea= lgud/realgud/debugger/kshdb/init.el
index 44fcdb8..e6f6f74 100644
--- a/packages/realgud/realgud/debugger/kshdb/init.el
+++ b/packages/realgud/realgud/debugger/kshdb/init.el
@@ -9,7 +9,7 @@

=C2=A0;;Regular expressions for Korn shell debugger: kshdb

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/kshdb/track-mode.el b/packag= es/realgud/realgud/debugger/kshdb/track-mode.el
index ea62baf..a80da63 100644
--- a/packages/realgud/realgud/debugger/kshdb/track-mode.el
+++ b/packages/realgud/realgud/debugger/kshdb/track-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -16,7 +16,6 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;;; "kshdb" Debugger tracking a comint or eshell buffer.
-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/nodejs/core.el b/packages/re= algud/realgud/debugger/nodejs/core.el
index 1ff8b71..065ac37 100644
--- a/packages/realgud/realgud/debugger/nodejs/core.el
+++ b/packages/realgud/realgud/debugger/nodejs/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -15,8 +15,6 @@
=C2=A0;; You should have received a copy of the GNU General Public License<= br> =C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track" "../= ../common/core")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0"realgud-")
diff --git a/packages/realgud/realgud/debugger/nodejs/init.el b/packages/re= algud/realgud/debugger/nodejs/init.el
index e20211e..70634af 100644
--- a/packages/realgud/realgud/debugger/nodejs/init.el
+++ b/packages/realgud/realgud/debugger/nodejs/init.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -16,7 +16,7 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;;; Regular expressions for nodejs Javascript debugger.

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/nodejs/track-mode.el b/packa= ges/realgud/realgud/debugger/nodejs/track-mode.el
index 753e20d..6afaa62 100644
--- a/packages/realgud/realgud/debugger/nodejs/track-mode.el
+++ b/packages/realgud/realgud/debugger/nodejs/track-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -16,7 +16,6 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;;; nodejs tracking a comint buffer.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/pdb/core.el b/packages/realg= ud/realgud/debugger/pdb/core.el
index 8964cf6..16c5dbd 100644
--- a/packages/realgud/realgud/debugger/pdb/core.el
+++ b/packages/realgud/realgud/debugger/pdb/core.el
@@ -7,8 +7,6 @@
=C2=A0;; the Free Software Foundation, either version 3 of the License, or<= br> =C2=A0;; (at your option) any later version.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/core"
diff --git a/packages/realgud/realgud/debugger/pdb/init.el b/packages/realg= ud/realgud/debugger/pdb/init.el
index ac346b8..7068758 100644
--- a/packages/realgud/realgud/debugger/pdb/init.el
+++ b/packages/realgud/realgud/debugger/pdb/init.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -16,7 +16,7 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;; Stock Python debugger pdb

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/pdb/pdb.el b/packages/realgu= d/realgud/debugger/pdb/pdb.el
index 1946478..8ddd380 100644
--- a/packages/realgud/realgud/debugger/pdb/pdb.el
+++ b/packages/realgud/realgud/debugger/pdb/pdb.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

diff --git a/packages/realgud/realgud/debugger/pdb/track-mode.el b/packages= /realgud/realgud/debugger/pdb/track-mode.el
index 7958eae..b18172f 100644
--- a/packages/realgud/realgud/debugger/pdb/track-mode.el
+++ b/packages/realgud/realgud/debugger/pdb/track-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -16,7 +16,6 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;; Python "pdb" Debugger tracking a comint buffer.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 "../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/perldb/core.el b/packages/re= algud/realgud/debugger/perldb/core.el
index 2df3533..04f6f0c 100644
--- a/packages/realgud/realgud/debugger/perldb/core.el
+++ b/packages/realgud/realgud/debugger/perldb/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2011, 2013-2014 Free Software Foundation, Inc
+;; Copyright (C) 2011, 2013-2014, 2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -7,8 +7,6 @@
=C2=A0;; the Free Software Foundation, either version 3 of the License, or<= br> =C2=A0;; (at your option) any later version.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/core"
diff --git a/packages/realgud/realgud/debugger/perldb/init.el b/packages/re= algud/realgud/debugger/perldb/init.el
index 27c47c0..42dbedf 100644
--- a/packages/realgud/realgud/debugger/perldb/init.el
+++ b/packages/realgud/realgud/debugger/perldb/init.el
@@ -16,7 +16,7 @@
=C2=A0;;; Regular expressions for nodejs Javascript debugger.
=C2=A0;;; Stock Perl debugger perldb

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp" "..= /../common/loc") "realgud-")
diff --git a/packages/realgud/realgud/debugger/perldb/track-mode.el b/packa= ges/realgud/realgud/debugger/perldb/track-mode.el
index 39c2ec7..ce80a23 100644
--- a/packages/realgud/realgud/debugger/perldb/track-mode.el
+++ b/packages/realgud/realgud/debugger/perldb/track-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -16,7 +16,6 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;; Stock Perl Debugger "perldb5" tracking a comint or eshel= l buffer.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/rdebug/core.el b/packages/re= algud/realgud/debugger/rdebug/core.el
index 78a5a2d..bd66518 100644
--- a/packages/realgud/realgud/debugger/rdebug/core.el
+++ b/packages/realgud/realgud/debugger/rdebug/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010, 2015 Free Software Foundation, Inc
+;; Copyright (C) 2010, 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -7,8 +7,6 @@
=C2=A0;; the Free Software Foundation, either version 3 of the License, or<= br> =C2=A0;; (at your option) any later version.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/core"
diff --git a/packages/realgud/realgud/debugger/rdebug/init.el b/packages/re= algud/realgud/debugger/rdebug/init.el
index ec28401..4b4a024 100644
--- a/packages/realgud/realgud/debugger/rdebug/init.el
+++ b/packages/realgud/realgud/debugger/rdebug/init.el
@@ -9,7 +9,7 @@

=C2=A0;; Ruby 1.8 debugger: ruby-debug (rdebug)

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For stef.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp" "..= /../common/loc") "realgud-")
diff --git a/packages/realgud/realgud/debugger/rdebug/track-mode.el b/packa= ges/realgud/realgud/debugger/rdebug/track-mode.el
index 142836f..87d6986 100644
--- a/packages/realgud/realgud/debugger/rdebug/track-mode.el
+++ b/packages/realgud/realgud/debugger/rdebug/track-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010, 2012, 2015, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2010, 2012, 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -9,7 +9,6 @@

=C2=A0;;; Ruby "rdebug" Debugger tracking a comint or eshell buff= er.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/remake/core.el b/packages/re= algud/realgud/debugger/remake/core.el
index cb78f55..7f2772c 100644
--- a/packages/realgud/realgud/debugger/remake/core.el
+++ b/packages/realgud/realgud/debugger/remake/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2011, 2014-2015 Free Software Foundation, Inc
+;; Copyright (C) 2011, 2014-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -7,8 +7,6 @@
=C2=A0;; the Free Software Foundation, either version 3 of the License, or<= br> =C2=A0;; (at your option) any later version.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track" "../= ../common/core" "../../common/lang")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0"realgud-")
diff --git a/packages/realgud/realgud/debugger/remake/init.el b/packages/re= algud/realgud/debugger/remake/init.el
index 6e398a2..0c650cf 100644
--- a/packages/realgud/realgud/debugger/remake/init.el
+++ b/packages/realgud/realgud/debugger/remake/init.el
@@ -15,7 +15,7 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;;; Regular expressions for GNU Make debugger: remake

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/remake/track-mode.el b/packa= ges/realgud/realgud/debugger/remake/track-mode.el
index 50829a9..2bc649f 100644
--- a/packages/realgud/realgud/debugger/remake/track-mode.el
+++ b/packages/realgud/realgud/debugger/remake/track-mode.el
@@ -9,7 +9,6 @@

=C2=A0;;; GNU Make Debugger tracking a comint buffer.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/trepan.pl/backtrack= -mode.el b/packages/realgud/realgud/debugger/trepan.pl/backtra= ck-mode.el
index 7340c6f..7f7728b 100644
--- a/packages/realgud/realgud/debugger/trepan.pl/backtrack-mode.e= l
+++ b/packages/realgud/realgud/debugger/trepan.pl/backtrack-mode.e= l
@@ -1,4 +1,4 @@
-;; Copyright (C) 2011, 2014 Free Software Foundation, Inc
+;; Copyright (C) 2011, 2014, 2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -9,7 +9,6 @@

=C2=A0;;; Mode for parsing various kinds of backtraces found in Perl

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/trepan.pl/core.el b/packa= ges/realgud/realgud/debugger/trepan.pl/core.el
index acd7e13..37ea9a8 100644
--- a/packages/realgud/realgud/debugger/trepan.pl/core.el
+++ b/packages/realgud/realgud/debugger/trepan.pl/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2011-2012, 2014 Free Software Foundation, Inc
+;; Copyright (C) 2011-2012, 2014, 2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -7,8 +7,6 @@
=C2=A0;; the Free Software Foundation, either version 3 of the License, or<= br> =C2=A0;; (at your option) any later version.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 "../../common/core"
diff --git a/packages/realgud/realgud/debugger/trepan.pl/init.el b/packa= ges/realgud/realgud/debugger/trepan.pl/init.el
index d201d10..2865180 100644
--- a/packages/realgud/realgud/debugger/trepan.pl/init.el
+++ b/packages/realgud/realgud/debugger/trepan.pl/init.el
@@ -16,7 +16,7 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.

=C2=A0;; Trepanning Perl debugger
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/trepan.pl/track-mode.el= b/packages/realgud/realgud/debugger/trepan.pl/track-mode.el index 9140c56..d29add5 100644
--- a/packages/realgud/realgud/debugger/trepan.pl/track-mode.el +++ b/packages/realgud/realgud/debugger/trepan.pl/track-mode.el @@ -9,7 +9,6 @@

=C2=A0;; Perl trepanning Debugger tracking a comint buffer.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 "../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/trepan/backtrack-mode.el b/p= ackages/realgud/realgud/debugger/trepan/backtrack-mode.el
index c655779..d92b6b7 100644
--- a/packages/realgud/realgud/debugger/trepan/backtrack-mode.el
+++ b/packages/realgud/realgud/debugger/trepan/backtrack-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -17,7 +17,6 @@

=C2=A0;;; Mode for parsing various kinds of backtraces found in Ruby

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/trepan/core.el b/packages/re= algud/realgud/debugger/trepan/core.el
index 07764a0..a844208 100644
--- a/packages/realgud/realgud/debugger/trepan/core.el
+++ b/packages/realgud/realgud/debugger/trepan/core.el
@@ -7,8 +7,6 @@
=C2=A0;; the Free Software Foundation, either version 3 of the License, or<= br> =C2=A0;; (at your option) any later version.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'compile) ;; for compilation-find-file
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track"
diff --git a/packages/realgud/realgud/debugger/trepan/init.el b/packages/re= algud/realgud/debugger/trepan/init.el
index 6a0dd9d..b2cc954 100644
--- a/packages/realgud/realgud/debugger/trepan/init.el
+++ b/packages/realgud/realgud/debugger/trepan/init.el
@@ -16,7 +16,7 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.

=C2=A0;; Ruby Trepanning debugger
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/trepan/track-mode.el b/packa= ges/realgud/realgud/debugger/trepan/track-mode.el
index 2887c3e..f5fafb2 100644
--- a/packages/realgud/realgud/debugger/trepan/track-mode.el
+++ b/packages/realgud/realgud/debugger/trepan/track-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010, 2012-2015 Free Software Foundation, Inc
+;; Copyright (C) 2010, 2012-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -14,7 +14,6 @@

=C2=A0;;; Ruby "trepan" Debugger tracking a comint or eshell buff= er.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/trepan2/core.el b/packages/r= ealgud/realgud/debugger/trepan2/core.el
index eb2a5c6..ddf9011 100644
--- a/packages/realgud/realgud/debugger/trepan2/core.el
+++ b/packages/realgud/realgud/debugger/trepan2/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010-2012, 2014-2015 Free Software Foundation, Inc
+;; Copyright (C) 2010-2012, 2014-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -15,8 +15,6 @@
=C2=A0;; You should have received a copy of the GNU General Public License<= br> =C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'compile) ;; for compilation-find-file
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track"
diff --git a/packages/realgud/realgud/debugger/trepan2/init.el b/packages/r= ealgud/realgud/debugger/trepan2/init.el
index 235e47d..2f13fa7 100644
--- a/packages/realgud/realgud/debugger/trepan2/init.el
+++ b/packages/realgud/realgud/debugger/trepan2/init.el
@@ -9,7 +9,7 @@

=C2=A0;; trepan2: Python 2.5 - 2.7; for 3.0+ see trepan3k

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/trepan2/track-mode.el b/pack= ages/realgud/realgud/debugger/trepan2/track-mode.el
index d2eb6ed..d10bde5 100644
--- a/packages/realgud/realgud/debugger/trepan2/track-mode.el
+++ b/packages/realgud/realgud/debugger/trepan2/track-mode.el
@@ -17,7 +17,6 @@
=C2=A0;;
=C2=A0;; Python "trepan2" Debugger tracking in a comint or eshell= buffer.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/trepan3k/core.el b/packages/= realgud/realgud/debugger/trepan3k/core.el
index 39a6d13..6806a00 100644
--- a/packages/realgud/realgud/debugger/trepan3k/core.el
+++ b/packages/realgud/realgud/debugger/trepan3k/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010, 2012-2015 Free Software Foundation, Inc
+;; Copyright (C) 2010, 2012-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -15,8 +15,6 @@
=C2=A0;; You should have received a copy of the GNU General Public License<= br> =C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;;
-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/core"
diff --git a/packages/realgud/realgud/debugger/trepan3k/init.el b/packages/= realgud/realgud/debugger/trepan3k/init.el
index 5f22174..ef2dfbd 100644
--- a/packages/realgud/realgud/debugger/trepan3k/init.el
+++ b/packages/realgud/realgud/debugger/trepan3k/init.el
@@ -17,7 +17,7 @@

=C2=A0;; trepan3k: Python 3.2 and beyond

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/trepan3k/track-mode.el b/pac= kages/realgud/realgud/debugger/trepan3k/track-mode.el
index afb94f1..d7473cd 100644
--- a/packages/realgud/realgud/debugger/trepan3k/track-mode.el
+++ b/packages/realgud/realgud/debugger/trepan3k/track-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -16,7 +16,6 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;; Python "trepan3k" Debugger tracking a comint buffer.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/trepanjs/backtrack-mode.el b= /packages/realgud/realgud/debugger/trepanjs/backtrack-mode.el
index e3b7e6c..0732dc5 100644
--- a/packages/realgud/realgud/debugger/trepanjs/backtrack-mode.el
+++ b/packages/realgud/realgud/debugger/trepanjs/backtrack-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -17,7 +17,6 @@

=C2=A0;;; Mode for parsing various kinds of backtraces found in JavaScript<= br>
-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/trepanjs/core.el b/packages/= realgud/realgud/debugger/trepanjs/core.el
index eac8a0e..b3256c1 100644
--- a/packages/realgud/realgud/debugger/trepanjs/core.el
+++ b/packages/realgud/realgud/debugger/trepanjs/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -15,8 +15,6 @@
=C2=A0;; You should have received a copy of the GNU General Public License<= br> =C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 "../../common/core"
diff --git a/packages/realgud/realgud/debugger/trepanjs/init.el b/packages/= realgud/realgud/debugger/trepanjs/init.el
index 5281946..8470fe2 100644
--- a/packages/realgud/realgud/debugger/trepanjs/init.el
+++ b/packages/realgud/realgud/debugger/trepanjs/init.el
@@ -16,7 +16,7 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.
=C2=A0;;; Regular expressions for nodejs Javascript debugger.

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/trepanjs/track-mode.el b/pac= kages/realgud/realgud/debugger/trepanjs/track-mode.el
index 4c02965..5d8c8cd 100644
--- a/packages/realgud/realgud/debugger/trepanjs/track-mode.el
+++ b/packages/realgud/realgud/debugger/trepanjs/track-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -17,7 +17,6 @@

=C2=A0;;; "trepanjs" Debugger tracking a comint or eshell buffer.=

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/debugger/zshdb/core.el b/packages/rea= lgud/realgud/debugger/zshdb/core.el
index 20a7cbe..2eefad1 100644
--- a/packages/realgud/realgud/debugger/zshdb/core.el
+++ b/packages/realgud/realgud/debugger/zshdb/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010-2011, 2014-2015 Free Software Foundation, Inc
+;; Copyright (C) 2010-2011, 2014-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -7,8 +7,6 @@
=C2=A0;; the Free Software Foundation, either version 3 of the License, or<= br> =C2=A0;; (at your option) any later version.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/track" "../= ../common/core")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0"realgud-")
diff --git a/packages/realgud/realgud/debugger/zshdb/init.el b/packages/rea= lgud/realgud/debugger/zshdb/init.el
index 8c0a88e..8a2c0a9 100644
--- a/packages/realgud/realgud/debugger/zshdb/init.el
+++ b/packages/realgud/realgud/debugger/zshdb/init.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -15,7 +15,7 @@
=C2=A0;; You should have received a copy of the GNU General Public License<= br> =C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.

-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))=C2=A0 =C2=A0;For setf.

=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../../common/regexp"
diff --git a/packages/realgud/realgud/debugger/zshdb/track-mode.el b/packag= es/realgud/realgud/debugger/zshdb/track-mode.el
index 31f65dc..ecf0b12 100644
--- a/packages/realgud/realgud/debugger/zshdb/track-mode.el
+++ b/packages/realgud/realgud/debugger/zshdb/track-mode.el
@@ -9,7 +9,6 @@

=C2=A0;;; "zshdb" Debugger tracking a comint buffer.

-(eval-when-compile (require 'cl))
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '(
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../../common/cmds"
diff --git a/packages/realgud/realgud/lang/js.el b/packages/realgud/realgud= /lang/js.el
index faaf716..ede33ef 100644
--- a/packages/realgud/realgud/lang/js.el
+++ b/packages/realgud/realgud/lang/js.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -15,8 +15,6 @@
=C2=A0;; You should have received a copy of the GNU General Public License<= br> =C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../common/regexp" "../co= mmon/loc" "../common/track")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0"realgud-")
diff --git a/packages/realgud/realgud/lang/perl.el b/packages/realgud/realg= ud/lang/perl.el
index ebe6b94..cad3374 100644
--- a/packages/realgud/realgud/lang/perl.el
+++ b/packages/realgud/realgud/lang/perl.el
@@ -8,8 +8,6 @@
=C2=A0;; (at your option) any later version.

=C2=A0;;; Common Perl constants and regular expressions.
-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../common/regexp" "../co= mmon/loc" "../common/track")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0"realgud-")
diff --git a/packages/realgud/realgud/lang/posix-shell.el b/packages/realgu= d/realgud/lang/posix-shell.el
index 4f006d2..1ef2313 100644
--- a/packages/realgud/realgud/lang/posix-shell.el
+++ b/packages/realgud/realgud/lang/posix-shell.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -22,8 +22,6 @@
=C2=A0;; *only* debuggers I know of for POSIX shells, it's not too much= of
=C2=A0;; a stretch to think of this as for all "shell".

-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../common/regexp" "../co= mmon/loc"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0"../common/track" "../common/send") diff --git a/packages/realgud/realgud/lang/python.el b/packages/realgud/rea= lgud/lang/python.el
index 1ddea17..a2e8b54 100644
--- a/packages/realgud/realgud/lang/python.el
+++ b/packages/realgud/realgud/lang/python.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2011, 2014, 2015 Free Software Foundation, Inc
+;; Copyright (C) 2011, 2014-2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -16,8 +16,6 @@
=C2=A0;; along with this program.=C2=A0 If not, see <http://www.gnu.o= rg/licenses/>.

=C2=A0;;; Common Python constants and regular expressions.
-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../common/regexp" "../co= mmon/loc" "../common/track")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0"realgud-")
diff --git a/packages/realgud/realgud/lang/ruby.el b/packages/realgud/realg= ud/lang/ruby.el
index a0e38d7..9e4699e 100644
--- a/packages/realgud/realgud/lang/ruby.el
+++ b/packages/realgud/realgud/lang/ruby.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010, 2014 Free Software Foundation, Inc
+;; Copyright (C) 2010, 2014, 2016 Free Software Foundation, Inc

=C2=A0;; Author: Rocky Bernstein <rocky@gnu.org>

@@ -8,8 +8,6 @@
=C2=A0;; (at your option) any later version.

=C2=A0;; Common Ruby constants and regular expressions.
-(eval-when-compile (require 'cl))
-
=C2=A0(require 'load-relative)
=C2=A0(require-relative-list '("../common/regexp" "../co= mmon/loc" "../common/track")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0"realgud-")
diff --git a/packages/realgud/test/test-common-helper.el b/packages/realgud= /test/test-common-helper.el
index 815fde2..396edc6 100644
--- a/packages/realgud/test/test-common-helper.el
+++ b/packages/realgud/test/test-common-helper.el
@@ -1,3 +1,4 @@
+(eval-when-compile (require 'cl-lib))
=C2=A0(require 'test-simple)
=C2=A0(load-file "../realgud/common/helper.el")

@@ -12,7 +13,7 @@
=C2=A0 =C2=A0(defvar realgud-test-info)
=C2=A0)

-(defstruct realgud-test-info name)
+(cl-defstruct realgud-test-info name)
=C2=A0(realgud-struct-field-setter "realgud-test-info" "name= ")

=C2=A0(set (make-local-variable 'realgud-test-info)
diff --git a/packages/realgud/test/test-core.el b/packages/realgud/test/tes= t-core.el
index 51ddaa7..d3e6ca2 100644
--- a/packages/realgud/test/test-core.el
+++ b/packages/realgud/test/test-core.el
@@ -1,3 +1,5 @@
+;; -*- lexical-binding:t -*-
+
=C2=A0;; Press C-x C-e at the end of the next line to run this file test no= n-interactively
=C2=A0;; (test-simple-run "emacs -batch -L %s -l %s" (file-name-d= irectory (locate-library "test-simple.elc")) buffer-file-name)
@@ -33,7 +35,7 @@

=C2=A0(note "realgud-parse-...")

-(lexical-let ((opt-two-args '("0" "C" "e"= ; "E" "F" "i")))
+(let ((opt-two-args '("0" "C" "e" "= E" "F" "i")))
=C2=A0 =C2=A0(assert-equal '(("-0" "a") nil)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (realgud-parse-comm= and-arg '("-0" "a") '() opt-two-args)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "Two ar= gs found, none remain afterwards though.")
diff --git a/packages/realgud/test/test-regexp-rdebug.el b/packages/realgud= /test/test-regexp-rdebug.el
index 26477b7..2c37d41 100644
--- a/packages/realgud/test/test-regexp-rdebug.el
+++ b/packages/realgud/test/test-regexp-rdebug.el
@@ -1,3 +1,5 @@
+;; -*- lexical-binding:t -*-
+
=C2=A0;; Press C-x C-e at the end of the next line to run this file test no= n-interactively
=C2=A0;; (test-simple-run "emacs -batch -L %s -l %s" (file-name-d= irectory (locate-library "test-simple.elc")) buffer-file-name)
@@ -15,7 +17,7 @@
=C2=A0;;=C2=A0 =C2=A0 =C2=A0 =C2=A0 setq however will workaround this.
=C2=A0(setq text "=C2=A0 =C2=A0from /usr/local/bin/irb:12:in `<main= >'")
=C2=A0(note "traceback location matching")
-(lexical-let ((text "=C2=A0 from /usr/local/bin/irb:12:in `<main&g= t;'"))
+(let ((text "=C2=A0 from /usr/local/bin/irb:12:in `<main>'&= quot;))
=C2=A0 =C2=A0(assert-t (numberp (loc-match text helper-tb)) "basic tra= ceback location")
=C2=A0 =C2=A0(assert-equal "/usr/local/bin/irb"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (match-string (real= gud-loc-pat-file-group helper-tb)
@@ -26,7 +28,7 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 text) "extract traceback line number&q= uot;)
=C2=A0 =C2=A0)

-(lexical-let ((text "Breakpoint 1 file /usr/bin/irb, line 10\n")= )
+(let ((text "Breakpoint 1 file /usr/bin/irb, line 10\n"))
=C2=A0 =C2=A0(assert-t (numberp (loc-match text helper-bps)) "basic br= eakpoint location")
=C2=A0 =C2=A0(assert-equal "/usr/bin/irb"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (match-string (real= gud-loc-pat-file-group helper-bps)
diff --git a/packages/realgud/test/test-regexp-ruby.el b/packages/realgud/t= est/test-regexp-ruby.el
index d15ab9c..a2392b1 100644
--- a/packages/realgud/test/test-regexp-ruby.el
+++ b/packages/realgud/test/test-regexp-ruby.el
@@ -1,3 +1,5 @@
+;; -*- lexical-binding:t -*-
+
=C2=A0;; Press C-x C-e at the end of the next line to run this file test no= n-interactively
=C2=A0;; (test-simple-run "emacs -batch -L %s -l %s" (file-name-d= irectory (locate-library "test-simple.elc")) buffer-file-name)
@@ -15,7 +17,7 @@
=C2=A0;;=C2=A0 =C2=A0 =C2=A0 =C2=A0 setq however will workaround this.
=C2=A0(setq text "/tmp/rails-2.3.5/lib/tasks/databases.rake:360")=

-(lexical-let ((text "/tmp/rails-2.3.5/lib/tasks/databases.rake:360&qu= ot;))
+(let ((text "/tmp/rails-2.3.5/lib/tasks/databases.rake:360"))
=C2=A0 =C2=A0(assert-t (numberp (loc-match text bt)) "basic traceback = location")
=C2=A0 =C2=A0(assert-equal "/tmp/rails-2.3.5/lib/tasks/databases.rake&= quot;
diff --git a/packages/realgud/test/test-regexp.el b/packages/realgud/test/t= est-regexp.el
index da9a81a..0cdde95 100644
--- a/packages/realgud/test/test-regexp.el
+++ b/packages/realgud/test/test-regexp.el
@@ -1,3 +1,5 @@
+;; -*- lexical-binding:t -*-
+
=C2=A0;; Press C-x C-e at the end of the next line to run this file test no= n-interactively
=C2=A0;; (test-simple-run "emacs -batch -L %s -l %s" (file-name-d= irectory (locate-library "test-simple.elc")) buffer-file-name)
@@ -39,7 +41,7 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 :line-group = (realgud-loc-pat-line-group=C2=A0 loc-pat)))


-(lexical-let ((text ".. (./dbgr.rb:73)")
+(let ((text ".. (./dbgr.rb:73)")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (text2 "C> ((eval)= :1 via /tmp/eval2.rb:2)")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (text3 "-- (<inter= nal:prelude>:28 remapped prelude.rb:28)")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (text4 "-- (/src/exte= rnal-vcs/dbgrr/processor/command/info_subcmd/registers_subcmd/dfp.rb:2)\nre= quire_relative %w(.. .. base subsubcmd)\n")
diff --git a/packages/realgud/test/test-track.el b/packages/realgud/test/te= st-track.el
index d0bb147..5e98fec 100644
--- a/packages/realgud/test/test-track.el
+++ b/packages/realgud/test/test-track.el
@@ -1,3 +1,5 @@
+;; -*- lexical-binding:t -*-
+
=C2=A0;; Press C-x C-e at the end of the next line to run this file test no= n-interactively
=C2=A0;; (test-simple-run "emacs -batch -L %s -l %s" (file-name-d= irectory (locate-library "test-simple.elc")) buffer-file-name)
@@ -41,7 +43,7 @@
=C2=A0(setq line-number 7)
=C2=A0(setq debugger-output (format "-> (%s:%d)\nrequire 'foo&#= 39;\n(trepan):\n"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 test-filename line-number))
-(lexical-let ((loc (realgud-track-loc debugger-output nil)))
+(let ((loc (realgud-track-loc debugger-output nil)))
=C2=A0 =C2=A0(assert-t (realgud-loc-p loc)=C2=A0 =C2=A0"loc extracted&= quot;)
=C2=A0 =C2=A0(assert-equal "(trepan):\n"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (realgud-track-loc-= remaining debugger-output)
--001a113d3bd4a815e405394627e4--