From: Joakim Verona <joakim@verona.se>
Date: Tue, 19 Jun 2012 16:24:34 +0000 (+0200)
Subject: lisp/emacs-lisp/cl-loaddefs.el annoyingly has to be handmerged.
X-Git-Tag: emacs-25.0.90~3302
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58a90697e8f15a2722100ac489df200ad31d3086;p=emacs.git

lisp/emacs-lisp/cl-loaddefs.el annoyingly has to be handmerged.
---

diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index ef89bf81687..7b1f8465dc5 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -267,7 +267,7 @@ Remove from SYMBOL's plist the property PROPNAME and its value.
 ;;;;;;  cl-return cl-block cl-etypecase cl-typecase cl-ecase cl-case
 ;;;;;;  cl-load-time-value cl-eval-when cl-destructuring-bind cl-function
 ;;;;;;  cl-defmacro cl-defun cl-gentemp cl-gensym) "cl-macs" "cl-macs.el"
-;;;;;;  "57801d8e4d72553371d59eca7b44292f")
+;;;;;;  "178bb5377dbd371f1038a7bf5f4d7f29")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'cl-gensym "cl-macs" "\