[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r116941: Doc fix for x-win-suspend-error
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-24 r116941: Doc fix for x-win-suspend-error |
Date: |
Fri, 11 Apr 2014 07:02:39 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116941
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-04-11 00:02:28 -0700
message:
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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/term/w32-win.el w32win.el-20091113204419-o5vbwnq5f7feedwu-943
lisp/term/x-win.el xwin.el-20091113204419-o5vbwnq5f7feedwu-113
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-04-11 00:55:58 +0000
+++ b/lisp/ChangeLog 2014-04-11 07:02:28 +0000
@@ -1,3 +1,8 @@
+2014-04-11 Glenn Morris <address@hidden>
+
+ * term/w32-win.el (x-win-suspend-error):
+ * term/x-win.el (x-win-suspend-error): Sync docs.
+
2014-04-10 Stefan Monnier <address@hidden>
Ediff's overlay priorities cause more trouble than they solve.
=== modified file 'lisp/term/w32-win.el'
--- a/lisp/term/w32-win.el 2014-01-01 07:43:34 +0000
+++ b/lisp/term/w32-win.el 2014-04-11 07:02:28 +0000
@@ -206,7 +206,8 @@
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)
=== modified file 'lisp/term/x-win.el'
--- a/lisp/term/x-win.el 2014-01-01 07:43:34 +0000
+++ b/lisp/term/x-win.el 2014-04-11 07:02:28 +0000
@@ -1326,6 +1326,8 @@
;;; 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")))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r116941: Doc fix for x-win-suspend-error,
Glenn Morris <=