diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-12-14 21:31:28 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-12-14 21:31:28 -0500 |
| commit | 780407cff13149c73085c5797c14dc0b7469fbcd (patch) | |
| tree | 0db5019248a16de4651774f71c3cca1b0fbd15fc | |
| parent | 541a60108d8777119430953245ee530665e603ff (diff) | |
| download | emacs-780407cff13149c73085c5797c14dc0b7469fbcd.tar.gz emacs-780407cff13149c73085c5797c14dc0b7469fbcd.tar.bz2 emacs-780407cff13149c73085c5797c14dc0b7469fbcd.zip | |
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.
| -rw-r--r-- | lisp/frame.el | 4 | ||||
| -rw-r--r-- | lisp/vc/diff-mode.el | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 2e925325a9e..6f8d6a1cc9a 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -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. diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index df9627abdf0..df33d10ed0c 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -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))))) (`context (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) (save-excursion (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))))))))) |