diff options
| author | Glenn Morris | 2014-04-11 00:02:28 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-04-11 00:02:28 -0700 |
| commit | fd492166113d8023d65b72b7db8b5d308bcc262d (patch) | |
| tree | 67e2a65748e9c2c1df247c65964d0b7f1dac63a5 | |
| parent | 9b1ac3be88fab32c29c1bd53a8d5eedd81a49cad (diff) | |
| download | emacs-fd492166113d8023d65b72b7db8b5d308bcc262d.tar.gz emacs-fd492166113d8023d65b72b7db8b5d308bcc262d.zip | |
Doc fix for x-win-suspend-error
* lisp/term/w32-win.el (x-win-suspend-error):
* lisp/term/x-win.el (x-win-suspend-error): Sync docs.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 3 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 94cfda082ea..9a9d422e8b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-04-11 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * term/w32-win.el (x-win-suspend-error): | ||
| 4 | * term/x-win.el (x-win-suspend-error): Sync docs. | ||
| 5 | |||
| 1 | 2014-04-10 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-04-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | Ediff's overlay priorities cause more trouble than they solve. | 8 | Ediff's overlay priorities cause more trouble than they solve. |
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 96cf0838cb2..e2cabe5397d 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el | |||
| @@ -206,7 +206,8 @@ European languages which are distributed with Windows as | |||
| 206 | See the documentation of `create-fontset-from-fontset-spec' for the format.") | 206 | See the documentation of `create-fontset-from-fontset-spec' for the format.") |
| 207 | 207 | ||
| 208 | (defun x-win-suspend-error () | 208 | (defun x-win-suspend-error () |
| 209 | "Report an error when a suspend is attempted." | 209 | "Report an error when a suspend is attempted. |
| 210 | This returns an error if any Emacs frames are X frames, or always under W32." | ||
| 210 | (error "Suspending an Emacs running under W32 makes no sense")) | 211 | (error "Suspending an Emacs running under W32 makes no sense")) |
| 211 | 212 | ||
| 212 | (defvar dynamic-library-alist) | 213 | (defvar dynamic-library-alist) |
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 6ba348d8c79..964b9112553 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el | |||
| @@ -1326,6 +1326,8 @@ Request data types in the order specified by `x-select-request-type'." | |||
| 1326 | ;;; Window system initialization. | 1326 | ;;; Window system initialization. |
| 1327 | 1327 | ||
| 1328 | (defun x-win-suspend-error () | 1328 | (defun x-win-suspend-error () |
| 1329 | "Report an error when a suspend is attempted. | ||
| 1330 | This returns an error if any Emacs frames are X frames, or always under W32." | ||
| 1329 | ;; Don't allow suspending if any of the frames are X frames. | 1331 | ;; Don't allow suspending if any of the frames are X frames. |
| 1330 | (if (memq 'x (mapcar 'window-system (frame-list))) | 1332 | (if (memq 'x (mapcar 'window-system (frame-list))) |
| 1331 | (error "Cannot suspend Emacs while running under X"))) | 1333 | (error "Cannot suspend Emacs while running under X"))) |