summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog.152
-rw-r--r--lisp/subr.el2
2 files changed, 2 insertions, 2 deletions
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))))