diff options
| author | Marcin Borkowski <mbork@mbork.pl> | 2017-12-07 14:24:57 +0100 |
|---|---|---|
| committer | Marcin Borkowski <mbork@mbork.pl> | 2017-12-07 14:24:57 +0100 |
| commit | 0e3c10ce34c84d24013a84a725c6275ad87b1530 (patch) | |
| tree | c37c89b1087a00e4d4799e6f4123c48ffca30270 /lisp/term/x-win.el | |
| parent | ab5fc7c8215e1066449da4eb0e027f8250cc9f49 (diff) | |
| parent | d4db37b283daffa0f8c942a5b526b6444edc34c5 (diff) | |
| download | emacs-0e3c10ce34c84d24013a84a725c6275ad87b1530.tar.gz | |
Merge branch 'master' into fix/bug-20871
Diffstat (limited to 'lisp/term/x-win.el')
| -rw-r--r-- | lisp/term/x-win.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 532d0395cf4..e7b1e08b038 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -18,7 +18,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: @@ -1182,7 +1182,7 @@ as returned by `x-server-vendor'." This returns an error if any Emacs frames are X frames." ;; 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"))) + (error "Cannot suspend Emacs while an X GUI frame exists"))) (defvar x-initialized nil "Non-nil if the X window system has been initialized.") @@ -1287,7 +1287,7 @@ This returns an error if any Emacs frames are X frames." ;; During initialization, we defer sending size hints to the window ;; manager, because that can induce a race condition: - ;; http://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00033.html + ;; https://lists.gnu.org/r/emacs-devel/2008-10/msg00033.html ;; Send the size hints once initialization is done. (add-hook 'after-init-hook 'x-wm-set-size-hint) |