diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-02-17 07:50:28 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-02-17 07:50:28 -0800 |
| commit | 4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch) | |
| tree | 6c0a7893b3aab0166b35938338fa289c3a01df74 /lisp/net | |
| parent | cb3863370cbe574810f796726faa39ba0de0a429 (diff) | |
| parent | e5a29330aae4491fd384bacaff6f453c6434d322 (diff) | |
| download | emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz | |
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes
f21f8e6 Document 'desktop-files-not-to-save'
d8917eb Improve documentation of Profiling features
b228839 Improve indexing of "performance" in ELisp manual
ab67b3e Minor change in Emacs manual's VC chapter
c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3...
593bbda Document comment-fill-column in the manual (Bug#11636)
bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
69107f3 ; Fix doc typos related to indefinite articles
aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
5906418 More fixes for the Emacs manual
9ab3df1 ; Fix doc typos related to indefinite articles
66a4e65 ; Fix doc typos related to indefinite articles
35e5c57 ; Fix doc typos related to indefinite articles
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/gnutls.el | 2 | ||||
| -rw-r--r-- | lisp/net/mailcap.el | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index ea17fb518e2..85c9308c0d2 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -202,7 +202,7 @@ For the meaning of the rest of the parameters, see `gnutls-boot-parameters'." "boot: %s" params) (when (gnutls-errorp ret) - ;; This is a error from the underlying C code. + ;; This is an error from the underlying C code. (signal 'gnutls-error (list process ret))) process)) diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el index 748fb398933..4ec00450f4e 100644 --- a/lisp/net/mailcap.el +++ b/lisp/net/mailcap.el @@ -92,7 +92,7 @@ replaced with the file. MIME-TYPE is a regular expression being matched against the actual MIME type. It is implicitly surrounded with ^ and $. -TEST is an lisp form which is evaluated in order to test if the +TEST is a lisp form which is evaluated in order to test if the entry should be chosen. The `test' entry is optional. When selecting a viewer for a given MIME type, the first viewer @@ -555,7 +555,7 @@ MAILCAPS if set; otherwise (on Unix) use the path from RFC 1524, plus (defun mailcap-mailcap-entry-passes-test (info) "Replace the test clause of INFO itself with a boolean for some cases. This function supports only `test -n $DISPLAY' and `test -z $DISPLAY', -replaces them with t or nil. As for others or if INFO has a interactive +replaces them with t or nil. As for others or if INFO has an interactive spec (needsterm, needsterminal, or needsx11) but DISPLAY is not set, the test clause will be unchanged." (let ((test (assq 'test info)) ; The test clause |