merge trunk

7 files changed, 52 insertions, 6 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 4e1f15e913d..3ebe18b407f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,15 @@
+2012-10-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix outdated timestamp documentation in Elisp manual (bug#12706).
+        * NEWS: Document increased precision in undo list.
+
+2012-10-21  Glenn Morris  <rgm@gnu.org>
+
+        * images/icons/hicolor/32x32/apps/emacs22.png:
+        * images/icons/hicolor/16x16/apps/emacs22.png:
+        * images/icons/hicolor/48x48/apps/emacs22.png:
+        * images/icons/hicolor/24x24/apps/emacs22.png: Restore old icons.
+
 2012-10-14  Kenichi Handa  <handa@gnu.org>
 
         * charsets/JISC6226.map: Re-generated.
@@ -9,12 +21,12 @@
 
 2012-10-11  Kenichi Handa  <handa@gnu.org>
 
-        * charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map,
-        charsets/CNS-5.map, charsets/CNS-6.map, charsets/CNS-7.map,
-        charsets/CP932-2BYTE.map, charsets/GB180302.map,
-        charsets/GB180304.map, charsets/JISC6226.map,
-        charsets/JISX2131.map, charsets/MIK.map, charsets/PTCP154.map,
-        charsets/stdenc.map, charsets/symbol.map: Re-generated.
+        * charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map:
+        * charsets/CNS-5.map, charsets/CNS-6.map, charsets/CNS-7.map:
+        * charsets/CP932-2BYTE.map, charsets/GB180302.map:
+        * charsets/GB180304.map, charsets/JISC6226.map:
+        * charsets/JISX2131.map, charsets/MIK.map, charsets/PTCP154.map:
+        * charsets/stdenc.map, charsets/symbol.map: Re-generate.
 
 2012-10-07  Jan Djärv  <jan.h.d@swipnet.se>
 
diff --git a/etc/NEWS b/etc/NEWS
index 00d5109aba6..4fd7e13f8ca 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -621,6 +621,29 @@ enabled.
 
 ** FIXME something happened to ses.el, 2012-04-17.
 
+** Hooks renamed to avoid obsolete "-hooks" suffix:
+*** semantic-lex-reset-hooks -> semantic-lex-reset-functions
+*** semantic-change-hooks -> semantic-change-functions
+*** semantic-edits-new-change-hooks -> semantic-edits-new-change-functions
+*** semantic-edits-delete-change-hooks -> semantic-edits-delete-change-functions
+*** semantic-edits-reparse-change-hooks -> semantic-edits-reparse-change-functions
+*** semanticdb-save-database-hooks -> semanticdb-save-database-functions
+*** c-prepare-bug-report-hooks -> c-prepare-bug-report-hook
+*** rcirc-sentinel-hooks -> rcirc-sentinel-functions
+*** rcirc-receive-message-hooks -> rcirc-receive-message-functions
+*** rcirc-activity-hooks -> rcirc-activity-functions
+*** rcirc-print-hooks -> rcirc-print-functions
+*** dbus-event-error-hooks -> dbus-event-error-functions
+*** eieio-pre-method-execution-hooks -> eieio-pre-method-execution-functions
+*** checkdoc-style-hooks -> checkdoc-style-functions
+*** checkdoc-comment-style-hooks -> checkdoc-comment-style-functions
+*** archive-extract-hooks -> archive-extract-hook
+*** filesets-cache-fill-content-hooks -> filesets-cache-fill-content-hook
+*** hfy-post-html-hooks -> hfy-post-html-hook
+*** nndiary-request-create-group-hooks -> nndiary-request-create-group-functions
+*** nndiary-request-update-info-hooks -> nndiary-request-update-info-functions
+*** nndiary-request-accept-article-hooks -> nndiary-request-accept-article-functions
+*** gnus-subscribe-newsgroup-hooks -> gnus-subscribe-newsgroup-functions
 
 ** Obsolete packages:
 +++
@@ -843,6 +866,9 @@ stamps are still accepted.
 The PSECS slot is new, and uses picosecond resolution.  It can be
 accessed via the new timer--psecs accessor.
 
+*** Last-modified time stamps in undo lists now are of the form
+(t HI-SECS LO-SECS USECS PSECS) instead of (t HI-SECS . LO-SECS).
+
 +++
 ** Floating point functions now always return special values like NaN,
 instead of signaling errors, if given invalid args, e.g. (log -1.0).
@@ -890,6 +916,7 @@ See the "Face Attributes" section of the Elisp manual.
 *** `window-system-version'
 *** `dired-pop-to-buffer' (use `dired-mark-pop-up')
 *** `query-replace-interactive'
+*** `font-list-limit' (has had no effect since Emacs < 23)
 
 
 * Changes in Emacs 24.3 on non-free operating systems
diff --git a/etc/images/icons/README b/etc/images/icons/README
index d71641684cd..664c52906ac 100644
--- a/etc/images/icons/README
+++ b/etc/images/icons/README
@@ -9,6 +9,13 @@ Copyright (C) 2007-2012  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
 
+Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png
+       hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png
+
+Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
+Copyright (C) 2005-2012  Free Software Foundation, Inc.
+License: GNU General Public License version 3 or later (see COPYING)
+
 Files: allout-widgets-dark-bg/closed.png
        allout-widgets-dark-bg/closed.xpm
        allout-widgets-dark-bg/empty.png
diff --git a/etc/images/icons/hicolor/16x16/apps/emacs22.png b/etc/images/icons/hicolor/16x16/apps/emacs22.png
new file mode 100644
index 00000000000..b419b01b4ee
--- /dev/null
+++ b/etc/images/icons/hicolor/16x16/apps/emacs22.png
diff --git a/etc/images/icons/hicolor/24x24/apps/emacs22.png b/etc/images/icons/hicolor/24x24/apps/emacs22.png
new file mode 100644
index 00000000000..790ec7e2bff
--- /dev/null
+++ b/etc/images/icons/hicolor/24x24/apps/emacs22.png
diff --git a/etc/images/icons/hicolor/32x32/apps/emacs22.png b/etc/images/icons/hicolor/32x32/apps/emacs22.png
new file mode 100644
index 00000000000..31fbb47c0d2
--- /dev/null
+++ b/etc/images/icons/hicolor/32x32/apps/emacs22.png
diff --git a/etc/images/icons/hicolor/48x48/apps/emacs22.png b/etc/images/icons/hicolor/48x48/apps/emacs22.png
new file mode 100644
index 00000000000..f0df0fb6594
--- /dev/null
+++ b/etc/images/icons/hicolor/48x48/apps/emacs22.png