* 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'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9030d5da9fbad817488f8bd4af00450a84da75d0..468f7c7d70da9fd9de78e52d1f8ea36c12c1b173 100644 (file)
--- 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 e07c6a241ab7e777f5d1f8daef1004553aecae74..c06c01c2c976b13da4801f9624c9c99bcb5e20eb 100644 (file)
--- 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 739511e68fe0b2f5a2ebb76c02ad748ef4402d00..8b4dd2eed5ff12e088fd88c4f65cbb987c44e8a3 100644 (file)
--- 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)

diff --git a/src/lisp.h b/src/lisp.h
index 54c0b8cf11d27921834103ad50b2734302602183..b19745baf91834512092da72487e7d1b9cd8de70 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2630,19 +2630,6 @@ typedef jmp_buf sys_jmp_buf;
    they are bound by a function application or a let form, stores the
    code to be executed for unwind-protect forms.
 
-   If func is non-zero, undoing this binding applies func to old_value;
-      This implements record_unwind_protect.
-
-   Otherwise, the element is a variable binding.
-
-   If the symbol field is a symbol, it is an ordinary variable binding.
-
-   Otherwise, it should be a structure (SYMBOL WHERE . CURRENT-BUFFER),
-   which means having bound a local value while CURRENT-BUFFER was active.
-   If WHERE is nil this means we saw the default value when binding SYMBOL.
-   WHERE being a buffer or frame means we saw a buffer-local or frame-local
-   value.  Other values of WHERE mean an internal error.
-
    NOTE: The specbinding union is defined here, because SPECPDL_INDEX is
    used all over the place, needs to be fast, and needs to know the size of
    union specbinding.  But only eval.c should access it.  */