From: Joakim Verona <joakim@verona.se>
Date: Wed, 13 Jun 2012 21:40:39 +0000 (+0200)
Subject: upstream
X-Git-Tag: emacs-25.0.90~3304
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a3f77f8e16eb918574701fdcaeb5e18010ca4f9a;p=emacs.git

upstream
---

a3f77f8e16eb918574701fdcaeb5e18010ca4f9a
diff --cc lisp/emacs-lisp/cl-loaddefs.el
index f0554342a09,6148ec71548..b389e78bc39
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@@ -279,8 -267,7 +267,7 @@@ Remove from SYMBOL's plist the propert
  ;;;;;;  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"
--;;;;;;  "32abce1bd6f38339285a6071e1be5e59")
- >>>>>>> MERGE-SOURCE
++;;;;;;  "4a758f183747246fe042bf42b6ddd85c")
  ;;; Generated autoloads from cl-macs.el
  
  (autoload 'cl-gensym "cl-macs" "\