diff options
| author | Daniel Colascione <dancol@dancol.org> | 2012-10-07 14:31:58 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2012-10-07 14:31:58 -0800 |
| commit | 36a305a723c63fd345be65c536c52fe9765c14be (patch) | |
| tree | fb89d9e103552863214c60297a65320917109357 /lisp/faces.el | |
| parent | 2ab329f3b5d52a39f0a45c3d9c129f1c19560142 (diff) | |
| parent | 795b1482a9e314cda32d62ac2988f573d359366e (diff) | |
| download | emacs-36a305a723c63fd345be65c536c52fe9765c14be.tar.gz | |
Merge from trunk
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index d004ae650cb..08aa800c067 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1867,6 +1867,7 @@ Return nil if it has no specified face." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (declare-function x-parse-geometry "frame.c" (string)) +(defvar x-display-name) (defun x-handle-named-frame-geometry (parameters) "Add geometry parameters for a named frame to parameter list PARAMETERS. @@ -2271,8 +2272,6 @@ terminal type to a different value." :version "21.1" :group 'mode-line-faces :group 'basic-faces) -;; No need to define aliases of this form for new faces. -(define-obsolete-face-alias 'modeline 'mode-line "21.1") (defface mode-line-inactive '((default |