Commit 780407cf authored by Glenn Morris's avatar Glenn Morris

Small fixes prompted by make check-declare

* lisp/frame.el (x-focus-frame): Update declaration.
(ns-mouse-absolute-pixel-position): Fix declaration.
* lisp/vc/diff-mode.el (diff-refine-hunk):
Use smerge-refine-regions rather than obsolete alias.
(smerge-refine-subst): Remove declaration, no longer relevant.
parent 541a6010
......@@ -800,7 +800,7 @@ the user during startup."
(nreverse frame-initial-geometry-arguments))
(cdr param-list))
(declare-function x-focus-frame "frame.c" (frame))
(declare-function x-focus-frame "frame.c" (frame &optional noactivate))
(defun select-frame-set-input-focus (frame &optional norecord)
"Select FRAME, raise it, and set input focus, if possible.
......@@ -1484,7 +1484,7 @@ FRAME."
(declare-function w32-mouse-absolute-pixel-position "w32fns.c")
(declare-function x-mouse-absolute-pixel-position "xfns.c")
(declare-function ns-mouse-absolute-pixel-position "nsfns.c")
(declare-function ns-mouse-absolute-pixel-position "nsfns.m")
(defun mouse-absolute-pixel-position ()
"Return absolute position of mouse cursor in pixels.
......@@ -2005,9 +2005,6 @@ For use in `add-log-current-defun-function'."
(replace-match (cdr (assq (char-before) '((?+ . "-") (?> . "<"))))))
(declare-function smerge-refine-subst "smerge-mode"
(beg1 end1 beg2 end2 props-c &optional preproc props-r props-a))
(defun diff--forward-while-leading-char (char bound)
"Move point until reaching a line not starting with CHAR.
Return new point, if it was moved."
......@@ -2049,13 +2046,13 @@ Return new point, if it was moved."
(diff--forward-while-leading-char ?+ end)
(progn (diff--forward-while-leading-char ?\\ end)
(setq end-add (point))))
(smerge-refine-subst beg-del beg-add beg-add end-add
(smerge-refine-regions beg-del beg-add beg-add end-add
nil 'diff-refine-preproc props-r props-a)))))
(let* ((middle (save-excursion (re-search-forward "^---")))
(other middle))
(while (re-search-forward "^\\(?:!.*\n\\)+" middle t)
(smerge-refine-subst (match-beginning 0) (match-end 0)
(smerge-refine-regions (match-beginning 0) (match-end 0)
(goto-char other)
(re-search-forward "^\\(?:!.*\n\\)+" end)
......@@ -2070,7 +2067,7 @@ Return new point, if it was moved."
(let ((beg1 (1+ (point))))
(when (re-search-forward "^---.*\n" end t)
;; It's a combined add&remove, so there's something to do.
(smerge-refine-subst beg1 (match-beginning 0)
(smerge-refine-regions beg1 (match-beginning 0)
(match-end 0) end
nil 'diff-refine-preproc props-r props-a)))))))))
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