Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
8b571bf3
Commit
8b571bf3
authored
Nov 21, 2009
by
Jan Djärv
Browse files
* cus-start.el (all): Add native condition for font-use-system-font.
* configure.in: Don't check for GConf unless X is used.
parent
872870b2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
2 deletions
+12
-2
ChangeLog
ChangeLog
+4
-0
configure
configure
+1
-1
configure.in
configure.in
+1
-1
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/cus-start.el
lisp/cus-start.el
+2
-0
No files found.
ChangeLog
View file @
8b571bf3
2009-11-21 Jan Djärv <jan.h.d@swipnet.se>
* configure.in: Don't check for GConf unless X is used.
2009-11-20 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in: Use -Wdeclaration-after-statement if available.
...
...
configure
View file @
8b571bf3
...
...
@@ -12588,7 +12588,7 @@ done
fi
HAVE_GCONF=no
if test "${with_gconf}" = "yes"; then
if test
"X$with_x" != "Xno" && test
"${with_gconf}" = "yes"; then
succeeded=no
...
...
configure.in
View file @
8b571bf3
...
...
@@ -1756,7 +1756,7 @@ fi
dnl GConf has been tested under GNU/Linux only.
dnl The version is really arbitrary, it is about the same age as Gtk+ 2.6.
HAVE_GCONF=no
if test "${with_gconf}" = "yes"; then
if test
"X$with_x" != "Xno" && test
"${with_gconf}" = "yes"; then
PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.13, HAVE_GCONF=yes, HAVE_GCONF=no)
if test "$HAVE_GCONF" = yes; then
AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if using GConf.])
...
...
lisp/ChangeLog
View file @
8b571bf3
2009-11-21 Jan Djärv <jan.h.d@swipnet.se>
* cus-start.el (all): Add native condition for font-use-system-font.
2009-11-21 Nathaniel Flath <flat0103@gmail.com>
* progmodes/cc-menus.el (cc-imenu-java-generic-expression): A
...
...
lisp/cus-start.el
View file @
8b571bf3
...
...
@@ -397,6 +397,8 @@ since it could result in memory overflow and make Emacs crash."
(fboundp 'x-selection-exists-p))
((string-match "
fringe
" (symbol-name symbol))
(fboundp 'define-fringe-bitmap))
((equal "
font-use-system-font
" (symbol-name symbol))
(featurep 'system-font-setting))
(t t))))
(if (not (boundp symbol))
;; If variables are removed from C code, give an error here!
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment