diff options
| author | Paul Eggert | 2011-12-05 00:55:25 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-12-05 00:55:25 -0800 |
| commit | fa46310344375ef5c114cbb94d4acea39ac29239 (patch) | |
| tree | 4d74de9694db1c199cd9301a27c48b4d4137cf0c | |
| parent | c3c9e25e5d2c222d9f79a503c714b48c06078c08 (diff) | |
| download | emacs-fa46310344375ef5c114cbb94d4acea39ac29239.tar.gz emacs-fa46310344375ef5c114cbb94d4acea39ac29239.zip | |
Spelling fixes.
60 files changed, 89 insertions, 90 deletions
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index b0090f0fb84..7c178757927 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi | |||
| @@ -608,7 +608,7 @@ scrolls back. | |||
| 608 | 608 | ||
| 609 | @item Using C-p and C-n with rebind gets into a locked state | 609 | @item Using C-p and C-n with rebind gets into a locked state |
| 610 | 610 | ||
| 611 | This happened a few times in Emacs 21, but has been unreproducible | 611 | This happened a few times in Emacs 21, but has been irreproducible |
| 612 | since. | 612 | since. |
| 613 | 613 | ||
| 614 | @item If an interactive process is currently running, @kbd{M-!} doesn't work | 614 | @item If an interactive process is currently running, @kbd{M-!} doesn't work |
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 69b17a94d68..5ae86c4e631 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi | |||
| @@ -8976,7 +8976,7 @@ Translate many non-@acronym{ASCII} characters into their | |||
| 8976 | @acronym{ASCII} equivalents (@code{gnus-article-treat-non-ascii}). | 8976 | @acronym{ASCII} equivalents (@code{gnus-article-treat-non-ascii}). |
| 8977 | This is mostly useful if you're on a terminal that has a limited font | 8977 | This is mostly useful if you're on a terminal that has a limited font |
| 8978 | and doesn't show accented characters, ``advanced'' punctuation, and the | 8978 | and doesn't show accented characters, ``advanced'' punctuation, and the |
| 8979 | like. For instance, @samp{»} is tranlated into @samp{>>}, and so on. | 8979 | like. For instance, @samp{»} is translated into @samp{>>}, and so on. |
| 8980 | 8980 | ||
| 8981 | @item W Y f | 8981 | @item W Y f |
| 8982 | @kindex W Y f (Summary) | 8982 | @kindex W Y f (Summary) |
diff --git a/etc/NEWS.23 b/etc/NEWS.23 index 4e541c0deb3..6f1b50e8c7a 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 | |||
| @@ -903,7 +903,7 @@ mode-line information (e.g. waiting for a VC command to finish). | |||
| 903 | 903 | ||
| 904 | *** The mode-line tooltips have been improved to provide more details. | 904 | *** The mode-line tooltips have been improved to provide more details. |
| 905 | 905 | ||
| 906 | *** The VC, line/colum number and minor mode indicators on the mode | 906 | *** The VC, line/column number and minor mode indicators on the mode |
| 907 | line are now interactive: mouse-1 can be used on them to pop up a menu. | 907 | line are now interactive: mouse-1 can be used on them to pop up a menu. |
| 908 | 908 | ||
| 909 | ** File deletion can make use of the Recycle Bin or system Trash folder. | 909 | ** File deletion can make use of the Recycle Bin or system Trash folder. |
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt index 957986e8eda..a9ea16d1811 100644 --- a/etc/srecode/doc-cpp.srt +++ b/etc/srecode/doc-cpp.srt | |||
| @@ -43,7 +43,7 @@ Recycle doxygen comment code from the more general template set." | |||
| 43 | ---- | 43 | ---- |
| 44 | 44 | ||
| 45 | template variable-same-line-comment :tag | 45 | template variable-same-line-comment :tag |
| 46 | "A comment occurring after a veriable declaration. | 46 | "A comment occurring after a variable declaration. |
| 47 | Recycle doxygen comment code from the more general template set." | 47 | Recycle doxygen comment code from the more general template set." |
| 48 | ---- | 48 | ---- |
| 49 | {{>:declaration:doxygen-variable-same-line}} | 49 | {{>:declaration:doxygen-variable-same-line}} |
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt index 24741fa7741..ac8d8bc1ac2 100644 --- a/etc/srecode/doc-default.srt +++ b/etc/srecode/doc-default.srt | |||
| @@ -43,7 +43,7 @@ template function-comment :tag :indent :blank | |||
| 43 | ---- | 43 | ---- |
| 44 | 44 | ||
| 45 | template variable-same-line-comment :tag | 45 | template variable-same-line-comment :tag |
| 46 | "A comment occurring after a veriable declaration." | 46 | "A comment occurring after a variable declaration." |
| 47 | ---- | 47 | ---- |
| 48 | {{comment_start}} {{?DOC}} {{comment_end}} | 48 | {{comment_start}} {{?DOC}} {{comment_end}} |
| 49 | ---- | 49 | ---- |
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt index c6d2ef1fd54..aeae1c2c389 100644 --- a/etc/srecode/doc-java.srt +++ b/etc/srecode/doc-java.srt | |||
| @@ -44,7 +44,7 @@ Recycle javadoc comment code from the more general template set." | |||
| 44 | ---- | 44 | ---- |
| 45 | 45 | ||
| 46 | template variable-same-line-comment :tag | 46 | template variable-same-line-comment :tag |
| 47 | "A comment occurring after a veriable declaration. | 47 | "A comment occurring after a variable declaration. |
| 48 | Recycle javadoc comment code from the more general template set." | 48 | Recycle javadoc comment code from the more general template set." |
| 49 | ---- | 49 | ---- |
| 50 | {{>:declaration:javadoc-variable-same-line}} | 50 | {{>:declaration:javadoc-variable-same-line}} |
diff --git a/leim/quail/croatian.el b/leim/quail/croatian.el index 7f394979261..885ac238398 100644 --- a/leim/quail/croatian.el +++ b/leim/quail/croatian.el | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | ;;; quail/croatian.el -- Quail package for inputing Croatian -*-coding: iso-8859-2;-*- | 1 | ;;; quail/croatian.el -- Quail package for inputting Croatian -*-coding: iso-8859-2;-*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2003-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2003-2011 Free Software Foundation, Inc. |
| 4 | 4 | ||
diff --git a/leim/quail/czech.el b/leim/quail/czech.el index 334045eac32..fc1fb5f6e1f 100644 --- a/leim/quail/czech.el +++ b/leim/quail/czech.el | |||
| @@ -461,7 +461,7 @@ keyboard from the obsolete `emacs-czech' package. | |||
| 461 | All digits except of `1' are replaced by Czech characters as on the standard | 461 | All digits except of `1' are replaced by Czech characters as on the standard |
| 462 | Czech keyboard. | 462 | Czech keyboard. |
| 463 | `[' and `]' are replaced with `,Bz(B' and `,By(B', respectively. | 463 | `[' and `]' are replaced with `,Bz(B' and `,By(B', respectively. |
| 464 | There are two dead keys on `=' and `+'. Characters with diaresis are | 464 | There are two dead keys on `=' and `+'. Characters with diaereses are |
| 465 | accessible through `+='. | 465 | accessible through `+='. |
| 466 | All other keys are the same as on standard US keyboard." | 466 | All other keys are the same as on standard US keyboard." |
| 467 | nil t nil nil t nil nil nil nil nil t) | 467 | nil t nil nil t nil nil nil nil nil t) |
diff --git a/leim/quail/greek.el b/leim/quail/greek.el index ab82775ff0e..407b52f1f39 100644 --- a/leim/quail/greek.el +++ b/leim/quail/greek.el | |||
| @@ -1147,7 +1147,7 @@ nil t t nil nil nil nil nil nil nil t) | |||
| 1147 | 1147 | ||
| 1148 | In the right of ,Fk(B key is a combination key, where | 1148 | In the right of ,Fk(B key is a combination key, where |
| 1149 | ,F4(B acute | 1149 | ,F4(B acute |
| 1150 | ,F((B diaresis | 1150 | ,F((B diaeresis |
| 1151 | 1151 | ||
| 1152 | e.g. | 1152 | e.g. |
| 1153 | ,F4(B + ,Fa(B -> ,F\(B | 1153 | ,F4(B + ,Fa(B -> ,F\(B |
| @@ -1289,7 +1289,7 @@ e.g. | |||
| 1289 | 1289 | ||
| 1290 | In the right of ,Fk(B key is a combination key, where | 1290 | In the right of ,Fk(B key is a combination key, where |
| 1291 | ,F4(B acute | 1291 | ,F4(B acute |
| 1292 | ,F((B diaresis | 1292 | ,F((B diaeresis |
| 1293 | 1293 | ||
| 1294 | e.g. | 1294 | e.g. |
| 1295 | ,Fa(B + ,F4(B -> ,F\(B | 1295 | ,Fa(B + ,F4(B -> ,F\(B |
diff --git a/leim/quail/persian.el b/leim/quail/persian.el index b664eb5995b..572c9127f9d 100644 --- a/leim/quail/persian.el +++ b/leim/quail/persian.el | |||
| @@ -194,11 +194,11 @@ Based on ISIRI-9149 Layout of Persian Letters and Symbols on Computer Keyboards. | |||
| 194 | ;;; | 194 | ;;; |
| 195 | ;;; This translit keyboard is designed to be intuitive such that | 195 | ;;; This translit keyboard is designed to be intuitive such that |
| 196 | ;;; mapping are easy and natural to remember for a persian writer. | 196 | ;;; mapping are easy and natural to remember for a persian writer. |
| 197 | ;;; For some persian characters there are multiple ways of inputing | 197 | ;;; For some persian characters there are multiple ways of inputting |
| 198 | ;;; the same character. | 198 | ;;; the same character. |
| 199 | ;;; | 199 | ;;; |
| 200 | ;;; The letter 'h' is used for a number of two character mappings, | 200 | ;;; The letter 'h' is used for a number of two character mappings, |
| 201 | ;;; this means that some character sequence inputs need to be repeated | 201 | ;;; this means that some character sequence inputs need to be repeated |
| 202 | ;;; followed by a backspace followed by the 'h'. | 202 | ;;; followed by a backspace followed by the 'h'. |
| 203 | ;;; For example: Ø³ØØ± = 's' 's' '<bs>' 'h' 'h' 'r' | 203 | ;;; For example: Ø³ØØ± = 's' 's' '<bs>' 'h' 'h' 'r' |
| 204 | ;;; In practice such sequences are rare. | 204 | ;;; In practice such sequences are rare. |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 413a2947a58..ef91deddc1d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -5370,7 +5370,7 @@ | |||
| 5370 | 5370 | ||
| 5371 | * net/network-stream.el (network-stream-open-starttls): Support | 5371 | * net/network-stream.el (network-stream-open-starttls): Support |
| 5372 | upgrading to STARTTLS always, even if we don't have built-in support. | 5372 | upgrading to STARTTLS always, even if we don't have built-in support. |
| 5373 | (open-network-stream): Add the :always-query-capabilies keyword. | 5373 | (open-network-stream): Add the :always-query-capabilities keyword. |
| 5374 | 5374 | ||
| 5375 | * mail/smtpmail.el: Rewritten to do opportunistic STARTTLS | 5375 | * mail/smtpmail.el: Rewritten to do opportunistic STARTTLS |
| 5376 | upgrades with `open-network-stream', and rely solely on | 5376 | upgrades with `open-network-stream', and rely solely on |
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 0e6a27e0776..0b96f4a36eb 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 | |||
| @@ -10869,7 +10869,7 @@ | |||
| 10869 | 10869 | ||
| 10870 | 2007-09-23 Glenn Morris <rgm@gnu.org> | 10870 | 2007-09-23 Glenn Morris <rgm@gnu.org> |
| 10871 | 10871 | ||
| 10872 | * ses.el (ses-calculate-cell): Don't evaluate unsafe formulae. | 10872 | * ses.el (ses-calculate-cell): Don't evaluate unsafe formulas. |
| 10873 | 10873 | ||
| 10874 | 2007-09-23 Dan Nicolaescu <dann@ics.uci.edu> | 10874 | 2007-09-23 Dan Nicolaescu <dann@ics.uci.edu> |
| 10875 | 10875 | ||
diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index 65005a4ba47..957c9c7deff 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 | |||
| @@ -60,7 +60,7 @@ | |||
| 60 | 60 | ||
| 61 | 1988-08-03 Robert J. Chassell (bob@frosted-flakes.ai.mit.edu) | 61 | 1988-08-03 Robert J. Chassell (bob@frosted-flakes.ai.mit.edu) |
| 62 | 62 | ||
| 63 | * texinfo.el: Changed fill-colum from 75 to 72. The larger | 63 | * texinfo.el: Changed fill-column from 75 to 72. The larger |
| 64 | fill-column causes numerous overfull hboxes in TeX when you are | 64 | fill-column causes numerous overfull hboxes in TeX when you are |
| 65 | writing Emacs Lisp code that will be formatted as a Texinfo example. | 65 | writing Emacs Lisp code that will be formatted as a Texinfo example. |
| 66 | 66 | ||
diff --git a/lisp/align.el b/lisp/align.el index a386b7a82ba..214c3add93f 100644 --- a/lisp/align.el +++ b/lisp/align.el | |||
| @@ -109,7 +109,7 @@ | |||
| 109 | ;; simple algorithm that understand only basic regular expressions. | 109 | ;; simple algorithm that understand only basic regular expressions. |
| 110 | ;; Parts of the code were broken up and included in vhdl-mode.el | 110 | ;; Parts of the code were broken up and included in vhdl-mode.el |
| 111 | ;; around this time. After several comments from users, and a need to | 111 | ;; around this time. After several comments from users, and a need to |
| 112 | ;; find a more robust, performant algorithm, 2.0 was born in late | 112 | ;; find a more robust, higher performing algorithm, 2.0 was born in late |
| 113 | ;; 1998. Many different approaches were taken (mostly due to the | 113 | ;; 1998. Many different approaches were taken (mostly due to the |
| 114 | ;; complexity of TeX tables), but finally a scheme was discovered | 114 | ;; complexity of TeX tables), but finally a scheme was discovered |
| 115 | ;; which worked fairly well for most common usage cases. Development | 115 | ;; which worked fairly well for most common usage cases. Development |
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index dfd9adad2a7..715879534b0 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el | |||
| @@ -108,7 +108,7 @@ inhibition of allout-widgets-mode." | |||
| 108 | ;;;_ > allout-widgets-setup (varname value) | 108 | ;;;_ > allout-widgets-setup (varname value) |
| 109 | ;;;###autoload | 109 | ;;;###autoload |
| 110 | (defun allout-widgets-setup (varname value) | 110 | (defun allout-widgets-setup (varname value) |
| 111 | "Commission or decommision allout-widgets-mode along with allout-mode. | 111 | "Commission or decommission allout-widgets-mode along with allout-mode. |
| 112 | 112 | ||
| 113 | Meant to be used by customization of `allout-widgets-auto-activation'." | 113 | Meant to be used by customization of `allout-widgets-auto-activation'." |
| 114 | (set-default varname value) | 114 | (set-default varname value) |
diff --git a/lisp/allout.el b/lisp/allout.el index 68330aa538b..9289e38b418 100644 --- a/lisp/allout.el +++ b/lisp/allout.el | |||
| @@ -1872,7 +1872,7 @@ at the beginning of the current entry. | |||
| 1872 | 1872 | ||
| 1873 | Extending Allout | 1873 | Extending Allout |
| 1874 | 1874 | ||
| 1875 | Allout exposure and authoring activites all have associated | 1875 | Allout exposure and authoring activities all have associated |
| 1876 | hooks, by which independent code can cooperate with allout | 1876 | hooks, by which independent code can cooperate with allout |
| 1877 | without changes to the allout core. Here are key ones: | 1877 | without changes to the allout core. Here are key ones: |
| 1878 | 1878 | ||
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index 4d6f02a40b7..08b569de333 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el | |||
| @@ -413,7 +413,7 @@ start of the region and set the face with which to start. Set | |||
| 413 | (setq ansi-color-context-region nil)))))) | 413 | (setq ansi-color-context-region nil)))))) |
| 414 | 414 | ||
| 415 | ;; This function helps you look for overlapping overlays. This is | 415 | ;; This function helps you look for overlapping overlays. This is |
| 416 | ;; usefull in comint-buffers. Overlapping overlays should not happen! | 416 | ;; useful in comint-buffers. Overlapping overlays should not happen! |
| 417 | ;; A possible cause for bugs are the markers. If you create an overlay | 417 | ;; A possible cause for bugs are the markers. If you create an overlay |
| 418 | ;; up to the end of the region, then that end might coincide with the | 418 | ;; up to the end of the region, then that end might coincide with the |
| 419 | ;; process-mark. As text is added BEFORE the process-mark, the overlay | 419 | ;; process-mark. As text is added BEFORE the process-mark, the overlay |
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 84a1544d709..b841ed4ab73 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el | |||
| @@ -962,7 +962,7 @@ Accurate to within a minute between 1951 and 2050." | |||
| 962 | (defun solar-mean-equinoxes/solstices (k year) | 962 | (defun solar-mean-equinoxes/solstices (k year) |
| 963 | "Julian day of mean equinox/solstice K for YEAR. | 963 | "Julian day of mean equinox/solstice K for YEAR. |
| 964 | K=0, spring equinox; K=1, summer solstice; K=2, fall equinox; K=3, winter | 964 | K=0, spring equinox; K=1, summer solstice; K=2, fall equinox; K=3, winter |
| 965 | solstice. These formulae are only to be used between 1000 BC and 3000 AD." | 965 | solstice. These formulas are only to be used between 1000 BC and 3000 AD." |
| 966 | (let ((y (/ year 1000.0)) | 966 | (let ((y (/ year 1000.0)) |
| 967 | (z (/ (- year 2000) 1000.0))) | 967 | (z (/ (- year 2000) 1000.0))) |
| 968 | (if (< year 1000) ; actually between -1000 and 1000 | 968 | (if (< year 1000) ; actually between -1000 and 1000 |
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 4d5d8f35f51..58fca963a58 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el | |||
| @@ -210,7 +210,7 @@ This class will cache data derived during various searches.") | |||
| 210 | "Synchronize the search index IDX with some NEW-TAGS." | 210 | "Synchronize the search index IDX with some NEW-TAGS." |
| 211 | ;; Reset our parts. | 211 | ;; Reset our parts. |
| 212 | (semantic-reset idx) | 212 | (semantic-reset idx) |
| 213 | ;; Notify dependants by clearning their indicies. | 213 | ;; Notify dependants by clearing their indices. |
| 214 | (semanticdb-notify-references | 214 | (semanticdb-notify-references |
| 215 | (oref idx table) | 215 | (oref idx table) |
| 216 | (lambda (tab me) | 216 | (lambda (tab me) |
| @@ -224,7 +224,7 @@ This class will cache data derived during various searches.") | |||
| 224 | (if (semantic-find-tags-by-class 'include new-tags) | 224 | (if (semantic-find-tags-by-class 'include new-tags) |
| 225 | (progn | 225 | (progn |
| 226 | (semantic-reset idx) | 226 | (semantic-reset idx) |
| 227 | ;; Notify dependants by clearning their indicies. | 227 | ;; Notify dependants by clearing their indices. |
| 228 | (semanticdb-notify-references | 228 | (semanticdb-notify-references |
| 229 | (oref idx table) | 229 | (oref idx table) |
| 230 | (lambda (tab me) | 230 | (lambda (tab me) |
| @@ -234,7 +234,7 @@ This class will cache data derived during various searches.") | |||
| 234 | (when (oref idx type-cache) | 234 | (when (oref idx type-cache) |
| 235 | (when (semanticdb-partial-synchronize (oref idx type-cache) new-tags) | 235 | (when (semanticdb-partial-synchronize (oref idx type-cache) new-tags) |
| 236 | ;; If the synchronize returns true, we need to notify. | 236 | ;; If the synchronize returns true, we need to notify. |
| 237 | ;; Notify dependants by clearning their indicies. | 237 | ;; Notify dependants by clearing their indices. |
| 238 | (semanticdb-notify-references | 238 | (semanticdb-notify-references |
| 239 | (oref idx table) | 239 | (oref idx table) |
| 240 | (lambda (tab me) | 240 | (lambda (tab me) |
| @@ -405,10 +405,10 @@ Default action as described in `semanticdb-find-translate-path'." | |||
| 405 | ;; do a caching lookup. | 405 | ;; do a caching lookup. |
| 406 | (let ((index (semanticdb-get-table-index table))) | 406 | (let ((index (semanticdb-get-table-index table))) |
| 407 | (if (semanticdb-find-need-cache-update-p table) | 407 | (if (semanticdb-find-need-cache-update-p table) |
| 408 | ;; Lets go look up our indicies | 408 | ;; Let's go look up our indices. |
| 409 | (let ((ans (semanticdb-find-translate-path-includes--internal path))) | 409 | (let ((ans (semanticdb-find-translate-path-includes--internal path))) |
| 410 | (oset index include-path ans) | 410 | (oset index include-path ans) |
| 411 | ;; Once we have our new indicies set up, notify those | 411 | ;; Once we have our new indices set up, notify those |
| 412 | ;; who depend on us if we found something for them to | 412 | ;; who depend on us if we found something for them to |
| 413 | ;; depend on. | 413 | ;; depend on. |
| 414 | (when ans (semanticdb-refresh-references table)) | 414 | (when ans (semanticdb-refresh-references table)) |
| @@ -575,7 +575,7 @@ a new path from the provided PATH." | |||
| 575 | (setq ans (semanticdb-file-table | 575 | (setq ans (semanticdb-file-table |
| 576 | (car systemdb) | 576 | (car systemdb) |
| 577 | ;; I would expect most omniscient to return the same | 577 | ;; I would expect most omniscient to return the same |
| 578 | ;; thing reguardless of filename, but we may have | 578 | o ;; thing regardless of filename, but we may have |
| 579 | ;; one that can return a table of all things the | 579 | ;; one that can return a table of all things the |
| 580 | ;; current file needs. | 580 | ;; current file needs. |
| 581 | (buffer-file-name (current-buffer)))) | 581 | (buffer-file-name (current-buffer)))) |
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el index 45b807df12b..6db47f8b0be 100644 --- a/lisp/cedet/semantic/debug.el +++ b/lisp/cedet/semantic/debug.el | |||
| @@ -175,7 +175,7 @@ TOKEN is a lexical token." | |||
| 175 | "For IFACE, highlight NONTERM in the parser buffer. | 175 | "For IFACE, highlight NONTERM in the parser buffer. |
| 176 | NONTERM is the name of the rule currently being processed that shows up | 176 | NONTERM is the name of the rule currently being processed that shows up |
| 177 | as a nonterminal (or tag) in the source buffer. | 177 | as a nonterminal (or tag) in the source buffer. |
| 178 | If RULE and MATCH indicies are specified, highlight those also." | 178 | If RULE and MATCH indices are specified, highlight those also." |
| 179 | (set-buffer (oref iface :parser-buffer)) | 179 | (set-buffer (oref iface :parser-buffer)) |
| 180 | 180 | ||
| 181 | (let* ((rules (semantic-find-tags-by-class 'nonterminal (current-buffer))) | 181 | (let* ((rules (semantic-find-tags-by-class 'nonterminal (current-buffer))) |
diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el index d8e02f978b2..73445fbf13d 100644 --- a/lisp/cedet/srecode/args.el +++ b/lisp/cedet/srecode/args.el | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | ;;; :blank | 32 | ;;; :blank |
| 33 | ;; | 33 | ;; |
| 34 | ;; Using :blank means that the template should force blank lines | 34 | ;; Using :blank means that the template should force blank lines |
| 35 | ;; before and after the template, reguardless of where the insertion | 35 | ;; before and after the template, regardless of where the insertion |
| 36 | ;; is occurring. | 36 | ;; is occurring. |
| 37 | (defun srecode-semantic-handle-:blank (dict) | 37 | (defun srecode-semantic-handle-:blank (dict) |
| 38 | "Add macros into the dictionary DICT specifying blank line spacing. | 38 | "Add macros into the dictionary DICT specifying blank line spacing. |
| @@ -185,4 +185,3 @@ do not contain any text from preceding or following text." | |||
| 185 | (provide 'srecode/args) | 185 | (provide 'srecode/args) |
| 186 | 186 | ||
| 187 | ;;; srecode/args.el ends here | 187 | ;;; srecode/args.el ends here |
| 188 | |||
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index 60f277b2c9f..bbf8b881c4d 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el | |||
| @@ -312,7 +312,7 @@ occur in your template.") | |||
| 312 | (setq doit nil))) | 312 | (setq doit nil))) |
| 313 | (goto-char pm) | 313 | (goto-char pm) |
| 314 | ) | 314 | ) |
| 315 | ;; Do indentation reguardless of the newline. | 315 | ;; Do indentation regardless of the newline. |
| 316 | (when (and (eq i t) inbuff) | 316 | (when (and (eq i t) inbuff) |
| 317 | (indent-according-to-mode) | 317 | (indent-according-to-mode) |
| 318 | (goto-char pm)) | 318 | (goto-char pm)) |
diff --git a/lisp/dired.el b/lisp/dired.el index 4970b14e7b4..52bd67751d4 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -2678,7 +2678,7 @@ Anything else means ask for each directory." | |||
| 2678 | (defvar dired-re-no-dot "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*") | 2678 | (defvar dired-re-no-dot "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*") |
| 2679 | 2679 | ||
| 2680 | ;; Delete file, possibly delete a directory and all its files. | 2680 | ;; Delete file, possibly delete a directory and all its files. |
| 2681 | ;; This function is usefull outside of dired. One could change it's name | 2681 | ;; This function is useful outside of dired. One could change it's name |
| 2682 | ;; to e.g. recursive-delete-file and put it somewhere else. | 2682 | ;; to e.g. recursive-delete-file and put it somewhere else. |
| 2683 | (defun dired-delete-file (file &optional recursive trash) "\ | 2683 | (defun dired-delete-file (file &optional recursive trash) "\ |
| 2684 | Delete FILE or directory (possibly recursively if optional RECURSIVE is true.) | 2684 | Delete FILE or directory (possibly recursively if optional RECURSIVE is true.) |
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index 76cab39f5b2..00aec2d0bf9 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el | |||
| @@ -1258,7 +1258,7 @@ The numbers are formatted according to the FORMAT string." | |||
| 1258 | (untabify (point-min) (point-max))) | 1258 | (untabify (point-min) (point-max))) |
| 1259 | 1259 | ||
| 1260 | (defun cua-text-fill-rectangle (width text) | 1260 | (defun cua-text-fill-rectangle (width text) |
| 1261 | "Replace rectagle with filled TEXT read from minibuffer. | 1261 | "Replace rectangle with filled TEXT read from minibuffer. |
| 1262 | A numeric prefix argument is used a new width for the filled rectangle." | 1262 | A numeric prefix argument is used a new width for the filled rectangle." |
| 1263 | (interactive (list | 1263 | (interactive (list |
| 1264 | (prefix-numeric-value current-prefix-arg) | 1264 | (prefix-numeric-value current-prefix-arg) |
| @@ -1269,7 +1269,7 @@ A numeric prefix argument is used a new width for the filled rectangle." | |||
| 1269 | (lambda () (insert text)))) | 1269 | (lambda () (insert text)))) |
| 1270 | 1270 | ||
| 1271 | (defun cua-refill-rectangle (width) | 1271 | (defun cua-refill-rectangle (width) |
| 1272 | "Fill contents of current rectagle. | 1272 | "Fill contents of current rectangle. |
| 1273 | A numeric prefix argument is used as new width for the filled rectangle." | 1273 | A numeric prefix argument is used as new width for the filled rectangle." |
| 1274 | (interactive "P") | 1274 | (interactive "P") |
| 1275 | (cua--rectangle-aux-replace | 1275 | (cua--rectangle-aux-replace |
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 78bc09af136..b6d487704f4 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el | |||
| @@ -1979,7 +1979,7 @@ Undo previous insertion and inserts new." | |||
| 1979 | ;; Quote region by each line with a user supplied string. | 1979 | ;; Quote region by each line with a user supplied string. |
| 1980 | (defun viper-quote-region () | 1980 | (defun viper-quote-region () |
| 1981 | (let ((quote-str viper-quote-string) | 1981 | (let ((quote-str viper-quote-string) |
| 1982 | (donot-change-dafault t)) | 1982 | (donot-change-default t)) |
| 1983 | (setq quote-str | 1983 | (setq quote-str |
| 1984 | (viper-read-string-with-history | 1984 | (viper-read-string-with-history |
| 1985 | "Quote string: " | 1985 | "Quote string: " |
| @@ -1991,9 +1991,9 @@ Undo previous insertion and inserts new." | |||
| 1991 | ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;") | 1991 | ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;") |
| 1992 | ((memq major-mode '(c-mode cc-mode c++-mode)) "//") | 1992 | ((memq major-mode '(c-mode cc-mode c++-mode)) "//") |
| 1993 | ((memq major-mode '(sh-mode shell-mode)) "#") | 1993 | ((memq major-mode '(sh-mode shell-mode)) "#") |
| 1994 | (t (setq donot-change-dafault nil) | 1994 | (t (setq donot-change-default nil) |
| 1995 | quote-str)))) | 1995 | quote-str)))) |
| 1996 | (or donot-change-dafault | 1996 | (or donot-change-default |
| 1997 | (setq viper-quote-string quote-str)) | 1997 | (setq viper-quote-string quote-str)) |
| 1998 | (viper-enlarge-region (point) (mark t)) | 1998 | (viper-enlarge-region (point) (mark t)) |
| 1999 | (if (> (point) (mark t)) (exchange-point-and-mark)) | 1999 | (if (> (point) (mark t)) (exchange-point-and-mark)) |
diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el index 2c346dfcd3d..b6f12e1ff2e 100644 --- a/lisp/eshell/em-rebind.el +++ b/lisp/eshell/em-rebind.el | |||
| @@ -144,7 +144,7 @@ This is default behavior of shells like bash." | |||
| 144 | ;;; Functions: | 144 | ;;; Functions: |
| 145 | 145 | ||
| 146 | (defun eshell-rebind-initialize () | 146 | (defun eshell-rebind-initialize () |
| 147 | "Initialize the inputing code." | 147 | "Initialize the inputting code." |
| 148 | (unless eshell-non-interactive-p | 148 | (unless eshell-non-interactive-p |
| 149 | (add-hook 'eshell-mode-hook 'eshell-setup-input-keymap nil t) | 149 | (add-hook 'eshell-mode-hook 'eshell-setup-input-keymap nil t) |
| 150 | (make-local-variable 'eshell-previous-point) | 150 | (make-local-variable 'eshell-previous-point) |
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 6b11a956a99..893ee88e98d 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 | |||
| @@ -5094,7 +5094,7 @@ | |||
| 5094 | 2003-02-02 Katsumi Yamaoka <yamaoka@jpl.org> | 5094 | 2003-02-02 Katsumi Yamaoka <yamaoka@jpl.org> |
| 5095 | 5095 | ||
| 5096 | * nnheader.el (nnheader-directory-separator-character): Change the | 5096 | * nnheader.el (nnheader-directory-separator-character): Change the |
| 5097 | way to compute the dafault value. | 5097 | way to compute the default value. |
| 5098 | 5098 | ||
| 5099 | 2003-02-02 Jesper Harder <harder@ifa.au.dk> | 5099 | 2003-02-02 Jesper Harder <harder@ifa.au.dk> |
| 5100 | 5100 | ||
diff --git a/lisp/gs.el b/lisp/gs.el index 2eba7af71ae..b86632f7637 100644 --- a/lisp/gs.el +++ b/lisp/gs.el | |||
| @@ -96,7 +96,7 @@ FILE is the value to substitute for the place-holder `<file>'." | |||
| 96 | (declare-function x-display-pixel-width "xfns.c" (&optional terminal)) | 96 | (declare-function x-display-pixel-width "xfns.c" (&optional terminal)) |
| 97 | 97 | ||
| 98 | (defun gs-width-in-pt (frame pixel-width) | 98 | (defun gs-width-in-pt (frame pixel-width) |
| 99 | "Return, on FRAME, pixel width PIXEL-WIDTH tranlated to pt." | 99 | "Return, on FRAME, pixel width PIXEL-WIDTH translated to pt." |
| 100 | (let ((mm (* (float pixel-width) | 100 | (let ((mm (* (float pixel-width) |
| 101 | (/ (float (x-display-mm-width frame)) | 101 | (/ (float (x-display-mm-width frame)) |
| 102 | (float (x-display-pixel-width frame)))))) | 102 | (float (x-display-pixel-width frame)))))) |
| @@ -106,7 +106,7 @@ FILE is the value to substitute for the place-holder `<file>'." | |||
| 106 | (declare-function x-display-pixel-height "xfns.c" (&optional terminal)) | 106 | (declare-function x-display-pixel-height "xfns.c" (&optional terminal)) |
| 107 | 107 | ||
| 108 | (defun gs-height-in-pt (frame pixel-height) | 108 | (defun gs-height-in-pt (frame pixel-height) |
| 109 | "Return, on FRAME, pixel height PIXEL-HEIGHT tranlated to pt." | 109 | "Return, on FRAME, pixel height PIXEL-HEIGHT translated to pt." |
| 110 | (let ((mm (* (float pixel-height) | 110 | (let ((mm (* (float pixel-height) |
| 111 | (/ (float (x-display-mm-height frame)) | 111 | (/ (float (x-display-mm-height frame)) |
| 112 | (float (x-display-pixel-height frame)))))) | 112 | (float (x-display-pixel-height frame)))))) |
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 0dee4157d78..50e631a95c5 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el | |||
| @@ -367,7 +367,7 @@ buffer with the contents of a file | |||
| 367 | 367 | ||
| 368 | ;;;###autoload | 368 | ;;;###autoload |
| 369 | (define-minor-mode highlight-changes-visible-mode | 369 | (define-minor-mode highlight-changes-visible-mode |
| 370 | "Toggle visiblility of highlighting due to Highlight Changes mode. | 370 | "Toggle visibility of highlighting due to Highlight Changes mode. |
| 371 | With a prefix argument ARG, enable Highlight Changes Visible mode | 371 | With a prefix argument ARG, enable Highlight Changes Visible mode |
| 372 | if ARG is positive, and disable it otherwise. If called from | 372 | if ARG is positive, and disable it otherwise. If called from |
| 373 | Lisp, enable the mode if ARG is omitted or nil. | 373 | Lisp, enable the mode if ARG is omitted or nil. |
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 126b616a644..b0fd37abd36 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el | |||
| @@ -580,7 +580,7 @@ If a window system is unavailable, calls `hfy-fallback-colour-values'." | |||
| 580 | (color-values colour) | 580 | (color-values colour) |
| 581 | ;;(message "[%S]" window-system) | 581 | ;;(message "[%S]" window-system) |
| 582 | (x-color-values colour)) | 582 | (x-color-values colour)) |
| 583 | ;; blarg - tty colours are no good - go fetch some X colours: | 583 | ;; blarg - tty colors are no good - go fetch some X colors: |
| 584 | (hfy-fallback-colour-values colour)))) | 584 | (hfy-fallback-colour-values colour)))) |
| 585 | 585 | ||
| 586 | (defvar hfy-cperl-mode-kludged-p nil) | 586 | (defvar hfy-cperl-mode-kludged-p nil) |
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el index 9614479072a..457fe84c0b1 100644 --- a/lisp/international/ccl.el +++ b/lisp/international/ccl.el | |||
| @@ -1433,7 +1433,7 @@ REG := r0 | r1 | r2 | r3 | r4 | r5 | r6 | r7 | |||
| 1433 | ARG := REG | integer | 1433 | ARG := REG | integer |
| 1434 | 1434 | ||
| 1435 | OPERATOR := | 1435 | OPERATOR := |
| 1436 | ;; Normal arithmethic operators (same meaning as C code). | 1436 | ;; Normal arithmetic operators (same meaning as C code). |
| 1437 | + | - | * | / | % | 1437 | + | - | * | / | % |
| 1438 | 1438 | ||
| 1439 | ;; Bitwise operators (same meaning as C code) | 1439 | ;; Bitwise operators (same meaning as C code) |
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index 1d93d981f8e..306a7bee9dc 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el | |||
| @@ -890,7 +890,7 @@ Otherwise, [0-9A-F]." | |||
| 890 | 890 | ||
| 891 | ;;;###autoload | 891 | ;;;###autoload |
| 892 | (defun ethio-find-file nil | 892 | (defun ethio-find-file nil |
| 893 | "Transliterate file content into Ethiopic dependig on filename suffix." | 893 | "Transliterate file content into Ethiopic depending on filename suffix." |
| 894 | (cond | 894 | (cond |
| 895 | 895 | ||
| 896 | ((string-match "\\.sera$" (buffer-file-name)) | 896 | ((string-match "\\.sera$" (buffer-file-name)) |
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index 008eb92dbbc..2a339504409 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el | |||
| @@ -386,7 +386,7 @@ character MAA-SAKOD-n.") | |||
| 386 | "Transcribe a Romanized Lao syllable in the region FROM and TO to Lao string. | 386 | "Transcribe a Romanized Lao syllable in the region FROM and TO to Lao string. |
| 387 | Only the first syllable is transcribed. | 387 | Only the first syllable is transcribed. |
| 388 | The value has the form: (START END LAO-STRING), where | 388 | The value has the form: (START END LAO-STRING), where |
| 389 | START and END are the beggining and end positions of the Roman Lao syllable, | 389 | START and END are the beginning and end positions of the Roman Lao syllable, |
| 390 | LAO-STRING is the Lao character transcription of it. | 390 | LAO-STRING is the Lao character transcription of it. |
| 391 | 391 | ||
| 392 | Optional 3rd arg STR, if non-nil, is a string to search for Roman Lao | 392 | Optional 3rd arg STR, if non-nil, is a string to search for Roman Lao |
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el index b04863b5fc0..80836b03978 100644 --- a/lisp/net/netrc.el +++ b/lisp/net/netrc.el | |||
| @@ -237,7 +237,7 @@ MODE can be \"login\" or \"password\", suitable for passing to | |||
| 237 | ;;;###autoload | 237 | ;;;###autoload |
| 238 | (defun netrc-credentials (machine &rest ports) | 238 | (defun netrc-credentials (machine &rest ports) |
| 239 | "Return a user name/password pair. | 239 | "Return a user name/password pair. |
| 240 | Port specifications will be prioritised in the order they are | 240 | Port specifications will be prioritized in the order they are |
| 241 | listed in the PORTS list." | 241 | listed in the PORTS list." |
| 242 | (let ((list (netrc-parse)) | 242 | (let ((list (netrc-parse)) |
| 243 | found) | 243 | found) |
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index e27b4541ab5..9c07953c9c9 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el | |||
| @@ -115,7 +115,7 @@ values: | |||
| 115 | capability command, and should return the command to switch on | 115 | capability command, and should return the command to switch on |
| 116 | STARTTLS if the server supports STARTTLS, and nil otherwise. | 116 | STARTTLS if the server supports STARTTLS, and nil otherwise. |
| 117 | 117 | ||
| 118 | :always-query-capabilies says whether to query the server for | 118 | :always-query-capabilities says whether to query the server for |
| 119 | capabilities, even if we're doing a `plain' network connection. | 119 | capabilities, even if we're doing a `plain' network connection. |
| 120 | 120 | ||
| 121 | :client-certificate should either be a list where the first | 121 | :client-certificate should either be a list where the first |
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index df841bade79..27dff3aa8d9 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el | |||
| @@ -188,7 +188,7 @@ | |||
| 188 | ;; STRING stable_name | 188 | ;; STRING stable_name |
| 189 | ;; STRING x_content_types Since GVFS 1.0 only !!! | 189 | ;; STRING x_content_types Since GVFS 1.0 only !!! |
| 190 | ;; STRING icon | 190 | ;; STRING icon |
| 191 | ;; STRING prefered_filename_encoding | 191 | ;; STRING preferred_filename_encoding |
| 192 | ;; BOOLEAN user_visible | 192 | ;; BOOLEAN user_visible |
| 193 | ;; ARRAY BYTE fuse_mountpoint | 193 | ;; ARRAY BYTE fuse_mountpoint |
| 194 | ;; STRUCT mount_spec | 194 | ;; STRUCT mount_spec |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index c89b61c2eb1..2848211fae9 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -298,8 +298,8 @@ shouldn't return t when it isn't." | |||
| 298 | (search-forward-regexp "Missing ControlMaster argument" nil t)))) | 298 | (search-forward-regexp "Missing ControlMaster argument" nil t)))) |
| 299 | 299 | ||
| 300 | (defcustom tramp-default-method | 300 | (defcustom tramp-default-method |
| 301 | ;; An external copy method seems to be preferred, because it is much | 301 | ;; An external copy method seems to be preferred, because it performs |
| 302 | ;; more performant for large files, and it hasn't too serious delays | 302 | ;; much better for large files, and it hasn't too serious delays |
| 303 | ;; for small files. But it must be ensured that there aren't | 303 | ;; for small files. But it must be ensured that there aren't |
| 304 | ;; permanent password queries. Either a password agent like | 304 | ;; permanent password queries. Either a password agent like |
| 305 | ;; "ssh-agent" or "Pageant" shall run, or the optional | 305 | ;; "ssh-agent" or "Pageant" shall run, or the optional |
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el index ab817a43885..279ea54e4cc 100644 --- a/lisp/net/xesam.el +++ b/lisp/net/xesam.el | |||
| @@ -279,8 +279,8 @@ fields are supported.") | |||
| 279 | 279 | ||
| 280 | (defun xesam-dbus-call-method (&rest args) | 280 | (defun xesam-dbus-call-method (&rest args) |
| 281 | "Apply a D-Bus method call. | 281 | "Apply a D-Bus method call. |
| 282 | `dbus-call-method' is to be preferred, because it is more | 282 | `dbus-call-method' is preferred, because it performs better. |
| 283 | performant. If the target D-Bus service is owned by Emacs, this | 283 | If the target D-Bus service is owned by Emacs, this |
| 284 | is not applicable, and `dbus-call-method-non-blocking' must be | 284 | is not applicable, and `dbus-call-method-non-blocking' must be |
| 285 | used instead. ARGS are identical to the argument list of both | 285 | used instead. ARGS are identical to the argument list of both |
| 286 | functions." | 286 | functions." |
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index c91fe13543a..2991b511830 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el | |||
| @@ -473,7 +473,7 @@ various buffer change hooks." | |||
| 473 | 473 | ||
| 474 | (let ((saved-undo-list (elt saved-state 0))) | 474 | (let ((saved-undo-list (elt saved-state 0))) |
| 475 | (if (eq buffer-undo-list saved-undo-list) | 475 | (if (eq buffer-undo-list saved-undo-list) |
| 476 | ;; No change was done afterall. | 476 | ;; No change was done after all. |
| 477 | (setq buffer-undo-list (cdr saved-undo-list)) | 477 | (setq buffer-undo-list (cdr saved-undo-list)) |
| 478 | 478 | ||
| 479 | (if keep | 479 | (if keep |
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 9544c4f8728..cd483d20f2f 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el | |||
| @@ -6832,7 +6832,7 @@ comment at the start of cc-engine.el for more info." | |||
| 6832 | got-suffix-after-parens | 6832 | got-suffix-after-parens |
| 6833 | (eq (char-after got-suffix-after-parens) ?\()) | 6833 | (eq (char-after got-suffix-after-parens) ?\()) |
| 6834 | ;; Got a type, no declarator but a paren suffix. I.e. it's a | 6834 | ;; Got a type, no declarator but a paren suffix. I.e. it's a |
| 6835 | ;; normal function call afterall (or perhaps a C++ style object | 6835 | ;; normal function call after all (or perhaps a C++ style object |
| 6836 | ;; instantiation expression). | 6836 | ;; instantiation expression). |
| 6837 | (throw 'at-decl-or-cast nil)))) | 6837 | (throw 'at-decl-or-cast nil)))) |
| 6838 | 6838 | ||
| @@ -9151,7 +9151,7 @@ comment at the start of cc-engine.el for more info." | |||
| 9151 | 'label)) | 9151 | 'label)) |
| 9152 | (if (eq step 'up) | 9152 | (if (eq step 'up) |
| 9153 | (setq placeholder (point)) | 9153 | (setq placeholder (point)) |
| 9154 | ;; There was no containing statement afterall. | 9154 | ;; There was no containing statement after all. |
| 9155 | (goto-char placeholder))))) | 9155 | (goto-char placeholder))))) |
| 9156 | placeholder)) | 9156 | placeholder)) |
| 9157 | (if (looking-at c-block-stmt-2-key) | 9157 | (if (looking-at c-block-stmt-2-key) |
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 0cf01b1228f..a81cc107ce3 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el | |||
| @@ -4266,7 +4266,7 @@ Usage: | |||
| 4266 | 4266 | ||
| 4267 | CODE BEAUTIFICATION: | 4267 | CODE BEAUTIFICATION: |
| 4268 | `C-c M-b' and `C-c C-b' beautify the code of a region or of the entire | 4268 | `C-c M-b' and `C-c C-b' beautify the code of a region or of the entire |
| 4269 | buffer respectively. This inludes indentation, alignment, and case | 4269 | buffer respectively. This includes indentation, alignment, and case |
| 4270 | fixing. Code beautification can also be run non-interactively using the | 4270 | fixing. Code beautification can also be run non-interactively using the |
| 4271 | command: | 4271 | command: |
| 4272 | 4272 | ||
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el index c8bdc271f5f..db5b57f8585 100644 --- a/lisp/ps-mule.el +++ b/lisp/ps-mule.el | |||
| @@ -932,7 +932,7 @@ the sequence." | |||
| 932 | (list ps-mule-bitmap-prologue))) | 932 | (list ps-mule-bitmap-prologue))) |
| 933 | 933 | ||
| 934 | (defun ps-mule-generate-bitmap-font (font-spec size relative-compose | 934 | (defun ps-mule-generate-bitmap-font (font-spec size relative-compose |
| 935 | baselie-offset bbx) | 935 | baseline-offset bbx) |
| 936 | (let* ((id (ps-mule-font-spec-id font-spec)) | 936 | (let* ((id (ps-mule-font-spec-id font-spec)) |
| 937 | (bytes (ps-mule-font-spec-bytes font-spec)) | 937 | (bytes (ps-mule-font-spec-bytes font-spec)) |
| 938 | output-list) | 938 | output-list) |
| @@ -941,7 +941,7 @@ the sequence." | |||
| 941 | (list (format "/E%02X [ 0 1 255 {pop /.notdef} for ] def\n" id) | 941 | (list (format "/E%02X [ 0 1 255 {pop /.notdef} for ] def\n" id) |
| 942 | (format "%%%% %s\n" (ps-mule-font-spec-name font-spec)) | 942 | (format "%%%% %s\n" (ps-mule-font-spec-name font-spec)) |
| 943 | (format "/F%02X %f %S %d E%02X NBF\n" id size | 943 | (format "/F%02X %f %S %d E%02X NBF\n" id size |
| 944 | relative-compose baselie-offset id))) | 944 | relative-compose baseline-offset id))) |
| 945 | (setq output-list | 945 | (setq output-list |
| 946 | (list (list (format "/E%02X [ 0 1 255 { pop 0 } for ] def\n" id)) | 946 | (list (list (format "/E%02X [ 0 1 255 { pop 0 } for ] def\n" id)) |
| 947 | (list (format "/V%02X [" id)) | 947 | (list (format "/V%02X [" id)) |
| @@ -950,7 +950,7 @@ the sequence." | |||
| 950 | (format "/F%02X E%02X V%02X NPF\n" id id id)))) | 950 | (format "/F%02X E%02X V%02X NPF\n" id id id)))) |
| 951 | (aset ps-mule-bitmap-font-record id | 951 | (aset ps-mule-bitmap-font-record id |
| 952 | (vector (= bytes 1) output-list | 952 | (vector (= bytes 1) output-list |
| 953 | size relative-compose baselie-offset bbx)) | 953 | size relative-compose baseline-offset bbx)) |
| 954 | (if ps-mule-bitmap-dict-list | 954 | (if ps-mule-bitmap-dict-list |
| 955 | output-list | 955 | output-list |
| 956 | (setq ps-mule-bitmap-dict-list (list "/BitmapDict <<\n" ">> def\n")) | 956 | (setq ps-mule-bitmap-dict-list (list "/BitmapDict <<\n" ">> def\n")) |
diff --git a/lisp/reveal.el b/lisp/reveal.el index ea46cfd1dd3..c776ab72969 100644 --- a/lisp/reveal.el +++ b/lisp/reveal.el | |||
| @@ -189,12 +189,12 @@ Each element has the form (WINDOW . OVERLAY).") | |||
| 189 | 189 | ||
| 190 | ;;;###autoload | 190 | ;;;###autoload |
| 191 | (define-minor-mode reveal-mode | 191 | (define-minor-mode reveal-mode |
| 192 | "Toggle decloaking of invisible text near point (Reveal mode). | 192 | "Toggle uncloaking of invisible text near point (Reveal mode). |
| 193 | With a prefix argument ARG, enable Reveal mode if ARG is | 193 | With a prefix argument ARG, enable Reveal mode if ARG is |
| 194 | positive, and disable it otherwise. If called from Lisp, enable | 194 | positive, and disable it otherwise. If called from Lisp, enable |
| 195 | Reveal mode if ARG is omitted or nil. | 195 | Reveal mode if ARG is omitted or nil. |
| 196 | 196 | ||
| 197 | Reveral mode is a buffer-local minor mode. When enabled, it | 197 | Reveal mode is a buffer-local minor mode. When enabled, it |
| 198 | reveals invisible text around point." | 198 | reveals invisible text around point." |
| 199 | :group 'reveal | 199 | :group 'reveal |
| 200 | :lighter (global-reveal-mode nil " Reveal") | 200 | :lighter (global-reveal-mode nil " Reveal") |
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index c784892ce6b..c64dc0e7a19 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el | |||
| @@ -228,7 +228,7 @@ for the currently selected frame." | |||
| 228 | ;; 216 non-gray colors first | 228 | ;; 216 non-gray colors first |
| 229 | (let ((r 0) (g 0) (b 0)) | 229 | (let ((r 0) (g 0) (b 0)) |
| 230 | (while (> ncolors 24) | 230 | (while (> ncolors 24) |
| 231 | ;; This and other formulae taken from 256colres.pl and | 231 | ;; This and other formulas taken from 256colres.pl and |
| 232 | ;; 88colres.pl in the xterm distribution. | 232 | ;; 88colres.pl in the xterm distribution. |
| 233 | (tty-color-define (format "color-%d" (- 256 ncolors)) | 233 | (tty-color-define (format "color-%d" (- 256 ncolors)) |
| 234 | (- 256 ncolors) | 234 | (- 256 ncolors) |
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index c2856660ea8..f9d11cb2685 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el | |||
| @@ -637,7 +637,7 @@ versions of xterm." | |||
| 637 | ;; 216 non-gray colors first | 637 | ;; 216 non-gray colors first |
| 638 | (let ((r 0) (g 0) (b 0)) | 638 | (let ((r 0) (g 0) (b 0)) |
| 639 | (while (> ncolors 24) | 639 | (while (> ncolors 24) |
| 640 | ;; This and other formulae taken from 256colres.pl and | 640 | ;; This and other formulas taken from 256colres.pl and |
| 641 | ;; 88colres.pl in the xterm distribution. | 641 | ;; 88colres.pl in the xterm distribution. |
| 642 | (tty-color-define (format "color-%d" (- 256 ncolors)) | 642 | (tty-color-define (format "color-%d" (- 256 ncolors)) |
| 643 | (- 256 ncolors) | 643 | (- 256 ncolors) |
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index 678d48758da..3356ce195f2 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el | |||
| @@ -742,7 +742,7 @@ by supplying an argument. | |||
| 742 | Entry to this mode calls the value of `picture-mode-hook' if non-nil. | 742 | Entry to this mode calls the value of `picture-mode-hook' if non-nil. |
| 743 | 743 | ||
| 744 | Note that Picture mode commands will work outside of Picture mode, but | 744 | Note that Picture mode commands will work outside of Picture mode, but |
| 745 | they are not defaultly assigned to keys." | 745 | they are not by default assigned to keys." |
| 746 | (interactive) | 746 | (interactive) |
| 747 | (if (eq major-mode 'picture-mode) | 747 | (if (eq major-mode 'picture-mode) |
| 748 | (error "You are already editing a picture") | 748 | (error "You are already editing a picture") |
diff --git a/lisp/view.el b/lisp/view.el index 7703719ba40..0d8ad3336f9 100644 --- a/lisp/view.el +++ b/lisp/view.el | |||
| @@ -496,7 +496,7 @@ Entry to view-mode runs the normal hook `view-mode-hook'." | |||
| 496 | "Update `view-return-to-alist' of buffer BUFFER. | 496 | "Update `view-return-to-alist' of buffer BUFFER. |
| 497 | Remove from `view-return-to-alist' all entries referencing dead | 497 | Remove from `view-return-to-alist' all entries referencing dead |
| 498 | windows. Optional argument ITEM non-nil means add ITEM to | 498 | windows. Optional argument ITEM non-nil means add ITEM to |
| 499 | `view-return-to-alist' after purging. For a decsription of items | 499 | `view-return-to-alist' after purging. For a description of items |
| 500 | that can be added see the RETURN-TO-ALIST argument of the | 500 | that can be added see the RETURN-TO-ALIST argument of the |
| 501 | function `view-mode-exit'. If `view-return-to-alist' contains an | 501 | function `view-mode-exit'. If `view-return-to-alist' contains an |
| 502 | entry for the selected window, purge that entry from | 502 | entry for the selected window, purge that entry from |
diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h index c30632b9d68..5e4ca068ba5 100644 --- a/oldXMenu/X10.h +++ b/oldXMenu/X10.h | |||
| @@ -51,7 +51,7 @@ XDrawFilled so it shouldn't be defined. | |||
| 51 | */ | 51 | */ |
| 52 | typedef struct _XAssoc { | 52 | typedef struct _XAssoc { |
| 53 | struct _XAssoc *next; /* Next object in this bucket. */ | 53 | struct _XAssoc *next; /* Next object in this bucket. */ |
| 54 | struct _XAssoc *prev; /* Previous obejct in this bucket. */ | 54 | struct _XAssoc *prev; /* Previous object in this bucket. */ |
| 55 | Display *display; /* Display which owns the id. */ | 55 | Display *display; /* Display which owns the id. */ |
| 56 | XID x_id; /* X Window System id. */ | 56 | XID x_id; /* X Window System id. */ |
| 57 | void *data; /* Pointer to untyped memory. */ | 57 | void *data; /* Pointer to untyped memory. */ |
diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h index aa27211c05c..8e4292f5088 100644 --- a/oldXMenu/XMenu.h +++ b/oldXMenu/XMenu.h | |||
| @@ -152,8 +152,8 @@ typedef struct _xmselect { | |||
| 152 | * | 152 | * |
| 153 | */ | 153 | */ |
| 154 | typedef enum _xmstyle { | 154 | typedef enum _xmstyle { |
| 155 | LEFT, /* Left oriented obejct. */ | 155 | LEFT, /* Left oriented object. */ |
| 156 | RIGHT, /* Right oriented obejct. */ | 156 | RIGHT, /* Right oriented object. */ |
| 157 | CENTER /* Center oriented object. */ | 157 | CENTER /* Center oriented object. */ |
| 158 | } XMStyle; | 158 | } XMStyle; |
| 159 | 159 | ||
diff --git a/src/fileio.c b/src/fileio.c index c0f6c1d2e8e..fb021cee5a4 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -4186,7 +4186,7 @@ variable `last-coding-system-used' to the coding system actually used. */) | |||
| 4186 | /* If REPLACE is non-nil and we succeeded in not replacing the | 4186 | /* If REPLACE is non-nil and we succeeded in not replacing the |
| 4187 | beginning or end of the buffer text with the file's contents, | 4187 | beginning or end of the buffer text with the file's contents, |
| 4188 | call format-decode with `point' positioned at the beginning | 4188 | call format-decode with `point' positioned at the beginning |
| 4189 | of the buffer and `inserted' equalling the number of | 4189 | of the buffer and `inserted' equaling the number of |
| 4190 | characters in the buffer. Otherwise, format-decode might | 4190 | characters in the buffer. Otherwise, format-decode might |
| 4191 | fail to correctly analyze the beginning or end of the buffer. | 4191 | fail to correctly analyze the beginning or end of the buffer. |
| 4192 | Hence we temporarily save `point' and `inserted' here and | 4192 | Hence we temporarily save `point' and `inserted' here and |
diff --git a/src/ftxfont.c b/src/ftxfont.c index 608cfd8d44d..e04e802a3db 100644 --- a/src/ftxfont.c +++ b/src/ftxfont.c | |||
| @@ -48,8 +48,8 @@ static GC *ftxfont_get_gcs (FRAME_PTR, unsigned long, unsigned long); | |||
| 48 | static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *, | 48 | static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *, |
| 49 | unsigned, int, int, XPoint *, int, int *, | 49 | unsigned, int, int, XPoint *, int, int *, |
| 50 | int); | 50 | int); |
| 51 | static void ftxfont_draw_backgrond (FRAME_PTR, struct font *, GC, | 51 | static void ftxfont_draw_background (FRAME_PTR, struct font *, GC, |
| 52 | int, int, int); | 52 | int, int, int); |
| 53 | 53 | ||
| 54 | struct ftxfont_frame_data | 54 | struct ftxfont_frame_data |
| 55 | { | 55 | { |
| @@ -219,7 +219,8 @@ ftxfont_draw_bitmap (FRAME_PTR f, GC gc_fore, GC *gcs, struct font *font, unsign | |||
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | static void | 221 | static void |
| 222 | ftxfont_draw_backgrond (FRAME_PTR f, struct font *font, GC gc, int x, int y, int width) | 222 | ftxfont_draw_background (FRAME_PTR f, struct font *font, GC gc, int x, int y, |
| 223 | int width) | ||
| 223 | { | 224 | { |
| 224 | XGCValues xgcv; | 225 | XGCValues xgcv; |
| 225 | 226 | ||
| @@ -296,7 +297,7 @@ ftxfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_b | |||
| 296 | 297 | ||
| 297 | BLOCK_INPUT; | 298 | BLOCK_INPUT; |
| 298 | if (with_background) | 299 | if (with_background) |
| 299 | ftxfont_draw_backgrond (f, font, s->gc, x, y, s->width); | 300 | ftxfont_draw_background (f, font, s->gc, x, y, s->width); |
| 300 | code = alloca (sizeof (unsigned) * len); | 301 | code = alloca (sizeof (unsigned) * len); |
| 301 | for (i = 0; i < len; i++) | 302 | for (i = 0; i < len; i++) |
| 302 | code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8) | 303 | code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8) |
diff --git a/src/nsterm.m b/src/nsterm.m index 5e19a397c34..17fd5a93f63 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -2108,7 +2108,7 @@ ns_scroll_run (struct window *w, struct run *run) | |||
| 2108 | } | 2108 | } |
| 2109 | else | 2109 | else |
| 2110 | { | 2110 | { |
| 2111 | /* Scolling down. Make sure we don't copy over the mode line. | 2111 | /* Scrolling down. Make sure we don't copy over the mode line. |
| 2112 | at the bottom. */ | 2112 | at the bottom. */ |
| 2113 | if (to_y + run->height > bottom_y) | 2113 | if (to_y + run->height > bottom_y) |
| 2114 | height = bottom_y - to_y; | 2114 | height = bottom_y - to_y; |
diff --git a/src/regex.c b/src/regex.c index b7699378f5a..0ba05a95fdb 100644 --- a/src/regex.c +++ b/src/regex.c | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs) | 53 | (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs) |
| 54 | #endif | 54 | #endif |
| 55 | 55 | ||
| 56 | /* For platform which support the ISO C amendement 1 functionality we | 56 | /* For platform which support the ISO C amendment 1 functionality we |
| 57 | support user defined character classes. */ | 57 | support user defined character classes. */ |
| 58 | #if WIDE_CHAR_SUPPORT | 58 | #if WIDE_CHAR_SUPPORT |
| 59 | /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ | 59 | /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ |
diff --git a/src/regex.h b/src/regex.h index eba62f2e769..32ccfb7ddef 100644 --- a/src/regex.h +++ b/src/regex.h | |||
| @@ -582,7 +582,7 @@ extern void regfree _RE_ARGS ((regex_t *__preg)); | |||
| 582 | } | 582 | } |
| 583 | #endif /* C++ */ | 583 | #endif /* C++ */ |
| 584 | 584 | ||
| 585 | /* For platform which support the ISO C amendement 1 functionality we | 585 | /* For platform which support the ISO C amendment 1 functionality we |
| 586 | support user defined character classes. */ | 586 | support user defined character classes. */ |
| 587 | #if WIDE_CHAR_SUPPORT | 587 | #if WIDE_CHAR_SUPPORT |
| 588 | /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ | 588 | /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ |
| @@ -592,7 +592,7 @@ extern void regfree _RE_ARGS ((regex_t *__preg)); | |||
| 592 | 592 | ||
| 593 | #if WIDE_CHAR_SUPPORT | 593 | #if WIDE_CHAR_SUPPORT |
| 594 | /* The GNU C library provides support for user-defined character classes | 594 | /* The GNU C library provides support for user-defined character classes |
| 595 | and the functions from ISO C amendement 1. */ | 595 | and the functions from ISO C amendment 1. */ |
| 596 | # ifdef CHARCLASS_NAME_MAX | 596 | # ifdef CHARCLASS_NAME_MAX |
| 597 | # define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX | 597 | # define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX |
| 598 | # else | 598 | # else |
diff --git a/src/textprop.c b/src/textprop.c index 29425f7a550..a1c7593f568 100644 --- a/src/textprop.c +++ b/src/textprop.c | |||
| @@ -1625,7 +1625,7 @@ Return t if any property was actually removed, nil otherwise. */) | |||
| 1625 | 1625 | ||
| 1626 | DEFUN ("text-property-any", Ftext_property_any, | 1626 | DEFUN ("text-property-any", Ftext_property_any, |
| 1627 | Stext_property_any, 4, 5, 0, | 1627 | Stext_property_any, 4, 5, 0, |
| 1628 | doc: /* Check text from START to END for property PROPERTY equalling VALUE. | 1628 | doc: /* Check text from START to END for property PROPERTY equaling VALUE. |
| 1629 | If so, return the position of the first character whose property PROPERTY | 1629 | If so, return the position of the first character whose property PROPERTY |
| 1630 | is `eq' to VALUE. Otherwise return nil. | 1630 | is `eq' to VALUE. Otherwise return nil. |
| 1631 | If the optional fifth argument OBJECT is a buffer (or nil, which means | 1631 | If the optional fifth argument OBJECT is a buffer (or nil, which means |
| @@ -1661,7 +1661,7 @@ markers). If OBJECT is a string, START and END are 0-based indices into it. */ | |||
| 1661 | 1661 | ||
| 1662 | DEFUN ("text-property-not-all", Ftext_property_not_all, | 1662 | DEFUN ("text-property-not-all", Ftext_property_not_all, |
| 1663 | Stext_property_not_all, 4, 5, 0, | 1663 | Stext_property_not_all, 4, 5, 0, |
| 1664 | doc: /* Check text from START to END for property PROPERTY not equalling VALUE. | 1664 | doc: /* Check text from START to END for property PROPERTY not equaling VALUE. |
| 1665 | If so, return the position of the first character whose property PROPERTY | 1665 | If so, return the position of the first character whose property PROPERTY |
| 1666 | is not `eq' to VALUE. Otherwise, return nil. | 1666 | is not `eq' to VALUE. Otherwise, return nil. |
| 1667 | If the optional fifth argument OBJECT is a buffer (or nil, which means | 1667 | If the optional fifth argument OBJECT is a buffer (or nil, which means |
diff --git a/src/w32select.c b/src/w32select.c index e3225c3f996..392cb07a96d 100644 --- a/src/w32select.c +++ b/src/w32select.c | |||
| @@ -39,7 +39,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 39 | * | 39 | * |
| 40 | * When copying or cutting (sending data to the OS), the data is | 40 | * When copying or cutting (sending data to the OS), the data is |
| 41 | * announced and stored internally, but only actually rendered on | 41 | * announced and stored internally, but only actually rendered on |
| 42 | * request. The requester determines the format provided. The | 42 | * request. The requestor determines the format provided. The |
| 43 | * {next-}selection-coding-system is only used, when its corresponding | 43 | * {next-}selection-coding-system is only used, when its corresponding |
| 44 | * clipboard type matches the type requested. | 44 | * clipboard type matches the type requested. |
| 45 | * | 45 | * |
| @@ -335,7 +335,7 @@ render_all (Lisp_Object ignore) | |||
| 335 | 335 | ||
| 336 | OpenClipboard (NULL); | 336 | OpenClipboard (NULL); |
| 337 | 337 | ||
| 338 | /* There is no usefull means to report errors here, there are none | 338 | /* There is no useful means to report errors here, there are none |
| 339 | expected anyway, and even if there were errors, they wouldn't do | 339 | expected anyway, and even if there were errors, they wouldn't do |
| 340 | any harm. So we just go ahead and do what has to be done without | 340 | any harm. So we just go ahead and do what has to be done without |
| 341 | bothering with error handling. */ | 341 | bothering with error handling. */ |
| @@ -750,7 +750,7 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data, | |||
| 750 | else | 750 | else |
| 751 | { | 751 | { |
| 752 | /* Advertise all supported formats so that whatever the | 752 | /* Advertise all supported formats so that whatever the |
| 753 | requester chooses, only one encoding step needs to be | 753 | requestor chooses, only one encoding step needs to be |
| 754 | made. This is intentionally different from what we do in | 754 | made. This is intentionally different from what we do in |
| 755 | the handler for WM_RENDERALLFORMATS. */ | 755 | the handler for WM_RENDERALLFORMATS. */ |
| 756 | SetClipboardData (CF_UNICODETEXT, NULL); | 756 | SetClipboardData (CF_UNICODETEXT, NULL); |
| @@ -1138,4 +1138,3 @@ globals_of_w32select (void) | |||
| 1138 | 1138 | ||
| 1139 | clipboard_owner = create_owner (); | 1139 | clipboard_owner = create_owner (); |
| 1140 | } | 1140 | } |
| 1141 | |||
diff --git a/src/w32term.c b/src/w32term.c index a2ccdd21f7d..6df218326d1 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -2665,7 +2665,7 @@ x_scroll_run (struct window *w, struct run *run) | |||
| 2665 | } | 2665 | } |
| 2666 | else | 2666 | else |
| 2667 | { | 2667 | { |
| 2668 | /* Scolling down. Make sure we don't copy over the mode line. | 2668 | /* Scrolling down. Make sure we don't copy over the mode line. |
| 2669 | at the bottom. */ | 2669 | at the bottom. */ |
| 2670 | if (to_y + run->height > bottom_y) | 2670 | if (to_y + run->height > bottom_y) |
| 2671 | height = bottom_y - to_y; | 2671 | height = bottom_y - to_y; |
diff --git a/src/xdisp.c b/src/xdisp.c index 52f73785e2d..3ac5651975b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -1915,7 +1915,7 @@ get_glyph_string_clip_rects (struct glyph_string *s, NativeRectangle *rects, int | |||
| 1915 | environments with anti-aliased text: if the same text is | 1915 | environments with anti-aliased text: if the same text is |
| 1916 | drawn onto the same place multiple times, it gets thicker. | 1916 | drawn onto the same place multiple times, it gets thicker. |
| 1917 | If the overlap we are processing is for the erased cursor, we | 1917 | If the overlap we are processing is for the erased cursor, we |
| 1918 | take the intersection with the rectagle of the cursor. */ | 1918 | take the intersection with the rectangle of the cursor. */ |
| 1919 | if (s->for_overlaps & OVERLAPS_ERASED_CURSOR) | 1919 | if (s->for_overlaps & OVERLAPS_ERASED_CURSOR) |
| 1920 | { | 1920 | { |
| 1921 | XRectangle rc, r_save = r; | 1921 | XRectangle rc, r_save = r; |
diff --git a/src/xselect.c b/src/xselect.c index 4bfab4143cc..f9ebdf730d4 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -516,7 +516,7 @@ static struct selection_data *converted_selections; | |||
| 516 | static Atom conversion_fail_tag; | 516 | static Atom conversion_fail_tag; |
| 517 | 517 | ||
| 518 | /* Used as an unwind-protect clause so that, if a selection-converter signals | 518 | /* Used as an unwind-protect clause so that, if a selection-converter signals |
| 519 | an error, we tell the requester that we were unable to do what they wanted | 519 | an error, we tell the requestor that we were unable to do what they wanted |
| 520 | before we throw to top-level or go into the debugger or whatever. */ | 520 | before we throw to top-level or go into the debugger or whatever. */ |
| 521 | 521 | ||
| 522 | static Lisp_Object | 522 | static Lisp_Object |
| @@ -693,7 +693,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 693 | bytes_remaining = cs->size; | 693 | bytes_remaining = cs->size; |
| 694 | bytes_remaining *= format_bytes; | 694 | bytes_remaining *= format_bytes; |
| 695 | 695 | ||
| 696 | /* Wait for the requester to ack by deleting the property. | 696 | /* Wait for the requestor to ack by deleting the property. |
| 697 | This can run Lisp code (process handlers) or signal. */ | 697 | This can run Lisp code (process handlers) or signal. */ |
| 698 | if (! had_errors) | 698 | if (! had_errors) |
| 699 | { | 699 | { |
| @@ -732,7 +732,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 732 | 732 | ||
| 733 | if (had_errors) break; | 733 | if (had_errors) break; |
| 734 | 734 | ||
| 735 | /* Wait for the requester to ack this chunk by deleting | 735 | /* Wait for the requestor to ack this chunk by deleting |
| 736 | the property. This can run Lisp code or signal. */ | 736 | the property. This can run Lisp code or signal. */ |
| 737 | TRACE1 ("Waiting for increment ACK (deletion of %s)", | 737 | TRACE1 ("Waiting for increment ACK (deletion of %s)", |
| 738 | XGetAtomName (display, cs->property)); | 738 | XGetAtomName (display, cs->property)); |
| @@ -740,7 +740,7 @@ x_reply_selection_request (struct input_event *event, | |||
| 740 | } | 740 | } |
| 741 | 741 | ||
| 742 | /* Now write a zero-length chunk to the property to tell the | 742 | /* Now write a zero-length chunk to the property to tell the |
| 743 | requester that we're done. */ | 743 | requestor that we're done. */ |
| 744 | BLOCK_INPUT; | 744 | BLOCK_INPUT; |
| 745 | if (! waiting_for_other_props_on_window (display, window)) | 745 | if (! waiting_for_other_props_on_window (display, window)) |
| 746 | XSelectInput (display, window, 0L); | 746 | XSelectInput (display, window, 0L); |
diff --git a/src/xterm.c b/src/xterm.c index 290acdd9ca4..abe52238415 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -3317,7 +3317,7 @@ x_scroll_run (struct window *w, struct run *run) | |||
| 3317 | } | 3317 | } |
| 3318 | else | 3318 | else |
| 3319 | { | 3319 | { |
| 3320 | /* Scolling down. Make sure we don't copy over the mode line. | 3320 | /* Scrolling down. Make sure we don't copy over the mode line. |
| 3321 | at the bottom. */ | 3321 | at the bottom. */ |
| 3322 | if (to_y + run->height > bottom_y) | 3322 | if (to_y + run->height > bottom_y) |
| 3323 | height = bottom_y - to_y; | 3323 | height = bottom_y - to_y; |