diff options
author | Glenn Morris <rgm@gnu.org> | 2014-04-11 00:02:28 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2014-04-11 00:02:28 -0700 |
commit | fd492166113d8023d65b72b7db8b5d308bcc262d (patch) | |
tree | 67e2a65748e9c2c1df247c65964d0b7f1dac63a5 | |
parent | 9b1ac3be88fab32c29c1bd53a8d5eedd81a49cad (diff) | |
download | emacs-fd492166113d8023d65b72b7db8b5d308bcc262d.tar.gz |
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 @@ +2014-04-11 Glenn Morris <rgm@gnu.org> + + * term/w32-win.el (x-win-suspend-error): + * term/x-win.el (x-win-suspend-error): Sync docs. + 2014-04-10 Stefan Monnier <monnier@iro.umontreal.ca> 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 See the documentation of `create-fontset-from-fontset-spec' for the format.") (defun x-win-suspend-error () - "Report an error when a suspend is attempted." + "Report an error when a suspend is attempted. +This returns an error if any Emacs frames are X frames, or always under W32." (error "Suspending an Emacs running under W32 makes no sense")) (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'." ;;; Window system initialization. (defun x-win-suspend-error () + "Report an error when a suspend is attempted. +This returns an error if any Emacs frames are X frames, or always under W32." ;; Don't allow suspending if any of the frames are X frames. (if (memq 'x (mapcar 'window-system (frame-list))) (error "Cannot suspend Emacs while running under X"))) |