[Emacs-diffs] trunk r114122: * lisp/finder.el (finder-compile-keywords): Don't mess with windows.

[Stefan Monnier]

------------------------------------------------------------
revno: 114122
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-03 15:49:54 -0400
message:
  * 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'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/finder.el                 finder.el-20091113204419-o5vbwnq5f7feedwu-499
  lisp/net/eww.el                eww.el-20130610114603-80ap3gwnw4x4m5ix-1
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-03 19:44:02 +0000
+++ b/lisp/ChangeLog    2013-09-03 19:49:54 +0000
@@ -1,5 +1,12 @@
 2013-09-03  Stefan Monnier  <address@hidden>
 
+       * 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.

=== modified file 'lisp/finder.el'
--- a/lisp/finder.el    2013-06-15 15:36:11 +0000
+++ b/lisp/finder.el    2013-09-03 19:49:54 +0000
@@ -225,8 +225,8 @@
              (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

=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el   2013-08-29 01:17:10 +0000
+++ b/lisp/net/eww.el   2013-09-03 19:49:54 +0000
@@ -159,7 +159,7 @@
           ((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 @@
                                  (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 @@
   "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 @@
       (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)

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2013-08-29 15:28:45 +0000
+++ b/src/lisp.h        2013-09-03 19:49:54 +0000
@@ -2630,19 +2630,6 @@
    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.  */