From: Joakim Verona <joakim@verona.se>
Date: Wed, 2 Jan 2013 23:06:25 +0000 (+0100)
Subject: auto upstream
X-Git-Tag: emacs-25.0.90~3007
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c6b5fe1e945c664a0d696ae6eea9721235baf2f1;p=emacs.git

auto upstream
---

c6b5fe1e945c664a0d696ae6eea9721235baf2f1
diff --cc lisp/emacs-lisp/cl-loaddefs.el
index f8855c2b84f,734975f7f11..89e774f830c
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@@ -267,7 -267,7 +267,7 @@@ including `cl-block' and `cl-eval-when'
  ;;;;;;  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--compiler-macro-cXXr cl--compiler-macro-list*)
- ;;;;;;  "cl-macs" "cl-macs.el" "4589068913df8cfd554dfb40865801c5")
 -;;;;;;  "cl-macs" "cl-macs.el" "3b4d4e869f81f0b07ab3aa08f5478c2e")
++;;;;;;  "cl-macs" "cl-macs.el" "7614365c56c74e8ed9d098d11801605b")
  ;;; Generated autoloads from cl-macs.el
  
  (autoload 'cl--compiler-macro-list* "cl-macs" "\
diff --cc lisp/emacs-lisp/edebug.el
index ae519e6aaf8,378ba9db9f4..4dba081322f
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@@ -1,6 -1,7 +1,7 @@@
 -;;; edebug.el --- a source-level debugger for Emacs Lisp  -*- lexical-binding: t -*-
 +;;; edebug.el --- a source-level debugger for Emacs Lisp
  
- ;; Copyright (C) 1988-1995, 1997, 1999-2012 Free Software Foundation, Inc.
+ ;; Copyright (C) 1988-1995, 1997, 1999-2013 Free Software Foundation,
+ ;; Inc.
  
  ;; Author: Daniel LaLiberte <liberte@holonexus.org>
  ;; Maintainer: FSF