merge from trunk

lisp/ChangeLog

@@ -1,5 +1,7 @@
 2013-09-13  Glenn Morris  <rgm@gnu.org>
 
+	* eshell/esh-util.el (ange-cache): Move declaration earlier.
+
 	* eshell/esh-ext.el (eshell-search-path): Declare.
 
 	* eshell/em-prompt.el (eshell/pwd): Autoload it.

lisp/eshell/esh-util.el

@@ -562,6 +562,8 @@ Unless optional argument INPLACE is non-nil, return a new string."
 	  (substring string 0 sublen)
 	string)))
 
+(defvar ange-cache)
+
 (and (featurep 'xemacs)
      (not (fboundp 'directory-files-and-attributes))
      (defun directory-files-and-attributes (directory &optional full match nosort id-format)
@@ -579,8 +581,6 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
 	  (cons file (eshell-file-attributes (expand-file-name file directory)))))
        (directory-files directory full match nosort)))))
 
-(defvar ange-cache)
-
 (defun eshell-directory-files-and-attributes (dir &optional full match nosort id-format)
   "Make sure to use the handler for `directory-file-and-attributes'."
   (let* ((dir (expand-file-name dir)))

lisp/gnus/ChangeLog

@@ -1,3 +1,8 @@
+2013-09-13  Glenn Morris  <rgm@gnu.org>
+
+	* gnus-html.el (declare-function): Add compat stub for ancient Emacs.
+	(image-size): Declare.
+
 2013-09-12  Glenn Morris  <rgm@gnu.org>
 
 	* gnus-icalendar.el (gnus-icalendar-event--build-reply-event-body):

lisp/gnus/gnus-html.el

@@ -28,6 +28,10 @@
 
 ;;; Code:
 
+;; For Emacs <22.2 and XEmacs.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (eval-when-compile (require 'cl))
 
 (require 'gnus-art)
@@ -438,6 +442,9 @@ Return a string with image data."
      (truncate (* gnus-max-image-proportion
                   (- (nth 3 edges) (nth 1 edges)))))))
 
+;; Behind display-graphic-p test.
+(declare-function image-size "image.c" (spec &optional pixels frame))
+
 (defun gnus-html-put-image (data url &optional alt-text)
   "Put an image with DATA from URL and optional ALT-TEXT."
   (when (gnus-graphic-display-p)