diff options
| author | Glenn Morris | 2018-02-09 11:12:48 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-02-09 11:12:48 -0800 |
| commit | 875cb835f00260d58c536b3a3f7c0343fd5f28dc (patch) | |
| tree | 4f59af87328e8d4d69667b3b35c42f795e7d3d29 /lisp/term | |
| parent | 05e8b4392be7fb368dcf4e4a19f75f94b323028d (diff) | |
| parent | 0276743672672ce0caec7861741293a4ae11cb52 (diff) | |
| download | emacs-875cb835f00260d58c536b3a3f7c0343fd5f28dc.tar.gz emacs-875cb835f00260d58c536b3a3f7c0343fd5f28dc.zip | |
Merge from origin/emacs-26
0276743 (origin/emacs-26) Doc string fix in latin-alt.el
c9269af Minor improvements in package.texi
898a3e4 Minor improvement in Emacs user manual
8f7d718 * doc/lispref/anti.texi (Antinews): Replace 25.2 with 25.3.
989d0af Improve documentation of mini-window resizing
923e415 More changes in the Emacs manual
565adf2 Clarify that text-quoting-style doesn't affect *Info* (Bug#24...
2dd273b Mention that shell quoting of % on w32 may fail (Bug#19350)
19fa6d5 Fix --no-build-details for w32 and macOS
979944c * doc/lispref/anti.texi (Antinews): Add some more antinews.
c2727e3 Fix crashes when run with --no-build-details
dc08490 More changes for the manual
04c5bd5 Doc fixes for process functions (Bug#30349)
e209034 Fix shr and CSS 4 color maps
5fe8192 Yet another round of improvements in the manual
Conflicts:
doc/emacs/files.texi
test/lisp/subr-tests.el
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/ns-win.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index aa3113bd340..f8da1b21965 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el | |||
| @@ -842,7 +842,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") | |||
| 842 | (format "Creation of the standard fontset failed: %s" err) | 842 | (format "Creation of the standard fontset failed: %s" err) |
| 843 | :error))) | 843 | :error))) |
| 844 | 844 | ||
| 845 | (x-open-connection (system-name) x-command-line-resources t) | 845 | (x-open-connection (or (system-name) "") x-command-line-resources t) |
| 846 | 846 | ||
| 847 | ;; Add GNUstep menu items Services, Hide and Quit. Rename Help to Info | 847 | ;; Add GNUstep menu items Services, Hide and Quit. Rename Help to Info |
| 848 | ;; and put it first (i.e. omit from menu-bar-final-items. | 848 | ;; and put it first (i.e. omit from menu-bar-final-items. |