summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.22
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/ChangeLog.152
-rw-r--r--lisp/subr.el2
-rw-r--r--src/ChangeLog.122
5 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2
index b2dc6c5dd30..2197c41b1c4 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -16990,7 +16990,7 @@
2015-09-01 Paul Eggert <eggert@cs.ucla.edu>
- terminal-init-w32console mimicks command-line
+ terminal-init-w32console mimics command-line
Problem reported by Eli Zaretskii.
* lisp/startup.el (startup--setup-quote-display):
New function, refactored from a part of ‘command-line’.
diff --git a/etc/NEWS b/etc/NEWS
index f5e5548ad63..fe7df96ecea 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1785,7 +1785,7 @@ function 'encode-time', which already accepted a simple time zone rule
argument, has been extended to accept all the new forms.
*** Incompatible change in the third argument of 'format-time-string'.
-Previously, any non-nil argument was interpeted as specifying Universal Time.
+Previously, any non-nil argument was interpreted as specifying Universal Time.
This is no longer true; packages that want Universal Time should pass t
as the third argument.
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 88f5487ca74..46fa01acc5e 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -5820,7 +5820,7 @@
* epa.el (epa-passphrase-callback-function): Say what we're
querying the password for.
- * ibuffer.el (ibuffer-visit-buffer): To mimick list-buffers
+ * ibuffer.el (ibuffer-visit-buffer): To mimic list-buffers
behavior, don't bury the ibuffer buffer when visiting other buffers.
2010-10-08 Chong Yidong <cyd@stupidchicken.com>
diff --git a/lisp/subr.el b/lisp/subr.el
index 4202cc74d48..0fb4a2ec256 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2088,7 +2088,7 @@ some sort of escape sequence, the ambiguity is resolved via `read-key-delay'."
(cancel-timer timer)
;; For some reason, `read-key(-sequence)' leaves the prompt in the echo
;; area, whereas `read-event' seems to empty it just before returning
- ;; (bug#22714). So, let's mimick the behavior of `read-event'.
+ ;; (bug#22714). So, let's mimic the behavior of `read-event'.
(message nil)
(use-global-map old-global-map))))
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index 3045ecdca92..b2df482ba77 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -2895,7 +2895,7 @@
(wait_reading_process_output, init_process_emacs):
Assume O_NONBLOCK.
(wait_reading_process_output): Put in a special case for WINDOWSNT
- to mimick the older behavior where it had O_NDELAY but not O_NONBLOCK.
+ to mimic the older behavior where it had O_NDELAY but not O_NONBLOCK.
It's not clear this is needed, but it's a more-conservative change.
(create_process): Assume FD_CLOEXEC.
(create_process, create_pty): Assume O_NOCTTY.