Commit fde38d49 authored by Stefan Monnier's avatar Stefan Monnier

* 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'.
parent 84032db7
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.
......
......@@ -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
......
......@@ -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)
......
......@@ -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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment