* progmodes/octave.el (inferior-octave-completion-table)

[gnu-emacs] / lisp / custom.el

diff --git a/lisp/custom.el b/lisp/custom.el
index 3db34e4d1fb10da98f510e9494e0b40154156833..d721198da0bb1b7eb537e157a6bf5fca94ba0308 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1,7 +1,6 @@
 ;;; custom.el --- tools for declaring and initializing options
 ;;
-;; Copyright (C) 1996-1997, 1999, 2001-2013 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1996-1997, 1999, 2001-2013 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
@@ -1416,6 +1415,10 @@ See `custom-enabled-themes' for a list of enabled themes."
       (setq custom-enabled-themes
            (delq theme custom-enabled-themes)))))
 
+;; Only used if window-system not null.
+(declare-function x-get-resource "frame.c"
+                 (attribute class &optional component subclass))
+
 (defun custom--frame-color-default (frame attribute resource-attr resource-class
                                          tty-default x-default)
   (let ((col (face-attribute 'default attribute t)))