auto upstream

2 files changed, 19 insertions, 5 deletions

diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 57be8a2e971..671d8a06755 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -179,9 +179,6 @@ packages that you can install.
    WhizzyTeX provides a minor mode for Emacs or XEmacs, a (bash)
    shell-script daemon and some LaTeX macros.
 
- * X-Symbol: <URL:http://x-symbol.sourceforge.net/>
-   Quasi-WYSIWYG editing of TeX & al.
-
 Local Variables:
 mode: text
 eval: (view-mode 1)
diff --git a/etc/NEWS b/etc/NEWS
index 2eda7a5c775..d6691ffed8f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -145,8 +145,6 @@ directory, respectively.
 `f' (`image-next-frame') and `b' (`image-previous-frame') visit the
 next or previous frame.  `F' (`image-goto-frame') shows a specific frame.
 
-*** `image-animated-p' is now `image-multi-frame-p'.
-
 ---
 *** The command `image-mode-fit-frame' deletes other windows.
 When toggling, it restores the frame's previous window configuration.
@@ -220,6 +218,10 @@ are obsolete.  Customize the `woman-* faces instead.
 +++
 *** yow.el is obsolete; use fortune.el or cookie1.el instead.
 
+---
+*** The Info-edit command is obsolete.  Editing Info nodes by hand
+has not been relevant for some time.
+
 
 * New Modes and Packages in Emacs 24.4
 ** New nadvice.el package offering lighter-weight advice facilities.
@@ -291,6 +293,21 @@ rather than inheriting from it (as do face specs set via Customize).
 *** New face characteristic (supports :underline (:style wave))
 specifies whether or not the terminal can display a wavy line.
 
+** Image API
+
++++
+*** `image-animated-p' is now `image-multi-frame-p'.
+It returns non-nil for any image that contains multiple frames,
+whether or not it specifies a frame delay.
+
++++
+*** When animating images that do not specify a frame delay,
+Emacs uses `image-default-frame-delay'.
+
++++
+*** New functions `image-current-frame' and `image-show-frame' for getting
+and setting the current frame of a multi-frame image.
+
 ** time-to-seconds is not obsolete any more.
 ** New function special-form-p.
 ** Docstrings can be made dynamic by adding a `dynamic-docstring-function'