diff options
| author | Daniel Colascione <dancol@dancol.org> | 2012-09-17 04:07:36 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2012-09-17 04:07:36 -0800 |
| commit | 2ab329f3b5d52a39f0a45c3d9c129f1c19560142 (patch) | |
| tree | 6dd6784d63e54cb18071df8e28fbdbc27d418728 /lisp/frame.el | |
| parent | f701ab72dd55460d23c8b029550aa4d7ecef3cfa (diff) | |
| parent | bb7dce392f6d9d5fc4b9d7de09ff920a52f07669 (diff) | |
| download | emacs-2ab329f3b5d52a39f0a45c3d9c129f1c19560142.tar.gz | |
Merge from trunk
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 1e8883eb98e..b7b61bcc576 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -309,7 +309,7 @@ there (in decreasing order of priority)." ;; existing frame. We need to explicitly include ;; default-frame-alist in the parameters of the screen we ;; create here, so that its new value, gleaned from the user's - ;; .emacs file, will be applied to the existing screen. + ;; init file, will be applied to the existing screen. (if (not (eq (cdr (or (assq 'minibuffer initial-frame-alist) (assq 'minibuffer window-system-frame-alist) (assq 'minibuffer default-frame-alist) @@ -1668,6 +1668,10 @@ terminals, cursor blinking is controlled by the terminal." (make-variable-buffer-local 'show-trailing-whitespace) +;; Defined in dispnew.c. +(make-obsolete-variable + 'window-system-version "it does not give useful information." "24.3") + (provide 'frame) ;;; frame.el ends here |