diff options
| author | Glenn Morris | 2013-09-17 20:58:26 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-09-17 20:58:26 -0700 |
| commit | 4bd4c0afe0d700edbf8baa68ffb371b6c900b576 (patch) | |
| tree | 3a0968133f252b888a3af7adf0598e3db7cab97b | |
| parent | 76e6957735732e586de6276b9ae4e647ce1e9cf4 (diff) | |
| download | emacs-4bd4c0afe0d700edbf8baa68ffb371b6c900b576.tar.gz emacs-4bd4c0afe0d700edbf8baa68ffb371b6c900b576.zip | |
* frame.el (x-display-name): Declare.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/frame.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e92acb0dba0..b1bd0006438 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | * faces.el (x-display-list, x-open-connection, x-get-resource): | 11 | * faces.el (x-display-list, x-open-connection, x-get-resource): |
| 12 | Declare. | 12 | Declare. |
| 13 | 13 | ||
| 14 | * frame.el (x-display-grayscale-p): Declare. | 14 | * frame.el (x-display-grayscale-p, x-display-name): Declare. |
| 15 | 15 | ||
| 16 | * simple.el (font-info): Declare. | 16 | * simple.el (font-info): Declare. |
| 17 | 17 | ||
diff --git a/lisp/frame.el b/lisp/frame.el index 1980e639283..8e336629123 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -590,6 +590,8 @@ The functions are run with one arg, the newly created frame.") | |||
| 590 | ;; FIXME: Shouldn't we add `font' here as well? | 590 | ;; FIXME: Shouldn't we add `font' here as well? |
| 591 | "Parameters `make-frame' copies from the `selected-frame' to the new frame.") | 591 | "Parameters `make-frame' copies from the `selected-frame' to the new frame.") |
| 592 | 592 | ||
| 593 | (defvar x-display-name) | ||
| 594 | |||
| 593 | (defun make-frame (&optional parameters) | 595 | (defun make-frame (&optional parameters) |
| 594 | "Return a newly created frame displaying the current buffer. | 596 | "Return a newly created frame displaying the current buffer. |
| 595 | Optional argument PARAMETERS is an alist of frame parameters for | 597 | Optional argument PARAMETERS is an alist of frame parameters for |