aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-12-08 13:23:50 -0800
committerPaul Eggert2013-12-08 13:23:50 -0800
commit09a7c0fe672cbcbbc654262b0708b3dc71bc8820 (patch)
treeacdd8a78d13ba59b309197b4022bc63b3d8fc21c
parent83a5a2c877e0208cfcfaa9bb84b26366a1b48fad (diff)
downloademacs-09a7c0fe672cbcbbc654262b0708b3dc71bc8820.tar.gz
emacs-09a7c0fe672cbcbbc654262b0708b3dc71bc8820.zip
Spelling fixes.
-rw-r--r--lisp/ChangeLog.102
-rw-r--r--lisp/emacs-lisp/debug.el2
-rw-r--r--lisp/org/ox-ascii.el2
-rw-r--r--src/ChangeLog.34
-rw-r--r--src/eval.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 30afe9ce970..74e05e40410 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -5639,7 +5639,7 @@
5639 add handling of entry attributes using diary-pull-attrs. 5639 add handling of entry attributes using diary-pull-attrs.
5640 (mark-calendar-days-named, mark-calendar-days-named) 5640 (mark-calendar-days-named, mark-calendar-days-named)
5641 (mark-calendar-date-pattern, mark-calendar-month) 5641 (mark-calendar-date-pattern, mark-calendar-month)
5642 (add-to-diary-list): Add optional paramater `color' for passing 5642 (add-to-diary-list): Add optional parameter `color' for passing
5643 face attribute info through the callchain. Pass this parameter around. 5643 face attribute info through the callchain. Pass this parameter around.
5644 5644
56452003-02-11 Stefan Monnier <monnier@cs.yale.edu> 56452003-02-11 Stefan Monnier <monnier@cs.yale.edu>
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 87d1d1eae64..dbd0f092446 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -642,7 +642,7 @@ The environment used is the one when entering the activation frame at point."
642 (define-key map "h" 'describe-mode) 642 (define-key map "h" 'describe-mode)
643 (define-key map "q" 'top-level) 643 (define-key map "q" 'top-level)
644 (define-key map "e" 'debugger-eval-expression) 644 (define-key map "e" 'debugger-eval-expression)
645 (define-key map "v" 'debugger-toggle-locals) ;"v" is for "v"ariables. 645 (define-key map "v" 'debugger-toggle-locals) ; "v" is for "variables".
646 (define-key map " " 'next-line) 646 (define-key map " " 'next-line)
647 (define-key map "R" 'debugger-record-expression) 647 (define-key map "R" 'debugger-record-expression)
648 (define-key map "\C-m" 'debug-help-follow) 648 (define-key map "\C-m" 'debug-help-follow)
diff --git a/lisp/org/ox-ascii.el b/lisp/org/ox-ascii.el
index 55bda8368e0..ad44517fb6c 100644
--- a/lisp/org/ox-ascii.el
+++ b/lisp/org/ox-ascii.el
@@ -1198,7 +1198,7 @@ contextual information."
1198 (todo type priority name tags contents width inlinetask info) 1198 (todo type priority name tags contents width inlinetask info)
1199 "Format an inline task element for ASCII export. 1199 "Format an inline task element for ASCII export.
1200See `org-ascii-format-inlinetask-function' for a description 1200See `org-ascii-format-inlinetask-function' for a description
1201of the paramaters." 1201of the parameters."
1202 (let* ((utf8p (eq (plist-get info :ascii-charset) 'utf-8)) 1202 (let* ((utf8p (eq (plist-get info :ascii-charset) 'utf-8))
1203 (width (or width org-ascii-inlinetask-width))) 1203 (width (or width org-ascii-inlinetask-width)))
1204 (org-ascii--indent-string 1204 (org-ascii--indent-string
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index fb1b96f738c..ff0f4bf7ae8 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -12845,8 +12845,8 @@
12845 longer DEFVARed: they are already declared in window.c. 12845 longer DEFVARed: they are already declared in window.c.
12846 12846
12847 * screen.c (window_from_coordinates): Use Fnext_window, even if 12847 * screen.c (window_from_coordinates): Use Fnext_window, even if
12848 MULTI_SCREEN, to obtain the next window. This is an test. 12848 MULTI_SCREEN, to obtain the next window. This is a test.
12849 Also, new paramater part returns text or modeline symbol. 12849 Also, new parameter part returns text or modeline symbol.
12850 (Flocate_window_from_coordinates): Pass &part to 12850 (Flocate_window_from_coordinates): Pass &part to
12851 window_from_coordinates. 12851 window_from_coordinates.
12852 (coordinates_in_window): Don't say modeline if window_height is 1, 12852 (coordinates_in_window): Don't say modeline if window_height is 1,
diff --git a/src/eval.c b/src/eval.c
index 81666830f4e..1dca9295cfb 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3597,7 +3597,7 @@ NFRAMES and BASE specify the activation frame to use, as in `backtrace-frame'.
3597 /* The specpdl entries normally contain the symbol being bound along with its 3597 /* The specpdl entries normally contain the symbol being bound along with its
3598 `old_value', so it can be restored. The new value to which it is bound is 3598 `old_value', so it can be restored. The new value to which it is bound is
3599 available in one of two places: either in the current value of the 3599 available in one of two places: either in the current value of the
3600 variable (if it hasn't been rebount yet) or in the `old_value' slot of the 3600 variable (if it hasn't been rebound yet) or in the `old_value' slot of the
3601 next specpdl entry for it. 3601 next specpdl entry for it.
3602 `backtrace_eval_unrewind' happens to swap the role of `old_value' 3602 `backtrace_eval_unrewind' happens to swap the role of `old_value'
3603 and "new value", so we abuse it here, to fetch the new value. 3603 and "new value", so we abuse it here, to fetch the new value.