auto upstream

diff --cc configure.ac
Simple merge

diff --cc lisp/emacs-lisp/cl-loaddefs.el
index f8855c2b84f1b4b2651ba65c3088616b99e459a2,734975f7f11810aae8c512ef82a446ac9862a298..89e774f830ce289b364596074fa15e4469157afe
--- 1/lisp/emacs-lisp/cl-loaddefs.el
--- 2/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/cl-macs.el
Simple merge

diff --cc lisp/emacs-lisp/cl.el
Simple merge

diff --cc lisp/emacs-lisp/edebug.el
index ae519e6aaf8fc2dcffdbbdb572ad32d6652db019,378ba9db9f40832101f584fff7c09dddd5181a1f..4dba081322f8ca34720d35f7ad3d4b480cfc7dc3
--- 1/lisp/emacs-lisp/edebug.el
--- 2/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

diff --cc lisp/net/browse-url.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/emacsgtkfixed.c
Simple merge

diff --cc src/emacsgtkfixed.h
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge