[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 12a18d0 1/2: Quieten without-x lisp compilation
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 12a18d0 1/2: Quieten without-x lisp compilation |
Date: |
Mon, 26 Feb 2018 17:00:49 -0500 (EST) |
branch: master
commit 12a18d01b90839556fb37815874d043aedd24c9f
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Quieten without-x lisp compilation
* lisp/international/fontset.el (fontset-alias-alist):
* lisp/term/ns-win.el (mouse-wheel-scroll-amount)
(mouse-wheel-progressive-speed): Declare for without-x builds.
---
lisp/international/fontset.el | 2 ++
lisp/term/ns-win.el | 2 ++
2 files changed, 4 insertions(+)
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 6f91207..4a7b754 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1144,6 +1144,8 @@ given from DEFAULT-SPEC."
(setcar (cdr elt) spec)))
fontlist))
+(defvar fontset-alias-alist)
+
(defun fontset-name-p (fontset)
"Return non-nil if FONTSET is valid as fontset name.
A valid fontset name should conform to XLFD (X Logical Font Description)
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index b0d1731..1c7dd8a 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -739,6 +739,8 @@ See the documentation of `create-fontset-from-fontset-spec'
for the format.")
;;;; macOS 10.7+.
(defvar ns-version-string)
+(defvar mouse-wheel-scroll-amount)
+(defvar mouse-wheel-progressive-speed)
;; FIXME: This doesn't look right. Is there a better way to do this
;; that keeps customize happy?