* lisp/gnus/sieve.el (sieve-edit-script): Avoid beginning-of-buffer.

* lisp/gnus/shr.el (browse-url): Require `url'.
* lisp/gnus/eww.el (url): Require format-spec.

4 files changed, 9 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c5318539889..8b0741bec6e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * sieve.el (sieve-edit-script): Avoid beginning-of-buffer.
+        * shr.el (browse-url): Require `url'.
+        * eww.el (url): Require format-spec.
+
 2013-06-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * eww.el (eww-display-html): Default to using the entire window width.
diff --git a/lisp/gnus/eww.el b/lisp/gnus/eww.el
index 868450c51dd..a79738a283f 100644
--- a/lisp/gnus/eww.el
+++ b/lisp/gnus/eww.el
@@ -25,6 +25,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(require 'format-spec)
 (require 'shr)
 (require 'url)
 (require 'mm-url)
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 339b9698922..be8ffb02581 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -31,6 +31,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(eval-when-compile (require 'url))      ;For url-filename's setf handler.
 (require 'browse-url)
 
 (defgroup shr nil
diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el
index b3539c5857f..42e6330273a 100644
--- a/lisp/gnus/sieve.el
+++ b/lisp/gnus/sieve.el
@@ -213,7 +213,7 @@ require \"fileinto\";
       (insert sieve-template))
     (sieve-mode)
     (setq sieve-buffer-script-name name)
-    (beginning-of-buffer)
+    (goto-char (point-min))
     (message
      (substitute-command-keys
       "Press \\[sieve-upload] to upload script to server."))))