aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2016-11-19 14:57:40 -0800
committerPaul Eggert2016-11-19 14:58:05 -0800
commit493a8f33ba916403d1fab620e08146632b826101 (patch)
tree8b22565216131fc84ef326d80e2aca1b7639bde9
parent870c56a0bd8fe51baa2efa20a75b848f2bd27fd4 (diff)
downloademacs-493a8f33ba916403d1fab620e08146632b826101.tar.gz
emacs-493a8f33ba916403d1fab620e08146632b826101.zip
; Spelling fixes
-rw-r--r--etc/NEWS2
-rw-r--r--etc/PROBLEMS4
-rw-r--r--lisp/net/tramp.el2
-rw-r--r--lisp/progmodes/verilog-mode.el2
-rw-r--r--src/fileio.c4
-rw-r--r--src/process.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 403f7f70c28..bd83c6028c0 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -556,7 +556,7 @@ variable.
556eval-current-buffer, string-to-int 556eval-current-buffer, string-to-int
557*** All the default-FOO variables that hold the default value of the 557*** All the default-FOO variables that hold the default value of the
558FOO variable. Use 'default-value' and 'setq-default' to access and 558FOO variable. Use 'default-value' and 'setq-default' to access and
559change FOO, repectively. The exhaustive list of removed variables is: 559change FOO, respectively. The exhaustive list of removed variables is:
560'default-mode-line-format', 'default-header-line-format', 560'default-mode-line-format', 'default-header-line-format',
561'default-line-spacing', 'default-abbrev-mode', 'default-ctl-arrow', 561'default-line-spacing', 'default-abbrev-mode', 'default-ctl-arrow',
562'default-truncate-lines', 'default-left-margin', 'default-tab-width', 562'default-truncate-lines', 'default-left-margin', 'default-tab-width',
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index bbf865cf3f8..c9b11fbc56c 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2423,8 +2423,8 @@ If you do, please send it to bug-gnu-emacs@gnu.org so we can list it here.
2423The implementation of that function on Mac OS X uses pathconf with the 2423The implementation of that function on Mac OS X uses pathconf with the
2424_PC_CASE_SENSITIVE flag. There have been reports that this use of 2424_PC_CASE_SENSITIVE flag. There have been reports that this use of
2425pathconf does not work reliably. If you have a problem, please 2425pathconf does not work reliably. If you have a problem, please
2426recompile Emacs with -DDARWIN_OS_CASE_SENSITIVE_FIXME=1 or 2426recompile Emacs with -D DARWIN_OS_CASE_SENSITIVE_FIXME=1 or
2427-DDARWIN_OS_CASE_SENSITIVE_FIXME=2, and file a bug report saying 2427-D DARWIN_OS_CASE_SENSITIVE_FIXME=2, and file a bug report saying
2428whether this fixed your problem. 2428whether this fixed your problem.
2429 2429
2430* Build-time problems 2430* Build-time problems
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 60199d2047e..abe8de39b60 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2920,7 +2920,7 @@ User is always nil."
2920 (setq candidate 2920 (setq candidate
2921 (directory-file-name (file-name-directory candidate)))) 2921 (directory-file-name (file-name-directory candidate))))
2922 ;; Nothing found, so we must use a temporary file for 2922 ;; Nothing found, so we must use a temporary file for
2923 ;; comparision. `make-nearby-temp-file' is added to 2923 ;; comparison. `make-nearby-temp-file' is added to
2924 ;; Emacs 26+ like `file-name-case-insensitive-p', so 2924 ;; Emacs 26+ like `file-name-case-insensitive-p', so
2925 ;; there is no compatibility problem calling it. 2925 ;; there is no compatibility problem calling it.
2926 (unless 2926 (unless
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 5f07cbb329d..5368b613569 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -9435,7 +9435,7 @@ you can read them automatically with:
9435 // verilog-auto-read-includes:t 9435 // verilog-auto-read-includes:t
9436 // End: 9436 // End:
9437 9437
9438Or a more specific alternative example, which requires haing 9438Or a more specific alternative example, which requires having
9439`enable-local-eval' non-nil: 9439`enable-local-eval' non-nil:
9440 9440
9441 // Local Variables: 9441 // Local Variables:
diff --git a/src/fileio.c b/src/fileio.c
index 66a48733a6d..7aa58177d49 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2259,8 +2259,8 @@ file_name_case_insensitive_p (const char *filename)
2259 2259
2260 There have been reports that pathconf with _PC_CASE_SENSITIVE 2260 There have been reports that pathconf with _PC_CASE_SENSITIVE
2261 does not work reliably on Mac OS X. If you have a problem, 2261 does not work reliably on Mac OS X. If you have a problem,
2262 please recompile Emacs with -DDARWIN_OS_CASE_SENSITIVE_FIXME=1 or 2262 please recompile Emacs with -D DARWIN_OS_CASE_SENSITIVE_FIXME=1 or
2263 -DDARWIN_OS_CASE_SENSITIVE_FIXME=2, and file a bug report saying 2263 -D DARWIN_OS_CASE_SENSITIVE_FIXME=2, and file a bug report saying
2264 whether this fixed your problem. */ 2264 whether this fixed your problem. */
2265 2265
2266#ifdef _PC_CASE_INSENSITIVE 2266#ifdef _PC_CASE_INSENSITIVE
diff --git a/src/process.c b/src/process.c
index d68c930dd6f..49340b120ef 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3102,7 +3102,7 @@ finish_after_tls_connection (Lisp_Object proc)
3102 else if (p->outfd < 0) 3102 else if (p->outfd < 0)
3103 { 3103 {
3104 /* The counterparty may have closed the connection (especially 3104 /* The counterparty may have closed the connection (especially
3105 if the NSM promt above take a long time), so recheck the file 3105 if the NSM prompt above take a long time), so recheck the file
3106 descriptor here. */ 3106 descriptor here. */
3107 pset_status (p, Qfailed); 3107 pset_status (p, Qfailed);
3108 deactivate_process (proc); 3108 deactivate_process (proc);