diff options
| author | Glenn Morris | 2019-12-25 07:50:19 -0800 |
|---|---|---|
| committer | Glenn Morris | 2019-12-25 07:50:19 -0800 |
| commit | 2bb7bb4abfa5667ba5cd220ca3dd89731f33ff09 (patch) | |
| tree | 3317f66921cf3cd0d787816217bfd056e2bc2a3f /lisp/term.el | |
| parent | 93d4725f9ceabfaf40e75ecf2e28b67789741941 (diff) | |
| parent | ca6a53d3bc91d6fef9aa872495ab74298ce91bee (diff) | |
| download | emacs-2bb7bb4abfa5667ba5cd220ca3dd89731f33ff09.tar.gz emacs-2bb7bb4abfa5667ba5cd220ca3dd89731f33ff09.zip | |
Merge from origin/emacs-27
ca6a53d3bc Don't default to showing X-Faces externally in Gnus
dbf4b5b2d0 Fix manual typo in Special Read Syntax
a9fe6dfa90 Fix problem with emacs -nw / eww / svg
0de63092c8 Clarify base64 requirements and say what {en,de}code_codin...
6184aa003f ; * etc/NEWS: Fix boring oddities.
51ea32dd12 * src/emacs-module.h.in: Add reference to manual.
75d0cef20d Trivial docstring fixes
ee12c421b6 imagemagick-types needs to initialize ImageMagick
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/term.el')
| -rw-r--r-- | lisp/term.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/term.el b/lisp/term.el index 50a0c80bcfd..29898dfce94 100644 --- a/lisp/term.el +++ b/lisp/term.el | |||
| @@ -87,7 +87,7 @@ | |||
| 87 | ;; for maintenance reasons, you have to edit files 'as root': before | 87 | ;; for maintenance reasons, you have to edit files 'as root': before |
| 88 | ;; patching term.el, I su-ed in a term.el buffer and used vi :), now I | 88 | ;; patching term.el, I su-ed in a term.el buffer and used vi :), now I |
| 89 | ;; simply do a C-x C-f and, via ange-ftp, the file is automatically loaded | 89 | ;; simply do a C-x C-f and, via ange-ftp, the file is automatically loaded |
| 90 | ;; 'as-root'. ( If you don't want to enter the root password every time you | 90 | ;; 'as-root'. (If you don't want to enter the root password every time you |
| 91 | ;; can put it in your .netrc: note that this is -not- advisable if you're | 91 | ;; can put it in your .netrc: note that this is -not- advisable if you're |
| 92 | ;; connected to the internet or if somebody else works on your workstation!) | 92 | ;; connected to the internet or if somebody else works on your workstation!) |
| 93 | ;; | 93 | ;; |