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 /lisp/frame.el | |
| parent | 541a60108d8777119430953245ee530665e603ff (diff) | |
| download | emacs-780407cff13149c73085c5797c14dc0b7469fbcd.tar.gz | |
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.
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 4 |
1 files changed, 2 insertions, 2 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. |