Re: master cebd899: Avoid signaling an error in 'dired-do-find-regexp-and-replace'

Re: master cebd899: Avoid signaling an error in 'dired-do-find-regexp-and-replace'

[Lars Ingebrigtsen]

Eli Zaretskii <eliz@gnu.org> writes:

>  ;; We need macros in dired.el to compile properly,
>  ;; and we call subroutines in it too.
>  (require 'dired)
> +(require 'cl-lib)  ; for cl-mapcan

Glenn Morris <rgm@gnu.org> writes:

>  ;;; Code:
>
> +(require 'cl-lib)
>  ;; We need macros in dired.el to compile properly,
>  ;; and we call subroutines in it too.
>  (require 'dired)

I think you committed almost the same thing to both branches a few
minutes apart...

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master cebd899: Avoid signaling an error in 'dired-do-find-regexp-and-replace'

[Eli Zaretskii]

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Date: Sun, 14 Feb 2016 13:06:55 +1100
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> >  ;; We need macros in dired.el to compile properly,
> >  ;; and we call subroutines in it too.
> >  (require 'dired)
> > +(require 'cl-lib)  ; for cl-mapcan
> 
> Glenn Morris <rgm@gnu.org> writes:
> 
> >  ;;; Code:
> >
> > +(require 'cl-lib)
> >  ;; We need macros in dired.el to compile properly,
> >  ;; and we call subroutines in it too.
> >  (require 'dired)
> 
> I think you committed almost the same thing to both branches a few
> minutes apart...

Yes, and I think mine was the correct commit.