Merge from emacs-24; up to 2012-12-06T07:33:20Z!rgm@gnu.org

8 files changed, 23 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 081792c9719..0d34da2c049 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-03  Glenn Morris  <rgm@gnu.org>
+
+        * subr.el (eval-after-load): Don't purecopy the form, so that it
+        can be nconc'd later on; reverts 2009-11-11 change.  (Bug#13331)
+
+        * emacs-lisp/byte-run.el (defun): Place cl declarations
+        after any interactive spec.  (Bug#13265)
+
 2013-01-02  Andreas Schwab  <schwab@linux-m68k.org>
 
         * emacs-lisp/byte-run.el (defmacro): Use same argument parsing as
diff --git a/lisp/calc/README b/lisp/calc/README
index bae9e7ab177..c44ffe5aef0 100644
--- a/lisp/calc/README
+++ b/lisp/calc/README
@@ -5,7 +5,7 @@ See the end of the file for license conditions.
 This directory contains Calc, an advanced desk calculator for GNU
 Emacs.
 
-"Calc"  Copyright (C) 1990-1993, 2001-2012  Free Software Foundation, Inc.
+"Calc"  Copyright (C) 1990-1993, 2001-2013 Free Software Foundation, Inc.
 
 Written by:
         Dave Gillespie
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 22a23e526a2..370f651b93d 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -1,6 +1,6 @@
 ;;; semantic/imenu.el --- Use Semantic as an imenu tag generator
 
-;;; Copyright (C) 2000-2005, 2007-2008, 2010-2012
+;;; Copyright (C) 2000-2005, 2007-2008, 2010-2013
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 3168ddb16e5..b44ec68e2bf 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -199,7 +199,13 @@ The return value is undefined.
                          (memq (car x)  ;C.f. cl-do-proclaim.
                                '(special inline notinline optimize warn)))
                     (push (list 'declare x)
-                          (if (stringp docstring) (cdr body) body))
+                          (if (stringp docstring)
+                              (if (eq (car-safe (cadr body)) 'interactive)
+                                  (cddr body)
+                                (cdr body))
+                            (if (eq (car-safe (car body)) 'interactive)
+                                (cdr body)
+                              body)))
                     nil)
                    (t (message "Warning: Unknown defun property `%S' in %S"
                                (car x) name)))))
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 58ad7a6661f..5bbf1708654 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -805,7 +805,7 @@ on the remote host.")
 (defconst tramp-perl-encode
   "%s -e '
 # This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 use strict;
 
 my %%trans = do {
@@ -843,7 +843,7 @@ This string is passed to `format', so percent characters need to be doubled.")
 (defconst tramp-perl-decode
   "%s -e '
 # This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 use strict;
 
 my %%trans = do {
diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index d7c86b08a9e..91df2ebcc4e 100644
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -104,7 +104,7 @@ not be modified."
 @licstart  The following is the entire license notice for the
 JavaScript code in this tag.
 
-Copyright (C) 2012  Free Software Foundation, Inc.
+Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 The JavaScript code in this tag is free software: you can
 redistribute it and/or modify it under the terms of the GNU
@@ -351,7 +351,7 @@ You can also customize this for each buffer, using something like
 @licstart  The following is the entire license notice for the
 JavaScript code below.
 
-Copyright (C) 2012  Free Software Foundation, Inc.
+Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 The JavaScript code below is free software: you can
 redistribute it and/or modify it under the terms of the GNU
diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el
index 037afe843af..9a4046fff8b 100644
--- a/lisp/org/org-jsinfo.el
+++ b/lisp/org/org-jsinfo.el
@@ -141,7 +141,7 @@ means to use the maximum value consistent with other options."
 @licstart  The following is the entire license notice for the
 JavaScript code in this tag.
 
-Copyright (C) 2012  Free Software Foundation, Inc.
+Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 The JavaScript code in this tag is free software: you can
 redistribute it and/or modify it under the terms of the GNU
diff --git a/lisp/subr.el b/lisp/subr.el
index 3e842ffb8c6..7ca0169abdb 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1867,7 +1867,7 @@ This function makes or adds to an entry on `after-load-alist'."
                  ,form)))
       ;; Add FORM to the element unless it's already there.
       (unless (member form (cdr elt))
-        (nconc elt (purecopy (list form)))))))
+        (nconc elt (list form))))))
 
 (defvar after-load-functions nil
   "Special hook run after loading a file.