* lisp/finder.el (finder-compile-keywords): Don't mess with windows.

* lisp/net/eww.el (eww-display-raw): Remove unused argument `charset'.
Update call to it.
(eww-change-select): Remove unused var `properties'.
(eww-make-unique-file-name): Remove unused var `base'.

3 files changed, 12 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9030d5da9fb..468f7c7d70d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2013-09-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * net/eww.el (eww-display-raw): Remove unused argument `charset'.
+        Update call to it.
+        (eww-change-select): Remove unused var `properties'.
+        (eww-make-unique-file-name): Remove unused var `base'.
+
+        * finder.el (finder-compile-keywords): Don't mess with windows.
+
         * calculator.el (calculator-funcall): Fix typo in last change.
 
         * vc/vc-git.el (vc-git-checkin): Make it possible to commit a merge.
diff --git a/lisp/finder.el b/lisp/finder.el
index e07c6a241ab..c06c01c2c97 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -225,8 +225,8 @@ from; the default is `load-path'."
               (lambda (a b) (string< (symbol-name (car a))
                                      (symbol-name (car b))))))
 
-  (save-excursion
-    (find-file generated-finder-keywords-file)
+  (with-current-buffer
+      (find-file-noselect generated-finder-keywords-file)
     (setq buffer-undo-list t)
     (erase-buffer)
     (insert (autoload-rubric generated-finder-keywords-file
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 739511e68fe..8b4dd2eed5f 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -159,7 +159,7 @@ word(s) will be searched for via `eww-search-prefix'."
            ((string-match "^image/" (car content-type))
             (eww-display-image))
            (t
-            (eww-display-raw charset)))
+            (eww-display-raw)))
           (setq eww-history-position 0)
           (cond
            (point
@@ -296,7 +296,7 @@ word(s) will be searched for via `eww-search-prefix'."
                                   (list :background (car new-colors))
                                   t))))))
 
-(defun eww-display-raw (charset)
+(defun eww-display-raw ()
   (let ((data (buffer-substring (point) (point-max))))
     (eww-setup-buffer)
     (let ((inhibit-read-only t))
@@ -756,7 +756,6 @@ appears in a <link> or <a> tag."
   "Change the value of the select drop-down menu under point."
   (interactive)
   (let* ((input (get-text-property (point) 'eww-form))
-         (properties (text-properties-at (point)))
          (completion-ignore-case t)
          (options
           (delq nil
@@ -930,8 +929,7 @@ The browser to used is specified by the `shr-external-browser' variable."
       (setq file "!"))
      ((string-match "\\`[.]" file)
       (setq file (concat "!" file))))
-    (let ((base file)
-          (count 1))
+    (let ((count 1))
       (while (file-exists-p (expand-file-name file directory))
         (setq file
               (if (string-match "\\`\\(.*\\)\\([.][^.]+\\)" file)