aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-07-28 00:14:07 +0200
committerPaul Eggert2013-07-28 00:14:07 +0200
commit94fea300fdf8322ddaddf50b2de592183d9aa71e (patch)
tree49f9a00c6c2364143b09bda11a6f147aa32ad15a
parent25ac1ded77db0e0a839841872dbd514c4c14956b (diff)
downloademacs-94fea300fdf8322ddaddf50b2de592183d9aa71e.tar.gz
emacs-94fea300fdf8322ddaddf50b2de592183d9aa71e.zip
Spelling fixes.
-rw-r--r--doc/misc/ido.texi12
-rw-r--r--src/ChangeLog.92
-rw-r--r--src/eval.c2
-rw-r--r--src/nsterm.m4
4 files changed, 10 insertions, 10 deletions
diff --git a/doc/misc/ido.texi b/doc/misc/ido.texi
index e61a90463c5..dbc35b09bb8 100644
--- a/doc/misc/ido.texi
+++ b/doc/misc/ido.texi
@@ -273,7 +273,7 @@ To go to the root directory (on the current drive), enter two slashes.
273On MS-DOS or Windows, to select the root of another drive, enter 273On MS-DOS or Windows, to select the root of another drive, enter
274@samp{X:/} where @samp{X} is the drive letter. To go to the home 274@samp{X:/} where @samp{X} is the drive letter. To go to the home
275directory, enter @samp{~/}. To enter Dired for this directory, use 275directory, enter @samp{~/}. To enter Dired for this directory, use
276@kbd{C-d}. 276@kbd{C-d}.
277 277
278@c TODO: a new node for ftp hosts 278@c TODO: a new node for ftp hosts
279@cindex ftp hosts 279@cindex ftp hosts
@@ -587,14 +587,14 @@ if you type a dot as first char (even if @code{ido-enable-prefix} is
587@c @defvr {User Option} ido-rotate-file-list-default 587@c @defvr {User Option} ido-rotate-file-list-default
588@c @defvr {User Option} ido-enter-matching-directory 588@c @defvr {User Option} ido-enter-matching-directory
589@c @defvr {User Option} ido-create-new-buffer 589@c @defvr {User Option} ido-create-new-buffer
590@c @defvr {User Option} ido-setup-hook 590@c @defvr {User Option} ido-setup-hook
591@c @defvr {User Option} ido-separator 591@c @defvr {User Option} ido-separator
592@c @defvr {User Option} ido-decorations 592@c @defvr {User Option} ido-decorations
593@c @defvr {User Option} ido-use-virtual-buffers 593@c @defvr {User Option} ido-use-virtual-buffers
594@c @defvr {User Option} ido-use-faces 594@c @defvr {User Option} ido-use-faces
595@c @defvr {User Option} ido-make-file-list-hook 595@c @defvr {User Option} ido-make-file-list-hook
596@c @defvr {User Option} ido-make-dir-list-hook 596@c @defvr {User Option} ido-make-dir-list-hook
597@c @defvr {User Option} ido-make-buffer-list-hook 597@c @defvr {User Option} ido-make-buffer-list-hook
598@c @defvr {User Option} ido-rewrite-file-prompt-functions 598@c @defvr {User Option} ido-rewrite-file-prompt-functions
599@c @defvr {User Option} ido-completion-buffer 599@c @defvr {User Option} ido-completion-buffer
600@c @defvr {User Option} ido-completion-buffer-all-completions 600@c @defvr {User Option} ido-completion-buffer-all-completions
@@ -689,7 +689,7 @@ If you don't want to rely on the @code{ido-everywhere} functionality,
689@code{ido-read-directory-name} can be used by other packages to read a 689@code{ido-read-directory-name} can be used by other packages to read a
690buffer name, a file name, or a directory name in the @emph{Ido} way. 690buffer name, a file name, or a directory name in the @emph{Ido} way.
691 691
692@c @node Cheetsheet 692@c @node Cheatsheet
693 693
694@c * History and Acknowledgments:: How Ido came into being 694@c * History and Acknowledgments:: How Ido came into being
695@c @node History and Acknowledgments 695@c @node History and Acknowledgments
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index b451b78944f..2e1d41b2495 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -10644,7 +10644,7 @@
10644 (syms_of_xfns) [GLYPH_DEBUG]: Don't defsubr removed functions. 10644 (syms_of_xfns) [GLYPH_DEBUG]: Don't defsubr removed functions.
10645 (syms_of_xfns): Initialize Qcenter. 10645 (syms_of_xfns): Initialize Qcenter.
10646 10646
10647 * eval.c (Fsignal): If lisp_eval_depth or spepdl_size are near 10647 * eval.c (Fsignal): If lisp_eval_depth or specpdl_size are near
10648 to the limits, increase the limits. 10648 to the limits, increase the limits.
10649 10649
106502000-05-01 Kenichi Handa <handa@etl.go.jp> 106502000-05-01 Kenichi Handa <handa@etl.go.jp>
diff --git a/src/eval.c b/src/eval.c
index bb5d5efc9ba..cb716690e3c 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3481,7 +3481,7 @@ nearest activation frame. */)
3481 directly in the pre-existing specpdl elements (i.e. we swap the current 3481 directly in the pre-existing specpdl elements (i.e. we swap the current
3482 value and the old value stored in the specpdl), kind of like the inplace 3482 value and the old value stored in the specpdl), kind of like the inplace
3483 pointer-reversal trick. As it turns out, the rewind does the same as the 3483 pointer-reversal trick. As it turns out, the rewind does the same as the
3484 unwind, except it starts from the other end of the spepdl stack, so we use 3484 unwind, except it starts from the other end of the specpdl stack, so we use
3485 the same function for both unwind and rewind. */ 3485 the same function for both unwind and rewind. */
3486static void 3486static void
3487backtrace_eval_unrewind (int distance) 3487backtrace_eval_unrewind (int distance)
diff --git a/src/nsterm.m b/src/nsterm.m
index 61538798337..14706f6b91d 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4473,9 +4473,9 @@ ns_term_shutdown (int sig)
4473 4473
4474#ifdef NS_IMPL_COCOA 4474#ifdef NS_IMPL_COCOA
4475 /* If no dialog and none of our frames have focus and it is a move, skip it. 4475 /* If no dialog and none of our frames have focus and it is a move, skip it.
4476 It is a mouse move in an auxillary menu, i.e. on the top right on OSX, 4476 It is a mouse move in an auxiliary menu, i.e. on the top right on OSX,
4477 such as Wifi, sound, date or similar. 4477 such as Wifi, sound, date or similar.
4478 This prevents "spooky" highlightning in the frame under the menu. */ 4478 This prevents "spooky" highlighting in the frame under the menu. */
4479 if (type == NSMouseMoved && [NSApp modalWindow] == nil) 4479 if (type == NSMouseMoved && [NSApp modalWindow] == nil)
4480 { 4480 {
4481 struct ns_display_info *di; 4481 struct ns_display_info *di;