aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2015-10-14 14:46:22 -0700
committerPaul Eggert2015-10-14 14:46:50 -0700
commit943f7f902ed3d7a5ce00bbb5a9cc60e01607b661 (patch)
treea0be093da01a59e6d4d14ea9203e3c7a25cf9106 /lisp
parent100a96c92ba9cdf49f695edcf74975321eafae2e (diff)
downloademacs-943f7f902ed3d7a5ce00bbb5a9cc60e01607b661.tar.gz
emacs-943f7f902ed3d7a5ce00bbb5a9cc60e01607b661.zip
Spelling fixes
* configure.ac (bitmapdir): Fix misspelling of bmd_acc. * test/automated/coding-tests.el (ert-test-coding-bogus-coding-systems): Fix misspelling of nonexistent file name.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog.174
-rw-r--r--lisp/net/shr.el2
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index a40f8f3d67a..8a255d756f1 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -10383,13 +10383,13 @@
10383 (todo-move-category): Keep the moved category's name unless the 10383 (todo-move-category): Keep the moved category's name unless the
10384 file moved to already has a category with that name. If the 10384 file moved to already has a category with that name. If the
10385 numerically last category of the source file was moved, make the 10385 numerically last category of the source file was moved, make the
10386 first category current to avoid selecting a nonexisting category. 10386 first category current to avoid selecting a nonexistent category.
10387 (todo-merge-category): Fix implementation to make merging to a 10387 (todo-merge-category): Fix implementation to make merging to a
10388 category in another file work as documented. Eliminate now 10388 category in another file work as documented. Eliminate now
10389 insufficient and unnecessary renaming of archive category, correct 10389 insufficient and unnecessary renaming of archive category, correct
10390 document string accordingly, and clarify it. If the numerically 10390 document string accordingly, and clarify it. If the numerically
10391 last category of the source file was merged, make the first 10391 last category of the source file was merged, make the first
10392 category current to avoid selecting a nonexisting category. 10392 category current to avoid selecting a nonexistent category.
10393 (todo-archive-done-item): When there are marked items and point 10393 (todo-archive-done-item): When there are marked items and point
10394 happens to be on an unmarked item, ignore the latter. Don't leave 10394 happens to be on an unmarked item, ignore the latter. Don't leave
10395 point below last item after archiving marked items. 10395 point below last item after archiving marked items.
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 9116e506756..58deaea6f53 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -463,7 +463,7 @@ size, and full-buffer size."
463 ;; Adjust the window width for when 463 ;; Adjust the window width for when
464 ;; the user disables the fringes, 464 ;; the user disables the fringes,
465 ;; which causes the display engine 465 ;; which causes the display engine
466 ;; usurp one coplumn for the 466 ;; to usurp one column for the
467 ;; continuation glyph. 467 ;; continuation glyph.
468 (if (and (null shr-width) 468 (if (and (null shr-width)
469 (or (zerop (fringe-columns 'right)) 469 (or (zerop (fringe-columns 'right))