diff options
| author | Glenn Morris | 2012-09-27 00:28:48 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-09-27 00:28:48 -0700 |
| commit | a88324d49c3dbc0c86a0e378880d7db27e9f32e5 (patch) | |
| tree | e871ec20b5d6630f273fd8939158835c58d1304c | |
| parent | 8e5064e528c40e8b5e8bd5b93ca6addd4ff99f08 (diff) | |
| download | emacs-a88324d49c3dbc0c86a0e378880d7db27e9f32e5.tar.gz emacs-a88324d49c3dbc0c86a0e378880d7db27e9f32e5.zip | |
* lisp/faces.el (x-display-name): Declare (for without-x builds).
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/faces.el | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf530346026..f259ec2b3fa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-09-27 Glenn Morris <rgm@gnu.org> | 1 | 2012-09-27 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * faces.el (x-display-name): Declare (for without-x builds). | ||
| 4 | |||
| 3 | * linum.el (linum-format): Don't autoload it. Improve :type. | 5 | * linum.el (linum-format): Don't autoload it. Improve :type. |
| 4 | 6 | ||
| 5 | * progmodes/tcl.el: Don't require outline when compiling. | 7 | * progmodes/tcl.el: Don't require outline when compiling. |
diff --git a/lisp/faces.el b/lisp/faces.el index 6a477e172e1..3ee859305a5 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -1867,6 +1867,7 @@ Return nil if it has no specified face." | |||
| 1867 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 1867 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 1868 | 1868 | ||
| 1869 | (declare-function x-parse-geometry "frame.c" (string)) | 1869 | (declare-function x-parse-geometry "frame.c" (string)) |
| 1870 | (defvar x-display-name) | ||
| 1870 | 1871 | ||
| 1871 | (defun x-handle-named-frame-geometry (parameters) | 1872 | (defun x-handle-named-frame-geometry (parameters) |
| 1872 | "Add geometry parameters for a named frame to parameter list PARAMETERS. | 1873 | "Add geometry parameters for a named frame to parameter list PARAMETERS. |