merge from trunk

lisp/ChangeLog

@@ -1,3 +1,12 @@
+2013-09-13  Glenn Morris  <rgm@gnu.org>
+
+	* eshell/esh-ext.el (eshell-search-path): Declare.
+
+	* eshell/em-prompt.el (eshell/pwd): Autoload it.
+	Otherwise an error occurs if eshell-dirs module not loaded.
+
+	* progmodes/gdb-mi.el (gud-cont, gud-step): Declare.
+
 2013-09-13  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-check-proper-method-and-host): Rename it from

lisp/eshell/em-prompt.el

@@ -45,6 +45,8 @@ as is common with most shells."
   :type 'hook
   :group 'eshell-prompt)
 
+(autoload 'eshell/pwd "em-dirs")
+
 (defcustom eshell-prompt-function
   (function
    (lambda ()

lisp/eshell/esh-ext.el

@@ -92,6 +92,10 @@ since nothing else but Eshell will be able to understand
 	(setq list (cdr list)))
       file)))
 
+;; This file provides itself then eval-when-compile loads files that require it.
+;; This causes spurious "might not be defined at runtime" warnings.
+(declare-function eshell-search-path "esh-ext" (name))
+
 (defcustom eshell-windows-shell-file
   (if (eshell-under-windows-p)
       (if (string-match "\\(cmdproxy\\|sh\\)\\.\\(com\\|exe\\)"

lisp/progmodes/gdb-mi.el

@@ -3257,11 +3257,16 @@ line."
   gud-stop-subjob
   "Interrupt thread at current line.")
 
+;; Defined opaquely in M-x gdb via gud-def.
+(declare-function gud-cont "gdb-mi" (arg) t)
+
 (def-gdb-thread-buffer-gud-command
   gdb-continue-thread
   gud-cont
   "Continue thread at current line.")
 
+(declare-function gud-step "gdb-mi" (arg) t)
+
 (def-gdb-thread-buffer-gud-command
   gdb-step-thread
   gud-step

lisp/url/ChangeLog

@@ -1,3 +1,8 @@
+2013-09-13  Glenn Morris  <rgm@gnu.org>
+
+	* url-http.el (url-handle-content-transfer-encoding):
+	* url-vars.el (url-mime-encoding-string): Silence compiler.
+
 2013-08-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* url-http.el (url-http-parse-headers): Always place point at the

lisp/url/url-http.el

@@ -861,7 +861,7 @@ should be shown to the user."
 (defun url-handle-content-transfer-encoding ()
   (let ((encoding (mail-fetch-field "content-encoding")))
     (when (and encoding
-	       (fboundp 'zlib-decompress-region)
+	       (fboundp 'zlib-available-p)
 	       (zlib-available-p)
 	       (equal (downcase encoding) "gzip"))
       (save-restriction

lisp/url/url-vars.el

@@ -210,7 +210,7 @@ Should be an assoc list of headers/contents.")
 
 (defvar url-request-method nil "The method to use for the next request.")
 
-(defvar url-mime-encoding-string (and (fboundp 'zlib-decompress-region)
+(defvar url-mime-encoding-string (and (fboundp 'zlib-available-p)
 				      (zlib-available-p)
 				      "gzip")
   "String to send in the Accept-encoding: field in HTTP requests.")