diff options
| author | Joakim Verona | 2013-08-13 04:56:39 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 04:56:39 +0200 |
| commit | b3797d24ab7fd78fe54583b5f9a59e7bc87208cd (patch) | |
| tree | b3145455d62877a5ba2d228ea3971fffdc07da0f /lisp | |
| parent | 71c3ecbadba97c8502afe8f5ab5b1b6edbf3f39a (diff) | |
| parent | 916119ec9eecb97a2834896d80b286ddb9cf423c (diff) | |
| download | emacs-b3797d24ab7fd78fe54583b5f9a59e7bc87208cd.tar.gz emacs-b3797d24ab7fd78fe54583b5f9a59e7bc87208cd.zip | |
merge from trunk
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/frame.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 31a9123503d..79394bd305b 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -1442,6 +1442,8 @@ monitor, use `display-monitor-attributes-list'." | |||
| 1442 | 1442 | ||
| 1443 | (declare-function x-display-backing-store "xfns.c" (&optional terminal)) | 1443 | (declare-function x-display-backing-store "xfns.c" (&optional terminal)) |
| 1444 | 1444 | ||
| 1445 | ;; In NS port, the return value may be `buffered', `retained', or | ||
| 1446 | ;; `non-retained'. See src/nsfns.m. | ||
| 1445 | (defun display-backing-store (&optional display) | 1447 | (defun display-backing-store (&optional display) |
| 1446 | "Return the backing store capability of DISPLAY's screen. | 1448 | "Return the backing store capability of DISPLAY's screen. |
| 1447 | The value may be `always', `when-mapped', `not-useful', or nil if | 1449 | The value may be `always', `when-mapped', `not-useful', or nil if |