diff options
| author | Paul Eggert | 2011-11-13 22:27:12 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-13 22:27:12 -0800 |
| commit | 09e80d9fb9fe7239d0fa301973920845831366d3 (patch) | |
| tree | 771e73119b2ad9bf6cbf1fbff92a5f4cb1bf03ed | |
| parent | 56632ce4cd8616f0613e8734d62ec5e2f833c7dc (diff) | |
| download | emacs-09e80d9fb9fe7239d0fa301973920845831366d3.tar.gz emacs-09e80d9fb9fe7239d0fa301973920845831366d3.zip | |
Spelling fixes.
60 files changed, 116 insertions, 123 deletions
diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 1797827679b..9fbb6592b75 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by | |||
| @@ -734,7 +734,7 @@ builtintype | |||
| 734 | 734 | ||
| 735 | ;; Klaus Berndl: This parses also nonsense like "const volatile int | 735 | ;; Klaus Berndl: This parses also nonsense like "const volatile int |
| 736 | ;; const volatile const const volatile a ..." but IMHO nobody writes | 736 | ;; const volatile const const volatile a ..." but IMHO nobody writes |
| 737 | ;; such code. Normaly we shoud define a rule like typeformbase-mode | 737 | ;; such code. Normally we should define a rule like typeformbase-mode |
| 738 | ;; which exactly defines the different allowed cases and combinations | 738 | ;; which exactly defines the different allowed cases and combinations |
| 739 | ;; of declmods (minus the CVDECLMOD) typeformbase and cv-declmods so | 739 | ;; of declmods (minus the CVDECLMOD) typeformbase and cv-declmods so |
| 740 | ;; we could recognize more invalid code but IMHO this is not worth the | 740 | ;; we could recognize more invalid code but IMHO this is not worth the |
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a808a96b444..84bb7cf30df 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1711,7 +1711,7 @@ | |||
| 1711 | (Table of Resources): Document fontBackend resource. | 1711 | (Table of Resources): Document fontBackend resource. |
| 1712 | 1712 | ||
| 1713 | * trouble.texi (Quitting): Add other undo bindings to table. | 1713 | * trouble.texi (Quitting): Add other undo bindings to table. |
| 1714 | (DEL Does Not Delete): Note that the erasure key is usually labelled | 1714 | (DEL Does Not Delete): Note that the erasure key is usually labeled |
| 1715 | "Backspace". Remove discussion of obscure Xmodmap issue. | 1715 | "Backspace". Remove discussion of obscure Xmodmap issue. |
| 1716 | 1716 | ||
| 1717 | 2009-05-07 Chong Yidong <cyd@stupidchicken.com> | 1717 | 2009-05-07 Chong Yidong <cyd@stupidchicken.com> |
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index fd680576b4e..5b98216369d 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi | |||
| @@ -82,7 +82,7 @@ under it. It looks like this, in part: | |||
| 82 | @group | 82 | @group |
| 83 | /- Emacs group: Customization of the One True Editor. -------------\ | 83 | /- Emacs group: Customization of the One True Editor. -------------\ |
| 84 | [State]: visible group members are all at standard values. | 84 | [State]: visible group members are all at standard values. |
| 85 | 85 | ||
| 86 | See also [Manual]. | 86 | See also [Manual]. |
| 87 | 87 | ||
| 88 | [Editing] : Basic text editing facilities. | 88 | [Editing] : Basic text editing facilities. |
| @@ -547,7 +547,7 @@ such collections from one computer to another. | |||
| 547 | To define a Custom theme, use @kbd{M-x customize-create-theme}, | 547 | To define a Custom theme, use @kbd{M-x customize-create-theme}, |
| 548 | which brings up a buffer named @samp{*New Custom Theme*}. At the top | 548 | which brings up a buffer named @samp{*New Custom Theme*}. At the top |
| 549 | of the buffer is an editable field where you can specify the name of | 549 | of the buffer is an editable field where you can specify the name of |
| 550 | the theme. Click on the button labelled @samp{Insert Variable} to add | 550 | the theme. Click on the button labeled @samp{Insert Variable} to add |
| 551 | a variable to the theme, and click on @samp{Insert Face} to add a | 551 | a variable to the theme, and click on @samp{Insert Face} to add a |
| 552 | face. You can edit these values in the @samp{*New Custom Theme*} | 552 | face. You can edit these values in the @samp{*New Custom Theme*} |
| 553 | buffer like in an ordinary Customize buffer. To remove an option from | 553 | buffer like in an ordinary Customize buffer. To remove an option from |
| @@ -1068,7 +1068,7 @@ other context has no special meaning. | |||
| 1068 | well as the major modes; in fact, you can use it more than once, first | 1068 | well as the major modes; in fact, you can use it more than once, first |
| 1069 | to set the major mode and then to enable minor modes which are | 1069 | to set the major mode and then to enable minor modes which are |
| 1070 | specific to particular buffers. Using @code{mode} for minor modes | 1070 | specific to particular buffers. Using @code{mode} for minor modes |
| 1071 | is deprecated, though---instead, use @code{eval: (minor-mode 1)}. | 1071 | is deprecated, though---instead, use @code{eval: (minor-mode 1)}. |
| 1072 | 1072 | ||
| 1073 | Often, however, it is a mistake to enable minor modes in file local | 1073 | Often, however, it is a mistake to enable minor modes in file local |
| 1074 | variables. Most minor modes, like Auto Fill mode, represent individual user | 1074 | variables. Most minor modes, like Auto Fill mode, represent individual user |
| @@ -1646,7 +1646,7 @@ ways to use these modifiers; the key labeled @key{Alt} on most | |||
| 1646 | keyboards usually issues the @key{Meta} modifier, not @key{Alt}. The | 1646 | keyboards usually issues the @key{Meta} modifier, not @key{Alt}. The |
| 1647 | standard key bindings in Emacs do not include any characters with | 1647 | standard key bindings in Emacs do not include any characters with |
| 1648 | these modifiers. However, you can customize Emacs to assign meanings | 1648 | these modifiers. However, you can customize Emacs to assign meanings |
| 1649 | to them. The modifier bits are labelled as @samp{s-}, @samp{H-} and | 1649 | to them. The modifier bits are labeled as @samp{s-}, @samp{H-} and |
| 1650 | @samp{A-} respectively. | 1650 | @samp{A-} respectively. |
| 1651 | 1651 | ||
| 1652 | Even if your keyboard lacks these additional modifier keys, you can | 1652 | Even if your keyboard lacks these additional modifier keys, you can |
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index ec159af6f84..ae7550d0fae 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi | |||
| @@ -161,7 +161,7 @@ in the Emacs distribution. Type @kbd{C-h C-f} to read the FAQ; type | |||
| 161 | @cindex @key{BACKSPACE} vs @key{DEL} | 161 | @cindex @key{BACKSPACE} vs @key{DEL} |
| 162 | @cindex usual erasure key | 162 | @cindex usual erasure key |
| 163 | 163 | ||
| 164 | Every keyboard has a large key, usually labelled @key{Backspace}, | 164 | Every keyboard has a large key, usually labeled @key{Backspace}, |
| 165 | which is ordinarily used to erase the last character that you typed. | 165 | which is ordinarily used to erase the last character that you typed. |
| 166 | We call this key @dfn{the usual erasure key}. In Emacs, it is | 166 | We call this key @dfn{the usual erasure key}. In Emacs, it is |
| 167 | supposed to be equivalent to @key{DEL}. | 167 | supposed to be equivalent to @key{DEL}. |
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 11ceea19eef..841bf8a0c95 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi | |||
| @@ -357,7 +357,7 @@ every node in every chapter. | |||
| 357 | * Conclusion:: Now you have the basics. | 357 | * Conclusion:: Now you have the basics. |
| 358 | * the-the:: An appendix: how to find reduplicated words. | 358 | * the-the:: An appendix: how to find reduplicated words. |
| 359 | * Kill Ring:: An appendix: how the kill ring works. | 359 | * Kill Ring:: An appendix: how the kill ring works. |
| 360 | * Full Graph:: How to create a graph with labelled axes. | 360 | * Full Graph:: How to create a graph with labeled axes. |
| 361 | * Free Software and Free Manuals:: | 361 | * Free Software and Free Manuals:: |
| 362 | * GNU Free Documentation License:: | 362 | * GNU Free Documentation License:: |
| 363 | * Index:: | 363 | * Index:: |
| @@ -793,9 +793,9 @@ The @code{current-kill} Function | |||
| 793 | * Digression concerning error:: How to mislead humans, but not computers. | 793 | * Digression concerning error:: How to mislead humans, but not computers. |
| 794 | * Determining the Element:: | 794 | * Determining the Element:: |
| 795 | 795 | ||
| 796 | A Graph with Labelled Axes | 796 | A Graph with Labeled Axes |
| 797 | 797 | ||
| 798 | * Labelled Example:: | 798 | * Labeled Example:: |
| 799 | * print-graph Varlist:: @code{let} expression in @code{print-graph}. | 799 | * print-graph Varlist:: @code{let} expression in @code{print-graph}. |
| 800 | * print-Y-axis:: Print a label for the vertical axis. | 800 | * print-Y-axis:: Print a label for the vertical axis. |
| 801 | * print-X-axis:: Print a horizontal label. | 801 | * print-X-axis:: Print a horizontal label. |
| @@ -1023,7 +1023,7 @@ the command in parentheses, like this: @kbd{M-C-\} | |||
| 1023 | invoke the command; this is called @dfn{rebinding}. @xref{Keymaps, , | 1023 | invoke the command; this is called @dfn{rebinding}. @xref{Keymaps, , |
| 1024 | Keymaps}.) The abbreviation @kbd{M-C-\} means that you type your | 1024 | Keymaps}.) The abbreviation @kbd{M-C-\} means that you type your |
| 1025 | @key{META} key, @key{CTRL} key and @key{\} key all at the same time. | 1025 | @key{META} key, @key{CTRL} key and @key{\} key all at the same time. |
| 1026 | (On many modern keyboards the @key{META} key is labelled | 1026 | (On many modern keyboards the @key{META} key is labeled |
| 1027 | @key{ALT}.) | 1027 | @key{ALT}.) |
| 1028 | Sometimes a combination like this is called a keychord, since it is | 1028 | Sometimes a combination like this is called a keychord, since it is |
| 1029 | similar to the way you play a chord on a piano. If your keyboard does | 1029 | similar to the way you play a chord on a piano. If your keyboard does |
| @@ -1031,7 +1031,7 @@ not have a @key{META} key, the @key{ESC} key prefix is used in place | |||
| 1031 | of it. In this case, @kbd{M-C-\} means that you press and release your | 1031 | of it. In this case, @kbd{M-C-\} means that you press and release your |
| 1032 | @key{ESC} key and then type the @key{CTRL} key and the @key{\} key at | 1032 | @key{ESC} key and then type the @key{CTRL} key and the @key{\} key at |
| 1033 | the same time. But usually @kbd{M-C-\} means press the @key{CTRL} key | 1033 | the same time. But usually @kbd{M-C-\} means press the @key{CTRL} key |
| 1034 | along with the key that is labelled @key{ALT} and, at the same time, | 1034 | along with the key that is labeled @key{ALT} and, at the same time, |
| 1035 | press the @key{\} key. | 1035 | press the @key{\} key. |
| 1036 | 1036 | ||
| 1037 | In addition to typing a lone keychord, you can prefix what you type | 1037 | In addition to typing a lone keychord, you can prefix what you type |
| @@ -4749,7 +4749,7 @@ type in the name of the function whose source code you want to see, | |||
| 4749 | such as @code{mark-whole-buffer}, and then type @key{RET}. Emacs will | 4749 | such as @code{mark-whole-buffer}, and then type @key{RET}. Emacs will |
| 4750 | switch buffers and display the source code for the function on your | 4750 | switch buffers and display the source code for the function on your |
| 4751 | screen. To switch back to your current buffer, type @kbd{C-x b | 4751 | screen. To switch back to your current buffer, type @kbd{C-x b |
| 4752 | @key{RET}}. (On some keyboards, the @key{META} key is labelled | 4752 | @key{RET}}. (On some keyboards, the @key{META} key is labeled |
| 4753 | @key{ALT}.) | 4753 | @key{ALT}.) |
| 4754 | 4754 | ||
| 4755 | @c !!! 22.1.1 tags table location in this paragraph | 4755 | @c !!! 22.1.1 tags table location in this paragraph |
| @@ -16962,7 +16962,7 @@ For this reason, I have written enhancements to the basic | |||
| 16962 | @code{print-graph-body} function that automatically print labels for | 16962 | @code{print-graph-body} function that automatically print labels for |
| 16963 | the horizontal and vertical axes. Since the label printing functions | 16963 | the horizontal and vertical axes. Since the label printing functions |
| 16964 | do not contain much new material, I have placed their description in | 16964 | do not contain much new material, I have placed their description in |
| 16965 | an appendix. @xref{Full Graph, , A Graph with Labelled Axes}. | 16965 | an appendix. @xref{Full Graph, , A Graph with Labeled Axes}. |
| 16966 | 16966 | ||
| 16967 | @node Line Graph Exercise, , Printed Axes, Readying a Graph | 16967 | @node Line Graph Exercise, , Printed Axes, Readying a Graph |
| 16968 | @section Exercise | 16968 | @section Exercise |
| @@ -19447,7 +19447,7 @@ whether the kill ring is full or empty. This is an act of | |||
| 19447 | exploration. | 19447 | exploration. |
| 19448 | 19448 | ||
| 19449 | From the human point of view, the act of exploration and discovery is | 19449 | From the human point of view, the act of exploration and discovery is |
| 19450 | not necessarily an error, and therefore should not be labelled as one, | 19450 | not necessarily an error, and therefore should not be labeled as one, |
| 19451 | even in the bowels of a computer. As it is, the code in Emacs implies | 19451 | even in the bowels of a computer. As it is, the code in Emacs implies |
| 19452 | that a human who is acting virtuously, by exploring his or her | 19452 | that a human who is acting virtuously, by exploring his or her |
| 19453 | environment, is making an error. This is bad. Even though the computer | 19453 | environment, is making an error. This is bad. Even though the computer |
| @@ -19760,25 +19760,25 @@ as @code{kill-ring-yank-pointer} do not use this library, possibly | |||
| 19760 | because they were written earlier. | 19760 | because they were written earlier. |
| 19761 | 19761 | ||
| 19762 | @node Full Graph, Free Software and Free Manuals, Kill Ring, Top | 19762 | @node Full Graph, Free Software and Free Manuals, Kill Ring, Top |
| 19763 | @appendix A Graph with Labelled Axes | 19763 | @appendix A Graph with Labeled Axes |
| 19764 | 19764 | ||
| 19765 | Printed axes help you understand a graph. They convey scale. In an | 19765 | Printed axes help you understand a graph. They convey scale. In an |
| 19766 | earlier chapter (@pxref{Readying a Graph, , Readying a Graph}), we | 19766 | earlier chapter (@pxref{Readying a Graph, , Readying a Graph}), we |
| 19767 | wrote the code to print the body of a graph. Here we write the code | 19767 | wrote the code to print the body of a graph. Here we write the code |
| 19768 | for printing and labelling vertical and horizontal axes, along with the | 19768 | for printing and labeling vertical and horizontal axes, along with the |
| 19769 | body itself. | 19769 | body itself. |
| 19770 | 19770 | ||
| 19771 | @menu | 19771 | @menu |
| 19772 | * Labelled Example:: | 19772 | * Labeled Example:: |
| 19773 | * print-graph Varlist:: @code{let} expression in @code{print-graph}. | 19773 | * print-graph Varlist:: @code{let} expression in @code{print-graph}. |
| 19774 | * print-Y-axis:: Print a label for the vertical axis. | 19774 | * print-Y-axis:: Print a label for the vertical axis. |
| 19775 | * print-X-axis:: Print a horizontal label. | 19775 | * print-X-axis:: Print a horizontal label. |
| 19776 | * Print Whole Graph:: The function to print a complete graph. | 19776 | * Print Whole Graph:: The function to print a complete graph. |
| 19777 | @end menu | 19777 | @end menu |
| 19778 | 19778 | ||
| 19779 | @node Labelled Example, print-graph Varlist, Full Graph, Full Graph | 19779 | @node Labeled Example, print-graph Varlist, Full Graph, Full Graph |
| 19780 | @ifnottex | 19780 | @ifnottex |
| 19781 | @unnumberedsec Labelled Example Graph | 19781 | @unnumberedsec Labeled Example Graph |
| 19782 | @end ifnottex | 19782 | @end ifnottex |
| 19783 | 19783 | ||
| 19784 | Since insertions fill a buffer to the right and below point, the new | 19784 | Since insertions fill a buffer to the right and below point, the new |
| @@ -19821,9 +19821,9 @@ Here is an example of how a finished graph should look: | |||
| 19821 | @end smallexample | 19821 | @end smallexample |
| 19822 | 19822 | ||
| 19823 | @noindent | 19823 | @noindent |
| 19824 | In this graph, both the vertical and the horizontal axes are labelled | 19824 | In this graph, both the vertical and the horizontal axes are labeled |
| 19825 | with numbers. However, in some graphs, the horizontal axis is time | 19825 | with numbers. However, in some graphs, the horizontal axis is time |
| 19826 | and would be better labelled with months, like this: | 19826 | and would be better labeled with months, like this: |
| 19827 | 19827 | ||
| 19828 | @smallexample | 19828 | @smallexample |
| 19829 | @group | 19829 | @group |
| @@ -19838,9 +19838,9 @@ and would be better labelled with months, like this: | |||
| 19838 | @end smallexample | 19838 | @end smallexample |
| 19839 | 19839 | ||
| 19840 | Indeed, with a little thought, we can easily come up with a variety of | 19840 | Indeed, with a little thought, we can easily come up with a variety of |
| 19841 | vertical and horizontal labelling schemes. Our task could become | 19841 | vertical and horizontal labeling schemes. Our task could become |
| 19842 | complicated. But complications breed confusion. Rather than permit | 19842 | complicated. But complications breed confusion. Rather than permit |
| 19843 | this, it is better choose a simple labelling scheme for our first | 19843 | this, it is better choose a simple labeling scheme for our first |
| 19844 | effort, and to modify or replace it later. | 19844 | effort, and to modify or replace it later. |
| 19845 | 19845 | ||
| 19846 | @need 1200 | 19846 | @need 1200 |
| @@ -19864,7 +19864,7 @@ These considerations suggest the following outline for the | |||
| 19864 | We can work on each part of the @code{print-graph} function definition | 19864 | We can work on each part of the @code{print-graph} function definition |
| 19865 | in turn. | 19865 | in turn. |
| 19866 | 19866 | ||
| 19867 | @node print-graph Varlist, print-Y-axis, Labelled Example, Full Graph | 19867 | @node print-graph Varlist, print-Y-axis, Labeled Example, Full Graph |
| 19868 | @comment node-name, next, previous, up | 19868 | @comment node-name, next, previous, up |
| 19869 | @appendixsec The @code{print-graph} Varlist | 19869 | @appendixsec The @code{print-graph} Varlist |
| 19870 | @cindex @code{print-graph} varlist | 19870 | @cindex @code{print-graph} varlist |
| @@ -20391,7 +20391,7 @@ blank spaces and also separated according to the value of the variable | |||
| 20391 | The value of the variable @code{X-axis-label-spacing} should itself be | 20391 | The value of the variable @code{X-axis-label-spacing} should itself be |
| 20392 | measured in units of @code{symbol-width}, since you may want to change | 20392 | measured in units of @code{symbol-width}, since you may want to change |
| 20393 | the width of the symbols that you are using to print the body of the | 20393 | the width of the symbols that you are using to print the body of the |
| 20394 | graph without changing the ways the graph is labelled. | 20394 | graph without changing the ways the graph is labeled. |
| 20395 | 20395 | ||
| 20396 | @menu | 20396 | @menu |
| 20397 | * Similarities differences:: Much like @code{print-Y-axis}, but not exactly. | 20397 | * Similarities differences:: Much like @code{print-Y-axis}, but not exactly. |
| @@ -20722,7 +20722,7 @@ Emacs will print the horizontal axis like this: | |||
| 20722 | Now we are nearly ready to print the whole graph. | 20722 | Now we are nearly ready to print the whole graph. |
| 20723 | 20723 | ||
| 20724 | The function to print the graph with the proper labels follows the | 20724 | The function to print the graph with the proper labels follows the |
| 20725 | outline we created earlier (@pxref{Full Graph, , A Graph with Labelled | 20725 | outline we created earlier (@pxref{Full Graph, , A Graph with Labeled |
| 20726 | Axes}), but with additions. | 20726 | Axes}), but with additions. |
| 20727 | 20727 | ||
| 20728 | @need 1250 | 20728 | @need 1250 |
| @@ -20857,7 +20857,7 @@ Finally, the code for the @code{print-graph} function: | |||
| 20857 | ;;; @r{Final version.} | 20857 | ;;; @r{Final version.} |
| 20858 | (defun print-graph | 20858 | (defun print-graph |
| 20859 | (numbers-list &optional vertical-step) | 20859 | (numbers-list &optional vertical-step) |
| 20860 | "Print labelled bar graph of the NUMBERS-LIST. | 20860 | "Print labeled bar graph of the NUMBERS-LIST. |
| 20861 | The numbers-list consists of the Y-axis values. | 20861 | The numbers-list consists of the Y-axis values. |
| 20862 | @end group | 20862 | @end group |
| 20863 | 20863 | ||
| @@ -21478,7 +21478,7 @@ each column." | |||
| 21478 | @group | 21478 | @group |
| 21479 | (defun print-graph | 21479 | (defun print-graph |
| 21480 | (numbers-list &optional vertical-step horizontal-step) | 21480 | (numbers-list &optional vertical-step horizontal-step) |
| 21481 | "Print labelled bar graph of the NUMBERS-LIST. | 21481 | "Print labeled bar graph of the NUMBERS-LIST. |
| 21482 | The numbers-list consists of the Y-axis values. | 21482 | The numbers-list consists of the Y-axis values. |
| 21483 | @end group | 21483 | @end group |
| 21484 | 21484 | ||
| @@ -21979,7 +21979,7 @@ each column." | |||
| 21979 | @group | 21979 | @group |
| 21980 | (defun print-graph | 21980 | (defun print-graph |
| 21981 | (numbers-list &optional vertical-step horizontal-step) | 21981 | (numbers-list &optional vertical-step horizontal-step) |
| 21982 | "Print labelled bar graph of the NUMBERS-LIST. | 21982 | "Print labeled bar graph of the NUMBERS-LIST. |
| 21983 | The numbers-list consists of the Y-axis values. | 21983 | The numbers-list consists of the Y-axis values. |
| 21984 | @end group | 21984 | @end group |
| 21985 | 21985 | ||
| @@ -22275,4 +22275,3 @@ airplane. | |||
| 22275 | @c @end iftex | 22275 | @c @end iftex |
| 22276 | 22276 | ||
| 22277 | @bye | 22277 | @bye |
| 22278 | |||
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index d9399e98a69..d2e86a77112 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi | |||
| @@ -2414,7 +2414,7 @@ This function returns the ``vendor'' that provided the X server | |||
| 2414 | software (as a string). Really this means whoever distributes the X | 2414 | software (as a string). Really this means whoever distributes the X |
| 2415 | server. | 2415 | server. |
| 2416 | 2416 | ||
| 2417 | When the developers of X labelled software distributors as | 2417 | When the developers of X labeled software distributors as |
| 2418 | ``vendors,'' they showed their false assumption that no system could | 2418 | ``vendors,'' they showed their false assumption that no system could |
| 2419 | ever be developed and distributed noncommercially. | 2419 | ever be developed and distributed noncommercially. |
| 2420 | @end defun | 2420 | @end defun |
| @@ -2430,4 +2430,3 @@ This variable's value is @code{t} if no X window manager is in use. | |||
| 2430 | The functions @code{x-pixel-width} and @code{x-pixel-height} return the | 2430 | The functions @code{x-pixel-width} and @code{x-pixel-height} return the |
| 2431 | width and height of an X Window frame, measured in pixels. | 2431 | width and height of an X Window frame, measured in pixels. |
| 2432 | @end ignore | 2432 | @end ignore |
| 2433 | |||
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index d1cecf1347a..d802e4259f5 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi | |||
| @@ -748,7 +748,7 @@ explanation function. | |||
| 748 | 748 | ||
| 749 | Both @code{ert-run-tests-interactively} and @code{ert-run-tests-batch} | 749 | Both @code{ert-run-tests-interactively} and @code{ert-run-tests-batch} |
| 750 | are implemented on top of the lower-level test handling code in the | 750 | are implemented on top of the lower-level test handling code in the |
| 751 | sections of @file{ert.el} labelled ``Facilities for running a single test'', | 751 | sections of @file{ert.el} labeled ``Facilities for running a single test'', |
| 752 | ``Test selectors'', and ``Facilities for running a whole set of tests''. | 752 | ``Test selectors'', and ``Facilities for running a whole set of tests''. |
| 753 | 753 | ||
| 754 | If you want to write code that works with ERT tests, you should take a | 754 | If you want to write code that works with ERT tests, you should take a |
diff --git a/etc/AUTHORS b/etc/AUTHORS index f214d5e5515..f8ab274e136 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS | |||
| @@ -908,7 +908,7 @@ Derek Upham: changed nxml-mode.el | |||
| 908 | 908 | ||
| 909 | Detlev Zundel: wrote re-builder.el | 909 | Detlev Zundel: wrote re-builder.el |
| 910 | 910 | ||
| 911 | Devon Sean Mccullough: changed comint.el | 911 | Devon Sean McCullough: changed comint.el |
| 912 | 912 | ||
| 913 | Dhruva Krishnamurthy: changed makefile.w32-in emacsclient.c fontset.c | 913 | Dhruva Krishnamurthy: changed makefile.w32-in emacsclient.c fontset.c |
| 914 | sound.c w32proc.c | 914 | sound.c w32proc.c |
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 89856429b1d..e8570cb7c48 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 | |||
| @@ -963,7 +963,7 @@ a slash is appended to it. | |||
| 963 | * Undo can clear modified-flag. | 963 | * Undo can clear modified-flag. |
| 964 | 964 | ||
| 965 | If you undo changes in a buffer back to a state in which the | 965 | If you undo changes in a buffer back to a state in which the |
| 966 | buffer was not considered "modified", then it is labelled as | 966 | buffer was not considered "modified", then it is labeled as |
| 967 | once again "unmodified". | 967 | once again "unmodified". |
| 968 | 968 | ||
| 969 | * M-x run-lisp. | 969 | * M-x run-lisp. |
diff --git a/etc/tutorials/TUTORIAL.ja b/etc/tutorials/TUTORIAL.ja index e4917d40987..d50727ceb82 100644 --- a/etc/tutorials/TUTORIAL.ja +++ b/etc/tutorials/TUTORIAL.ja | |||
| @@ -524,7 +524,7 @@ C-_ $B$d(B C-x u $B$O?tCM0z?t$r7+$jJV$72s?t$H2r<a$7$^$9!#(B | |||
| 524 | 524 | ||
| 525 | >> "foo" $B$H$$$&L>$N%U%!%$%k$r:n$j$^$7$g$&!#(BC-x C-f foo <Return> $B$G$9!#(B | 525 | >> "foo" $B$H$$$&L>$N%U%!%$%k$r:n$j$^$7$g$&!#(BC-x C-f foo <Return> $B$G$9!#(B |
| 526 | $B2?$+J8>O$rF~$l!"JT=8$7!"(BC-x C-s $B$G(B "foo" $B$r%;!<%V$7$F2<$5$$!#(B | 526 | $B2?$+J8>O$rF~$l!"JT=8$7!"(BC-x C-s $B$G(B "foo" $B$r%;!<%V$7$F2<$5$$!#(B |
| 527 | $B:G8e$K(B C-x C-f TUTORIAL.ja <Retrun> $B$H%?%$%W$7(B | 527 | $B:G8e$K(B C-x C-f TUTORIAL.ja <Return> $B$H%?%$%W$7(B |
| 528 | $BF~Lg%,%$%I$KLa$j$^$7$g$&!#(B | 528 | $BF~Lg%,%$%I$KLa$j$^$7$g$&!#(B |
| 529 | 529 | ||
| 530 | Emacs $B$O%U%!%$%k$NFbMF$r%P%C%U%!!J(Bbuffer$B!K$H8F$P$l$k$b$N$NCf$K3JG<$7$F(B | 530 | Emacs $B$O%U%!%$%k$NFbMF$r%P%C%U%!!J(Bbuffer$B!K$H8F$P$l$k$b$N$NCf$K3JG<$7$F(B |
| @@ -890,7 +890,7 @@ ESC $B$O$=$l<+BN$,0l$D$NJ8;z$G=$>~%-!<$G$O$J$$$+$i$G$9!#(B | |||
| 890 | 890 | ||
| 891 | >> M-x make-frame <Return> $B$H%?%$%W$7$F!"?7$7$$%U%l!<%`$,I=<($5$l$k$N(B | 891 | >> M-x make-frame <Return> $B$H%?%$%W$7$F!"?7$7$$%U%l!<%`$,I=<($5$l$k$N(B |
| 892 | $B$r3NG'$7$^$7$g$&!#(B | 892 | $B$r3NG'$7$^$7$g$&!#(B |
| 893 | 893 | ||
| 894 | $B85$N%U%l!<%`$G$d$C$F$$$?$3$H$O$J$s$G$b$3$N?7$7$$%U%l!<%`$G$b$G$-$^$9!#(B | 894 | $B85$N%U%l!<%`$G$d$C$F$$$?$3$H$O$J$s$G$b$3$N?7$7$$%U%l!<%`$G$b$G$-$^$9!#(B |
| 895 | $B:G=i$N%U%l!<%`$H$=$N8e$K:n$i$l$k%U%l!<%`$G0c$$$O$"$j$^$;$s!#(B | 895 | $B:G=i$N%U%l!<%`$H$=$N8e$K:n$i$l$k%U%l!<%`$G0c$$$O$"$j$^$;$s!#(B |
| 896 | 896 | ||
| @@ -1083,4 +1083,3 @@ GNU Emacs to your friends. Help stamp out software obstructionism | |||
| 1083 | ;;; Local Variables: | 1083 | ;;; Local Variables: |
| 1084 | ;;; coding: iso-2022-jp | 1084 | ;;; coding: iso-2022-jp |
| 1085 | ;;; End: | 1085 | ;;; End: |
| 1086 | |||
diff --git a/leim/quail/ipa.el b/leim/quail/ipa.el index 503d8b4ec89..a41cf53c377 100644 --- a/leim/quail/ipa.el +++ b/leim/quail/ipa.el | |||
| @@ -170,7 +170,7 @@ incorrectly, as separate from the modified glyphs.") | |||
| 170 | ("a~" "ã") ;; Low central unrounded vowel, nasal U+00E3 | 170 | ("a~" "ã") ;; Low central unrounded vowel, nasal U+00E3 |
| 171 | ("o~" "õ") ;; Upper-mid back rounded vowel, nasal U+00F5 | 171 | ("o~" "õ") ;; Upper-mid back rounded vowel, nasal U+00F5 |
| 172 | ("u~" "Å©") ;; High back rounded vowel, nasal U+0169 | 172 | ("u~" "Å©") ;; High back rounded vowel, nasal U+0169 |
| 173 | ("~" "̃") ;; +Nasalised modifier U+0303 | 173 | ("~" "̃") ;; +Nasalized modifier U+0303 |
| 174 | (":" "Ë") ;; +Long modifier U+02D0 | 174 | (":" "Ë") ;; +Long modifier U+02D0 |
| 175 | ("-" "Ì©") ;; +Syllabic modifier U+0329 | 175 | ("-" "Ì©") ;; +Syllabic modifier U+0329 |
| 176 | ("." "Ì£") ;; +Retroflex modifier U+0323 | 176 | ("." "Ì£") ;; +Retroflex modifier U+0323 |
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 1c2f2b5b015..a1cba0a9cd9 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 | |||
| @@ -9383,7 +9383,7 @@ | |||
| 9383 | 9383 | ||
| 9384 | 2002-10-06 Glenn Morris <gmorris@ast.cam.ac.uk> | 9384 | 2002-10-06 Glenn Morris <gmorris@ast.cam.ac.uk> |
| 9385 | 9385 | ||
| 9386 | * progmodes/fortran.el (fortran-beginning-do): Ignore labelled DO | 9386 | * progmodes/fortran.el (fortran-beginning-do): Ignore labeled DO |
| 9387 | loops. | 9387 | loops. |
| 9388 | 9388 | ||
| 9389 | 2002-10-05 Stefan Monnier <monnier@cs.yale.edu> | 9389 | 2002-10-05 Stefan Monnier <monnier@cs.yale.edu> |
| @@ -23550,4 +23550,3 @@ See ChangeLog.9 for earlier changes. | |||
| 23550 | 23550 | ||
| 23551 | You should have received a copy of the GNU General Public License | 23551 | You should have received a copy of the GNU General Public License |
| 23552 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 23552 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 23553 | |||
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 7ef7fe9dffc..ed7ee443c4c 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 | |||
| @@ -4923,10 +4923,10 @@ | |||
| 4923 | (fortran-blink-matching-if, fortran-blink-matching-do) | 4923 | (fortran-blink-matching-if, fortran-blink-matching-do) |
| 4924 | (fortran-indent-new-line): Bind case-fold-search. | 4924 | (fortran-indent-new-line): Bind case-fold-search. |
| 4925 | (fortran-end-do, fortran-beginning-do, fortran-end-if) | 4925 | (fortran-end-do, fortran-beginning-do, fortran-end-if) |
| 4926 | (fortran-beginning-if): Bind case-fold-search. Allow labelled blocks. | 4926 | (fortran-beginning-if): Bind case-fold-search. Allow labeled blocks. |
| 4927 | Use fortran-end-prog-re. | 4927 | Use fortran-end-prog-re. |
| 4928 | (fortran-if-start-re): New variable. | 4928 | (fortran-if-start-re): New variable. |
| 4929 | (fortran-calculate-indent): Allow labelled blocks. Simplify the conds. | 4929 | (fortran-calculate-indent): Allow labeled blocks. Simplify the conds. |
| 4930 | Make select case indentation work. | 4930 | Make select case indentation work. |
| 4931 | (fortran-is-in-string-p): Ignore Emacs 18 bug kluge. | 4931 | (fortran-is-in-string-p): Ignore Emacs 18 bug kluge. |
| 4932 | (fortran-fill): Allow double quotes in check for string. | 4932 | (fortran-fill): Allow double quotes in check for string. |
| @@ -21766,9 +21766,9 @@ | |||
| 21766 | 21766 | ||
| 21767 | * f90.el (f90-no-block-limit): Fixed bug for indentation of | 21767 | * f90.el (f90-no-block-limit): Fixed bug for indentation of |
| 21768 | elsewhere and elseif. | 21768 | elsewhere and elseif. |
| 21769 | (f90-looking-at-where-or-forall): Now allows for labelled forall | 21769 | (f90-looking-at-where-or-forall): Now allows for labeled forall |
| 21770 | and where statements. | 21770 | and where statements. |
| 21771 | (f90-font-lock-keywords-2): New highlighting for labelled where | 21771 | (f90-font-lock-keywords-2): New highlighting for labeled where |
| 21772 | and forall. Fixed small bug with else highlighting. | 21772 | and forall. Fixed small bug with else highlighting. |
| 21773 | (f90-fill-region): Moved indentation to f90-break-line. | 21773 | (f90-fill-region): Moved indentation to f90-break-line. |
| 21774 | (f90-break-line): Will now always indent the second line. | 21774 | (f90-break-line): Will now always indent the second line. |
| @@ -23123,4 +23123,3 @@ See ChangeLog.6 for earlier changes. | |||
| 23123 | 23123 | ||
| 23124 | You should have received a copy of the GNU General Public License | 23124 | You should have received a copy of the GNU General Public License |
| 23125 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 23125 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 23126 | |||
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index edfe26fbc03..d2d6409cdd3 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 | |||
| @@ -14191,7 +14191,7 @@ | |||
| 14191 | 14191 | ||
| 14192 | * international/ja-dic-cnv.el: Renamed from skkdic-cnv.el. | 14192 | * international/ja-dic-cnv.el: Renamed from skkdic-cnv.el. |
| 14193 | Provide ja-dic-cnv instead of skkdic-cnv. | 14193 | Provide ja-dic-cnv instead of skkdic-cnv. |
| 14194 | (ja-dic-filename): Renamed from skkdic-filename. Referers changed. | 14194 | (ja-dic-filename): Renamed from skkdic-filename. Referrers changed. |
| 14195 | (iso-2022-7bit-short): Add safe-charsets property. | 14195 | (iso-2022-7bit-short): Add safe-charsets property. |
| 14196 | (skkdic-convert-postfix): Search Japanese chou-on character in | 14196 | (skkdic-convert-postfix): Search Japanese chou-on character in |
| 14197 | addition to Hiragana character. | 14197 | addition to Hiragana character. |
| @@ -20709,4 +20709,3 @@ See ChangeLog.8 for earlier changes. | |||
| 20709 | 20709 | ||
| 20710 | You should have received a copy of the GNU General Public License | 20710 | You should have received a copy of the GNU General Public License |
| 20711 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 20711 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 20712 | |||
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index 162da1f4815..472615039bb 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el | |||
| @@ -1632,7 +1632,7 @@ We return the item-widget corresponding to the item at point." | |||
| 1632 | (defun allout-redecorate-item (item-widget) | 1632 | (defun allout-redecorate-item (item-widget) |
| 1633 | "Resituate ITEM-WIDGET decorations, disregarding context. | 1633 | "Resituate ITEM-WIDGET decorations, disregarding context. |
| 1634 | 1634 | ||
| 1635 | Use this to redecorate only the item, when you know that it's | 1635 | Use this to redecorate only the item, when you know that its |
| 1636 | situation with respect to siblings, parent, and offspring is | 1636 | situation with respect to siblings, parent, and offspring is |
| 1637 | unchanged from its last decoration. Use | 1637 | unchanged from its last decoration. Use |
| 1638 | `allout-decorate-item-and-context' instead to reassess and adjust | 1638 | `allout-decorate-item-and-context' instead to reassess and adjust |
diff --git a/lisp/allout.el b/lisp/allout.el index 18cc3c80dc6..6b1542cd3f8 100644 --- a/lisp/allout.el +++ b/lisp/allout.el | |||
| @@ -5473,7 +5473,7 @@ header and body. The elements of that list are: | |||
| 5473 | "invalid format" format)))) | 5473 | "invalid format" format)))) |
| 5474 | (list depth prefix strings)) | 5474 | (list depth prefix strings)) |
| 5475 | result)) | 5475 | result)) |
| 5476 | ;; Reasses format, if any: | 5476 | ;; Reassess format, if any: |
| 5477 | (if (and format (listp format)) | 5477 | (if (and format (listp format)) |
| 5478 | (cond ((= new-depth depth) | 5478 | (cond ((= new-depth depth) |
| 5479 | (setq format (cons (1+ (car format)) | 5479 | (setq format (cons (1+ (car format)) |
diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el index 63991c54e7f..718fdf58b11 100644 --- a/lisp/cedet/ede/makefile-edit.el +++ b/lisp/cedet/ede/makefile-edit.el | |||
| @@ -71,7 +71,7 @@ | |||
| 71 | (end-of-line) | 71 | (end-of-line) |
| 72 | (= (preceding-char) ?\\))) | 72 | (= (preceding-char) ?\\))) |
| 73 | 73 | ||
| 74 | ;;; Programatic editing of a Makefile | 74 | ;;; Programmatic editing of a Makefile |
| 75 | ;; | 75 | ;; |
| 76 | (defun makefile-move-to-macro (macro &optional next) | 76 | (defun makefile-move-to-macro (macro &optional next) |
| 77 | "Move to the definition of MACRO. Return t if found. | 77 | "Move to the definition of MACRO. Return t if found. |
diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el index 4d68e1544a7..1c9b9bea0f4 100644 --- a/lisp/cedet/ede/proj-misc.el +++ b/lisp/cedet/ede/proj-misc.el | |||
| @@ -50,7 +50,7 @@ All listed sources are included in the distribution.") | |||
| 50 | 50 | ||
| 51 | (defvar ede-misc-source | 51 | (defvar ede-misc-source |
| 52 | (ede-sourcecode "ede-misc-source" | 52 | (ede-sourcecode "ede-misc-source" |
| 53 | :name "Miscelaneous" | 53 | :name "Miscellaneous" |
| 54 | :sourcepattern ".*") | 54 | :sourcepattern ".*") |
| 55 | "Miscellaneous field definition.") | 55 | "Miscellaneous field definition.") |
| 56 | 56 | ||
diff --git a/lisp/cedet/semantic/bovine.el b/lisp/cedet/semantic/bovine.el index 1dfbb72d416..036a6f38724 100644 --- a/lisp/cedet/semantic/bovine.el +++ b/lisp/cedet/semantic/bovine.el | |||
| @@ -240,7 +240,7 @@ list of semantic tokens found." | |||
| 240 | matchlist nil) ;;generate exit condition | 240 | matchlist nil) ;;generate exit condition |
| 241 | (if (not end) | 241 | (if (not end) |
| 242 | (setq out nil))) | 242 | (setq out nil))) |
| 243 | ;; Nothin? | 243 | ;; Nothing? |
| 244 | )) | 244 | )) |
| 245 | (setq result | 245 | (setq result |
| 246 | (if (eq s starting-stream) | 246 | (if (eq s starting-stream) |
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 1076402ac91..af293a10348 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el | |||
| @@ -1092,7 +1092,7 @@ Optional argument STAR and REF indicate the number of * and & in the typedef." | |||
| 1092 | ;; `throws' as a common name for things that toss | 1092 | ;; `throws' as a common name for things that toss |
| 1093 | ;; exceptions about. | 1093 | ;; exceptions about. |
| 1094 | :throws (nth 5 tokenpart) | 1094 | :throws (nth 5 tokenpart) |
| 1095 | ;; Reemtrant is a C++ thingy. Add it here | 1095 | ;; Reentrant is a C++ thingy. Add it here |
| 1096 | :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t) | 1096 | :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t) |
| 1097 | ;; A function post-const is funky. Try stuff | 1097 | ;; A function post-const is funky. Try stuff |
| 1098 | :methodconst-flag (if (member "const" (nth 6 tokenpart)) t) | 1098 | :methodconst-flag (if (member "const" (nth 6 tokenpart)) t) |
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 34718d1fdd2..74c4d8e3788 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el | |||
| @@ -862,7 +862,7 @@ instead." | |||
| 862 | (let ((tab (car (car tmp))) | 862 | (let ((tab (car (car tmp))) |
| 863 | (tags (cdr (car tmp)))) | 863 | (tags (cdr (car tmp)))) |
| 864 | (dolist (T tags) | 864 | (dolist (T tags) |
| 865 | ;; Normilzation gives specialty database tables a chance | 865 | ;; Normalization gives specialty database tables a chance |
| 866 | ;; to convert into a more stable tag format. | 866 | ;; to convert into a more stable tag format. |
| 867 | (let* ((norm (semanticdb-normalize-one-tag tab T)) | 867 | (let* ((norm (semanticdb-normalize-one-tag tab T)) |
| 868 | (ntab (car norm)) | 868 | (ntab (car norm)) |
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index e7e1da55ce3..35d9ff04a2a 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el | |||
| @@ -96,7 +96,7 @@ This option is ignored if `semantic-imenu-bucketize-file' is nil." | |||
| 96 | (defcustom semantic-imenu-bucketize-type-members t | 96 | (defcustom semantic-imenu-bucketize-type-members t |
| 97 | "*Non-nil if members of a type should be grouped into buckets. | 97 | "*Non-nil if members of a type should be grouped into buckets. |
| 98 | A nil value means to keep them in the same order. | 98 | A nil value means to keep them in the same order. |
| 99 | Overriden to nil if `semantic-imenu-bucketize-file' is nil." | 99 | Overridden to nil if `semantic-imenu-bucketize-file' is nil." |
| 100 | :group 'semantic-imenu | 100 | :group 'semantic-imenu |
| 101 | :type 'boolean) | 101 | :type 'boolean) |
| 102 | (make-variable-buffer-local 'semantic-imenu-bucketize-type-members) | 102 | (make-variable-buffer-local 'semantic-imenu-bucketize-type-members) |
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index 84964a9e8b4..cccfe099e74 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el | |||
| @@ -255,7 +255,7 @@ ST can be a class, or an object." | |||
| 255 | (let ((c (oref st code))) | 255 | (let ((c (oref st code))) |
| 256 | (srecode-push st) | 256 | (srecode-push st) |
| 257 | (srecode-insert-code-stream c dictionary)) | 257 | (srecode-insert-code-stream c dictionary)) |
| 258 | ;; Poping the stack is protected | 258 | ;; Popping the stack is protected. |
| 259 | (srecode-pop st))) | 259 | (srecode-pop st))) |
| 260 | 260 | ||
| 261 | (defun srecode-insert-code-stream (code dictionary) | 261 | (defun srecode-insert-code-stream (code dictionary) |
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index 5a407aad135..0a99b7869e8 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el | |||
| @@ -483,7 +483,7 @@ section or ? for an ask variable." | |||
| 483 | 483 | ||
| 484 | (if (> start (point)) | 484 | (if (> start (point)) |
| 485 | ;; If our starting point is after the found point, that | 485 | ;; If our starting point is after the found point, that |
| 486 | ;; means we are not inside the macro. Retur nil. | 486 | ;; means we are not inside the macro. Return nil. |
| 487 | nil | 487 | nil |
| 488 | ;; We are inside the macro, extract the text so far. | 488 | ;; We are inside the macro, extract the text so far. |
| 489 | (let* ((macroend (match-beginning 0)) | 489 | (let* ((macroend (match-beginning 0)) |
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 7b98ade2422..0630f5f4e4e 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el | |||
| @@ -527,7 +527,7 @@ | |||
| 527 | ;; However, don't actually bother calling `ignore'. | 527 | ;; However, don't actually bother calling `ignore'. |
| 528 | `(prog1 nil . ,(mapcar 'byte-optimize-form (cdr form)))) | 528 | `(prog1 nil . ,(mapcar 'byte-optimize-form (cdr form)))) |
| 529 | 529 | ||
| 530 | ;; Neeeded as long as we run byte-optimize-form after cconv. | 530 | ;; Needed as long as we run byte-optimize-form after cconv. |
| 531 | ((eq fn 'internal-make-closure) form) | 531 | ((eq fn 'internal-make-closure) form) |
| 532 | 532 | ||
| 533 | ((byte-code-function-p fn) | 533 | ((byte-code-function-p fn) |
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index cad7c8419b2..95d93eb113d 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el | |||
| @@ -759,7 +759,7 @@ Possible return values: | |||
| 759 | (indirect-function 'smie-op-left) | 759 | (indirect-function 'smie-op-left) |
| 760 | halfsexp)) | 760 | halfsexp)) |
| 761 | 761 | ||
| 762 | ;;; Miscellanous commands using the precedence parser. | 762 | ;;; Miscellaneous commands using the precedence parser. |
| 763 | 763 | ||
| 764 | (defun smie-backward-sexp-command (&optional n) | 764 | (defun smie-backward-sexp-command (&optional n) |
| 765 | "Move backward through N logical elements." | 765 | "Move backward through N logical elements." |
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index 75c9a01323d..e16970c6804 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el | |||
| @@ -321,7 +321,7 @@ This mode is usually not used directly; instead, other major | |||
| 321 | modes are derived from it, using `define-derived-mode'. | 321 | modes are derived from it, using `define-derived-mode'. |
| 322 | 322 | ||
| 323 | In this major mode, the buffer is divided into multiple columns, | 323 | In this major mode, the buffer is divided into multiple columns, |
| 324 | which are labelled using the header line. Each non-empty line | 324 | which are labeled using the header line. Each non-empty line |
| 325 | belongs to one \"entry\", and the entries can be sorted according | 325 | belongs to one \"entry\", and the entries can be sorted according |
| 326 | to their column values. | 326 | to their column values. |
| 327 | 327 | ||
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el index 1b245ec2e33..7ae15307a55 100644 --- a/lisp/erc/erc-notify.el +++ b/lisp/erc/erc-notify.el | |||
| @@ -88,7 +88,7 @@ strings." | |||
| 88 | (defun erc-notify-install-message-catalogs () | 88 | (defun erc-notify-install-message-catalogs () |
| 89 | (erc-define-catalog | 89 | (erc-define-catalog |
| 90 | 'english | 90 | 'english |
| 91 | '((notify_current . "Notificated people online: %l") | 91 | '((notify_current . "Notified people online: %l") |
| 92 | (notify_list . "Current notify list: %l") | 92 | (notify_list . "Current notify list: %l") |
| 93 | (notify_on . "Detected %n on IRC network %m") | 93 | (notify_on . "Detected %n on IRC network %m") |
| 94 | (notify_off . "%n has left IRC network %m")))) | 94 | (notify_off . "%n has left IRC network %m")))) |
| @@ -250,4 +250,3 @@ with args, toggle notify status of people." | |||
| 250 | ;; indent-tabs-mode: t | 250 | ;; indent-tabs-mode: t |
| 251 | ;; tab-width: 8 | 251 | ;; tab-width: 8 |
| 252 | ;; End: | 252 | ;; End: |
| 253 | |||
diff --git a/lisp/generic-x.el b/lisp/generic-x.el index 2c00229c76e..b0ef0439404 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el | |||
| @@ -1446,7 +1446,7 @@ like an INI file. You can add this hook to `find-file-hook'." | |||
| 1446 | "REGDB_STRING" | 1446 | "REGDB_STRING" |
| 1447 | "REGDB_UNINSTALL_NAME" | 1447 | "REGDB_UNINSTALL_NAME" |
| 1448 | "REMOTE_DRIVE" | 1448 | "REMOTE_DRIVE" |
| 1449 | "REMOVALE_DRIVE" | 1449 | "REMOVEABLE_DRIVE" |
| 1450 | "REPLACE_ITEM" | 1450 | "REPLACE_ITEM" |
| 1451 | "REPLACE" | 1451 | "REPLACE" |
| 1452 | "RESET" | 1452 | "RESET" |
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el index f1a2ed43e26..17af1a38333 100644 --- a/lisp/gnus/gnus-topic.el +++ b/lisp/gnus/gnus-topic.el | |||
| @@ -430,7 +430,7 @@ inheritance." | |||
| 430 | regexp list-topic topic-level) | 430 | regexp list-topic topic-level) |
| 431 | "List all newsgroups with unread articles of level LEVEL or lower. | 431 | "List all newsgroups with unread articles of level LEVEL or lower. |
| 432 | Use the `gnus-group-topics' to sort the groups. | 432 | Use the `gnus-group-topics' to sort the groups. |
| 433 | If PREDICTE is a function, list groups that the function returns non-nil; | 433 | If PREDICATE is a function, list groups that the function returns non-nil; |
| 434 | if it is t, list groups that have no unread articles. | 434 | if it is t, list groups that have no unread articles. |
| 435 | If LOWEST is non-nil, list all newsgroups of level LOWEST or higher." | 435 | If LOWEST is non-nil, list all newsgroups of level LOWEST or higher." |
| 436 | (set-buffer gnus-group-buffer) | 436 | (set-buffer gnus-group-buffer) |
diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 30223e69ae0..f3e7caab174 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el | |||
| @@ -638,7 +638,7 @@ These properties are determined by the Image mode variables | |||
| 638 | `image-transform-resize' and `image-transform-rotation'. The | 638 | `image-transform-resize' and `image-transform-rotation'. The |
| 639 | return value is suitable for appending to an image spec. | 639 | return value is suitable for appending to an image spec. |
| 640 | 640 | ||
| 641 | Recaling and rotation properties only take effect if Emacs is | 641 | Rescaling and rotation properties only take effect if Emacs is |
| 642 | compiled with ImageMagick support." | 642 | compiled with ImageMagick support." |
| 643 | (when (or image-transform-resize | 643 | (when (or image-transform-resize |
| 644 | (not (equal image-transform-rotation 0.0))) | 644 | (not (equal image-transform-rotation 0.0))) |
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index cccf65b8051..efb910a3ef6 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el | |||
| @@ -958,7 +958,7 @@ the current buffer." | |||
| 958 | (insert "\n ---<fallback to the default of the default fontset>---") | 958 | (insert "\n ---<fallback to the default of the default fontset>---") |
| 959 | (put-text-property (line-beginning-position) (point) 'face 'highlight))) | 959 | (put-text-property (line-beginning-position) (point) 'face 'highlight))) |
| 960 | (if (and start1 end2) | 960 | (if (and start1 end2) |
| 961 | ;; Reoder the printed information to match with the font | 961 | ;; Reorder the printed information to match with the font |
| 962 | ;; searching strategy; i.e. FONTSET, the default fontset, | 962 | ;; searching strategy; i.e. FONTSET, the default fontset, |
| 963 | ;; default of FONTSET, default of the default fontset. | 963 | ;; default of FONTSET, default of the default fontset. |
| 964 | (transpose-regions start1 end1 start2 end2)) | 964 | (transpose-regions start1 end1 start2 end2)) |
diff --git a/lisp/language/european.el b/lisp/language/european.el index 6dfc03d0f5f..5bdec6dec7b 100644 --- a/lisp/language/european.el +++ b/lisp/language/european.el | |||
| @@ -146,8 +146,8 @@ These languages are supported with the Latin-3 (ISO-8859-3) character set: | |||
| 146 | (input-method . "latin-4-postfix") | 146 | (input-method . "latin-4-postfix") |
| 147 | (documentation . "\ | 147 | (documentation . "\ |
| 148 | These languages are supported with the Latin-4 (ISO-8859-4) character set: | 148 | These languages are supported with the Latin-4 (ISO-8859-4) character set: |
| 149 | Danish, English, Estonian, Finnish, German, Greenlandic, Lappish, | 149 | Danish, English, Estonian, Finnish, German, Greenlandic, Latvian, |
| 150 | Latvian, Lithuanian, and Norwegian.")) | 150 | Lithuanian, Norwegian, and Sami.")) |
| 151 | '("European")) | 151 | '("European")) |
| 152 | 152 | ||
| 153 | 153 | ||
| @@ -226,7 +226,7 @@ See also the Turkish environment.")) | |||
| 226 | "ISO 2022 based 8-bit encoding for Latin-8 (MIME:ISO-8859-14)." | 226 | "ISO 2022 based 8-bit encoding for Latin-8 (MIME:ISO-8859-14)." |
| 227 | :coding-type 'charset | 227 | :coding-type 'charset |
| 228 | ;; `W' for `Welsh', since `C' for `Celtic' is taken. | 228 | ;; `W' for `Welsh', since `C' for `Celtic' is taken. |
| 229 | :mnemonic ?W | 229 | :mnemonic ?W |
| 230 | :charset-list '(iso-8859-14) | 230 | :charset-list '(iso-8859-14) |
| 231 | :mime-charset 'iso-8859-14) | 231 | :mime-charset 'iso-8859-14) |
| 232 | 232 | ||
| @@ -610,7 +610,7 @@ method and applying Turkish case rules for the characters i, I, $(D)E(B, $(D* | |||
| 610 | (define-coding-system 'mac-roman | 610 | (define-coding-system 'mac-roman |
| 611 | "Mac Roman Encoding (MIME:MACINTOSH)." | 611 | "Mac Roman Encoding (MIME:MACINTOSH)." |
| 612 | :coding-type 'charset | 612 | :coding-type 'charset |
| 613 | :mnemonic ?M | 613 | :mnemonic ?M |
| 614 | :charset-list '(mac-roman) | 614 | :charset-list '(mac-roman) |
| 615 | :mime-charset 'macintosh) | 615 | :mime-charset 'macintosh) |
| 616 | 616 | ||
diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el index b9c250fd700..25a10633a28 100644 --- a/lisp/language/romanian.el +++ b/lisp/language/romanian.el | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | (unibyte-display . iso-8859-2) | 35 | (unibyte-display . iso-8859-2) |
| 36 | (tutorial . "TUTORIAL.ro") | 36 | (tutorial . "TUTORIAL.ro") |
| 37 | (sample-text . "Bunã ziua, bine aþi venit!") | 37 | (sample-text . "Bunã ziua, bine aþi venit!") |
| 38 | (documentation . "Rmoanian environment using Latin-2 encoding. | 38 | (documentation . "Romanian environment using Latin-2 encoding. |
| 39 | An environment for generic Latin-10 encoding is also available.")) | 39 | An environment for generic Latin-10 encoding is also available.")) |
| 40 | '("European")) | 40 | '("European")) |
| 41 | 41 | ||
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 0ce53fcb9a3..8847c16bfb4 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el | |||
| @@ -27789,7 +27789,7 @@ This mode is usually not used directly; instead, other major | |||
| 27789 | modes are derived from it, using `define-derived-mode'. | 27789 | modes are derived from it, using `define-derived-mode'. |
| 27790 | 27790 | ||
| 27791 | In this major mode, the buffer is divided into multiple columns, | 27791 | In this major mode, the buffer is divided into multiple columns, |
| 27792 | which are labelled using the header line. Each non-empty line | 27792 | which are labeled using the header line. Each non-empty line |
| 27793 | belongs to one \"entry\", and the entries can be sorted according | 27793 | belongs to one \"entry\", and the entries can be sorted according |
| 27794 | to their column values. | 27794 | to their column values. |
| 27795 | 27795 | ||
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el index c3a7da41823..12826001d86 100644 --- a/lisp/mail/mail-extr.el +++ b/lisp/mail/mail-extr.el | |||
| @@ -1961,7 +1961,7 @@ place. It affects how `mail-extract-address-components' works." | |||
| 1961 | ("gw" "Guinea-Bissau") | 1961 | ("gw" "Guinea-Bissau") |
| 1962 | ("gy" "Guyana") | 1962 | ("gy" "Guyana") |
| 1963 | ("hk" "Hong Kong") | 1963 | ("hk" "Hong Kong") |
| 1964 | ("hm" "Heard Island and Mcdonald Islands") | 1964 | ("hm" "Heard Island and McDonald Islands") |
| 1965 | ("hn" "Honduras") | 1965 | ("hn" "Honduras") |
| 1966 | ("hr" "Croatia" "Croatia (Hrvatska)") | 1966 | ("hr" "Croatia" "Croatia (Hrvatska)") |
| 1967 | ("ht" "Haiti") | 1967 | ("ht" "Haiti") |
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el index 882a8771e28..eceb7a5fe3a 100644 --- a/lisp/mh-e/mh-comp.el +++ b/lisp/mh-e/mh-comp.el | |||
| @@ -504,7 +504,7 @@ See also `mh-compose-forward-as-mime-flag', | |||
| 504 | folder msg) | 504 | folder msg) |
| 505 | ;; Was inserted before us, move to end of file to preserve order | 505 | ;; Was inserted before us, move to end of file to preserve order |
| 506 | (goto-char (point-max))))))) | 506 | (goto-char (point-max))))))) |
| 507 | ;; Postition just before forwarded message | 507 | ;; Position just before forwarded message. |
| 508 | (if (re-search-forward "^------- Forwarded Message" nil t) | 508 | (if (re-search-forward "^------- Forwarded Message" nil t) |
| 509 | (forward-line -1) | 509 | (forward-line -1) |
| 510 | (goto-char (mh-mail-header-end)) | 510 | (goto-char (mh-mail-header-end)) |
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 458993ca8f1..b614cdb7991 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el | |||
| @@ -2478,7 +2478,7 @@ of citations entirely, choose \"None\"." | |||
| 2478 | "Original-NNTP-" ; mail to news | 2478 | "Original-NNTP-" ; mail to news |
| 2479 | "Original-Path:" ; mail to news | 2479 | "Original-Path:" ; mail to news |
| 2480 | "Original-Received:" ; mail to news | 2480 | "Original-Received:" ; mail to news |
| 2481 | "Original-Recipt:" ; RFC 2298 | 2481 | "Original-Recipient:" ; RFC 2298 |
| 2482 | "Original-To:" ; mail to news | 2482 | "Original-To:" ; mail to news |
| 2483 | "Original-X-" ; mail to news | 2483 | "Original-X-" ; mail to news |
| 2484 | "Origination-Client:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ | 2484 | "Origination-Client:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ |
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 10a1fa5afc5..89948a2c81a 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el | |||
| @@ -389,7 +389,7 @@ Defaults to the value of `browse-url-epiphany-arguments' at the time | |||
| 389 | :type '(repeat (string :tag "Argument")) | 389 | :type '(repeat (string :tag "Argument")) |
| 390 | :group 'browse-url) | 390 | :group 'browse-url) |
| 391 | 391 | ||
| 392 | ;; GNOME means of invoking either Mozilla or Netrape. | 392 | ;; GNOME means of invoking either Mozilla or Netscape. |
| 393 | (defvar browse-url-gnome-moz-program "gnome-moz-remote") | 393 | (defvar browse-url-gnome-moz-program "gnome-moz-remote") |
| 394 | 394 | ||
| 395 | (defcustom browse-url-gnome-moz-arguments '() | 395 | (defcustom browse-url-gnome-moz-arguments '() |
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el index 9fa5eb32d43..88deef46862 100644 --- a/lisp/net/secrets.el +++ b/lisp/net/secrets.el | |||
| @@ -431,7 +431,7 @@ returned, and it will be stored in `secrets-session-path'." | |||
| 431 | (secrets-get-collections))) | 431 | (secrets-get-collections))) |
| 432 | 432 | ||
| 433 | (defun secrets-collection-path (collection) | 433 | (defun secrets-collection-path (collection) |
| 434 | "Return the object path of collection labelled COLLECTION. | 434 | "Return the object path of collection labeled COLLECTION. |
| 435 | If COLLECTION is nil, return the session collection path. | 435 | If COLLECTION is nil, return the session collection path. |
| 436 | If there is no such COLLECTION, return nil." | 436 | If there is no such COLLECTION, return nil." |
| 437 | (or | 437 | (or |
| @@ -454,7 +454,7 @@ If there is no such COLLECTION, return nil." | |||
| 454 | (throw 'collection-found collection-path)))))) | 454 | (throw 'collection-found collection-path)))))) |
| 455 | 455 | ||
| 456 | (defun secrets-create-collection (collection) | 456 | (defun secrets-create-collection (collection) |
| 457 | "Create collection labelled COLLECTION if it doesn't exist. | 457 | "Create collection labeled COLLECTION if it doesn't exist. |
| 458 | Return the D-Bus object path for collection." | 458 | Return the D-Bus object path for collection." |
| 459 | (let ((collection-path (secrets-collection-path collection))) | 459 | (let ((collection-path (secrets-collection-path collection))) |
| 460 | ;; Create the collection. | 460 | ;; Create the collection. |
| @@ -480,7 +480,7 @@ For the time being, only the alias \"default\" is supported." | |||
| 480 | "Label")) | 480 | "Label")) |
| 481 | 481 | ||
| 482 | (defun secrets-set-alias (collection alias) | 482 | (defun secrets-set-alias (collection alias) |
| 483 | "Set ALIAS as alias of collection labelled COLLECTION. | 483 | "Set ALIAS as alias of collection labeled COLLECTION. |
| 484 | For the time being, only the alias \"default\" is supported." | 484 | For the time being, only the alias \"default\" is supported." |
| 485 | (let ((collection-path (secrets-collection-path collection))) | 485 | (let ((collection-path (secrets-collection-path collection))) |
| 486 | (unless (secrets-empty-path collection-path) | 486 | (unless (secrets-empty-path collection-path) |
| @@ -497,7 +497,7 @@ For the time being, only the alias \"default\" is supported." | |||
| 497 | alias :object-path secrets-empty-path)) | 497 | alias :object-path secrets-empty-path)) |
| 498 | 498 | ||
| 499 | (defun secrets-unlock-collection (collection) | 499 | (defun secrets-unlock-collection (collection) |
| 500 | "Unlock collection labelled COLLECTION. | 500 | "Unlock collection labeled COLLECTION. |
| 501 | If successful, return the object path of the collection." | 501 | If successful, return the object path of the collection." |
| 502 | (let ((collection-path (secrets-collection-path collection))) | 502 | (let ((collection-path (secrets-collection-path collection))) |
| 503 | (unless (secrets-empty-path collection-path) | 503 | (unless (secrets-empty-path collection-path) |
| @@ -509,7 +509,7 @@ If successful, return the object path of the collection." | |||
| 509 | collection-path)) | 509 | collection-path)) |
| 510 | 510 | ||
| 511 | (defun secrets-delete-collection (collection) | 511 | (defun secrets-delete-collection (collection) |
| 512 | "Delete collection labelled COLLECTION." | 512 | "Delete collection labeled COLLECTION." |
| 513 | (let ((collection-path (secrets-collection-path collection))) | 513 | (let ((collection-path (secrets-collection-path collection))) |
| 514 | (unless (secrets-empty-path collection-path) | 514 | (unless (secrets-empty-path collection-path) |
| 515 | (secrets-prompt | 515 | (secrets-prompt |
| @@ -636,7 +636,7 @@ The object path of the created item is returned." | |||
| 636 | (car result))))) | 636 | (car result))))) |
| 637 | 637 | ||
| 638 | (defun secrets-item-path (collection item) | 638 | (defun secrets-item-path (collection item) |
| 639 | "Return the object path of item labelled ITEM in COLLECTION. | 639 | "Return the object path of item labeled ITEM in COLLECTION. |
| 640 | If there is no such item, return nil." | 640 | If there is no such item, return nil." |
| 641 | (let ((collection-path (secrets-unlock-collection collection))) | 641 | (let ((collection-path (secrets-unlock-collection collection))) |
| 642 | (catch 'item-found | 642 | (catch 'item-found |
| @@ -645,7 +645,7 @@ If there is no such item, return nil." | |||
| 645 | (throw 'item-found item-path)))))) | 645 | (throw 'item-found item-path)))))) |
| 646 | 646 | ||
| 647 | (defun secrets-get-secret (collection item) | 647 | (defun secrets-get-secret (collection item) |
| 648 | "Return the secret of item labelled ITEM in COLLECTION. | 648 | "Return the secret of item labeled ITEM in COLLECTION. |
| 649 | If there is no such item, return nil." | 649 | If there is no such item, return nil." |
| 650 | (let ((item-path (secrets-item-path collection item))) | 650 | (let ((item-path (secrets-item-path collection item))) |
| 651 | (unless (secrets-empty-path item-path) | 651 | (unless (secrets-empty-path item-path) |
| @@ -656,7 +656,7 @@ If there is no such item, return nil." | |||
| 656 | "GetSecret" :object-path secrets-session-path)))))) | 656 | "GetSecret" :object-path secrets-session-path)))))) |
| 657 | 657 | ||
| 658 | (defun secrets-get-attributes (collection item) | 658 | (defun secrets-get-attributes (collection item) |
| 659 | "Return the lookup attributes of item labelled ITEM in COLLECTION. | 659 | "Return the lookup attributes of item labeled ITEM in COLLECTION. |
| 660 | If there is no such item, or the item has no attributes, return nil." | 660 | If there is no such item, or the item has no attributes, return nil." |
| 661 | (unless (stringp collection) (setq collection "default")) | 661 | (unless (stringp collection) (setq collection "default")) |
| 662 | (let ((item-path (secrets-item-path collection item))) | 662 | (let ((item-path (secrets-item-path collection item))) |
| @@ -669,7 +669,7 @@ If there is no such item, or the item has no attributes, return nil." | |||
| 669 | secrets-interface-item "Attributes"))))) | 669 | secrets-interface-item "Attributes"))))) |
| 670 | 670 | ||
| 671 | (defun secrets-get-attribute (collection item attribute) | 671 | (defun secrets-get-attribute (collection item attribute) |
| 672 | "Return the value of ATTRIBUTE of item labelled ITEM in COLLECTION. | 672 | "Return the value of ATTRIBUTE of item labeled ITEM in COLLECTION. |
| 673 | If there is no such item, or the item doesn't own this attribute, return nil." | 673 | If there is no such item, or the item doesn't own this attribute, return nil." |
| 674 | (cdr (assoc attribute (secrets-get-attributes collection item)))) | 674 | (cdr (assoc attribute (secrets-get-attributes collection item)))) |
| 675 | 675 | ||
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 24361e3667a..c7e78cb282a 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el | |||
| @@ -1327,7 +1327,7 @@ Here is the current list of valid syntactic element symbols: | |||
| 1327 | statement-case-open -- The first line in a case block starting with brace. | 1327 | statement-case-open -- The first line in a case block starting with brace. |
| 1328 | substatement -- The first line after an if/while/for/do/else. | 1328 | substatement -- The first line after an if/while/for/do/else. |
| 1329 | substatement-open -- The brace that opens a substatement block. | 1329 | substatement-open -- The brace that opens a substatement block. |
| 1330 | substatement-label -- Labelled line after an if/while/for/do/else. | 1330 | substatement-label -- Labeled line after an if/while/for/do/else. |
| 1331 | case-label -- A \"case\" or \"default\" label. | 1331 | case-label -- A \"case\" or \"default\" label. |
| 1332 | access-label -- C++ private/protected/public access label. | 1332 | access-label -- C++ private/protected/public access label. |
| 1333 | label -- Any ordinary label. | 1333 | label -- Any ordinary label. |
| @@ -1625,7 +1625,7 @@ names).")) | |||
| 1625 | (defvar c-macro-with-semi-re nil | 1625 | (defvar c-macro-with-semi-re nil |
| 1626 | ;; Regular expression which matches a (#define'd) symbol whose expansion | 1626 | ;; Regular expression which matches a (#define'd) symbol whose expansion |
| 1627 | ;; ends with a semicolon. | 1627 | ;; ends with a semicolon. |
| 1628 | ;; | 1628 | ;; |
| 1629 | ;; This variable should be set by `c-make-macros-with-semi-re' rather than | 1629 | ;; This variable should be set by `c-make-macros-with-semi-re' rather than |
| 1630 | ;; directly. | 1630 | ;; directly. |
| 1631 | ) | 1631 | ) |
| @@ -1651,7 +1651,7 @@ names).")) | |||
| 1651 | (t (error "c-make-macro-with-semi-re: invalid \ | 1651 | (t (error "c-make-macro-with-semi-re: invalid \ |
| 1652 | c-macro-names-with-semicolon: %s" | 1652 | c-macro-names-with-semicolon: %s" |
| 1653 | c-macro-names-with-semicolon)))))) | 1653 | c-macro-names-with-semicolon)))))) |
| 1654 | 1654 | ||
| 1655 | (defvar c-macro-names-with-semicolon | 1655 | (defvar c-macro-names-with-semicolon |
| 1656 | '("Q_OBJECT" "Q_PROPERTY" "Q_DECLARE" "Q_ENUMS") | 1656 | '("Q_OBJECT" "Q_PROPERTY" "Q_DECLARE" "Q_ENUMS") |
| 1657 | "List of #defined symbols whose expansion ends with a semicolon. | 1657 | "List of #defined symbols whose expansion ends with a semicolon. |
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index c027b2b7454..597d84619ab 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el | |||
| @@ -5037,7 +5037,7 @@ killed after process termination." | |||
| 5037 | (when gen-func | 5037 | (when gen-func |
| 5038 | (setq error-msg "EMPTY RULES" | 5038 | (setq error-msg "EMPTY RULES" |
| 5039 | tree (ebnf-eliminate-empty-rules tree)) | 5039 | tree (ebnf-eliminate-empty-rules tree)) |
| 5040 | (setq error-msg "OPTMIZE" | 5040 | (setq error-msg "OPTIMIZE" |
| 5041 | tree (ebnf-optimize tree)) | 5041 | tree (ebnf-optimize tree)) |
| 5042 | (setq error-msg "DIMENSIONS" | 5042 | (setq error-msg "DIMENSIONS" |
| 5043 | tree (ebnf-dimensions tree)) | 5043 | tree (ebnf-dimensions tree)) |
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index fd3d42685f0..cb0b02ff350 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el | |||
| @@ -1462,7 +1462,7 @@ Return point or nil." | |||
| 1462 | 1462 | ||
| 1463 | (defun fortran-beginning-do () | 1463 | (defun fortran-beginning-do () |
| 1464 | "Search backwards for first unmatched DO [WHILE]. | 1464 | "Search backwards for first unmatched DO [WHILE]. |
| 1465 | Return point or nil. Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)." | 1465 | Return point or nil. Ignores labeled DO loops (ie DO 10 ... 10 CONTINUE)." |
| 1466 | (let ((case-fold-search t) | 1466 | (let ((case-fold-search t) |
| 1467 | (dostart-re "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+[^0-9]")) | 1467 | (dostart-re "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+[^0-9]")) |
| 1468 | (if (save-excursion | 1468 | (if (save-excursion |
| @@ -1482,7 +1482,7 @@ Return point or nil. Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)." | |||
| 1482 | (skip-chars-forward " \t0-9") | 1482 | (skip-chars-forward " \t0-9") |
| 1483 | (cond ((looking-at dostart-re) | 1483 | (cond ((looking-at dostart-re) |
| 1484 | (setq count (1- count))) | 1484 | (setq count (1- count))) |
| 1485 | ;; Note labelled loop ends not considered. | 1485 | ;; Note labeled loop ends not considered. |
| 1486 | ((looking-at "end[ \t]*do\\b") | 1486 | ((looking-at "end[ \t]*do\\b") |
| 1487 | (setq count (1+ count))))) | 1487 | (setq count (1+ count))))) |
| 1488 | (and (zerop count) | 1488 | (and (zerop count) |
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 2f06afaa5ef..a8ff759717e 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el | |||
| @@ -3117,7 +3117,7 @@ STRING are replaced by `-' and substrings are converted to lower case." | |||
| 3117 | 3117 | ||
| 3118 | 3118 | ||
| 3119 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 3119 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 3120 | ;;; Menues | 3120 | ;;; Menus |
| 3121 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 3121 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 3122 | 3122 | ||
| 3123 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 3123 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 3e707ff3832..31609232884 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el | |||
| @@ -2100,7 +2100,7 @@ cell of the form ( 'DIRLIST . 'FILELIST )." | |||
| 2100 | (if (= index 0) | 2100 | (if (= index 0) |
| 2101 | ;; If the shown files variable has extra directories, then | 2101 | ;; If the shown files variable has extra directories, then |
| 2102 | ;; it is our responsibility to redraw them all | 2102 | ;; it is our responsibility to redraw them all |
| 2103 | ;; Luckilly, the nature of inserting items into this list means | 2103 | ;; Luckily, the nature of inserting items into this list means |
| 2104 | ;; that by reversing it, we can easilly go in the right order | 2104 | ;; that by reversing it, we can easilly go in the right order |
| 2105 | (let ((sf (cdr (reverse speedbar-shown-directories)))) | 2105 | (let ((sf (cdr (reverse speedbar-shown-directories)))) |
| 2106 | (setq speedbar-shown-directories | 2106 | (setq speedbar-shown-directories |
diff --git a/lisp/startup.el b/lisp/startup.el index 842548577c5..877ba1987f6 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -1132,7 +1132,7 @@ the `--debug-init' option to view a complete error backtrace." | |||
| 1132 | (eq orig-enable-multibyte (default-value | 1132 | (eq orig-enable-multibyte (default-value |
| 1133 | 'enable-multibyte-characters))) | 1133 | 'enable-multibyte-characters))) |
| 1134 | ;; Init file changed to unibyte. Reset existing multibyte | 1134 | ;; Init file changed to unibyte. Reset existing multibyte |
| 1135 | ;; buffers (probably *scratch*, *Messages*, *Minibuff-0*). | 1135 | ;; buffers (probably *scratch*, *Messages*, *Minibuf-0*). |
| 1136 | ;; Arguably this should only be done if they're free of | 1136 | ;; Arguably this should only be done if they're free of |
| 1137 | ;; multibyte characters. | 1137 | ;; multibyte characters. |
| 1138 | (mapc (lambda (buffer) | 1138 | (mapc (lambda (buffer) |
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 2325d7b26ff..be14e90e000 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el | |||
| @@ -2437,7 +2437,7 @@ in the coord." | |||
| 2437 | point-list)) | 2437 | point-list)) |
| 2438 | 2438 | ||
| 2439 | ;; artist-save-chars-under-point-list | 2439 | ;; artist-save-chars-under-point-list |
| 2440 | ;; Remebers the chars that were there before we did draw the line. | 2440 | ;; Remembers the chars that were there before we did draw the line. |
| 2441 | ;; Returns point-list. | 2441 | ;; Returns point-list. |
| 2442 | ;; | 2442 | ;; |
| 2443 | (defun artist-save-chars-under-point-list (point-list) | 2443 | (defun artist-save-chars-under-point-list (point-list) |
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 741b6cd904c..4459ac10098 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el | |||
| @@ -3941,7 +3941,7 @@ If `bibtex-files' is non-nil, search all these files. | |||
| 3941 | Otherwise the search is limited to the current buffer. | 3941 | Otherwise the search is limited to the current buffer. |
| 3942 | Return position of entry if CROSSREF-KEY is found or nil otherwise. | 3942 | Return position of entry if CROSSREF-KEY is found or nil otherwise. |
| 3943 | If CROSSREF-KEY is in the same buffer like current entry but before it | 3943 | If CROSSREF-KEY is in the same buffer like current entry but before it |
| 3944 | an error is signaled. If NOERRER is non-nil this error is suppressed. | 3944 | an error is signaled. If NOERROR is non-nil this error is suppressed. |
| 3945 | Optional arg PNT is the position of the referencing entry. It defaults | 3945 | Optional arg PNT is the position of the referencing entry. It defaults |
| 3946 | to position of point. If optional arg SPLIT is non-nil, split window | 3946 | to position of point. If optional arg SPLIT is non-nil, split window |
| 3947 | so that both the referencing and the crossrefed entry are displayed. | 3947 | so that both the referencing and the crossrefed entry are displayed. |
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index ccdab49750b..6a3a7bef244 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el | |||
| @@ -139,7 +139,7 @@ No active TAGS table is required." | |||
| 139 | (set (make-local-variable 'TeX-master) master) | 139 | (set (make-local-variable 'TeX-master) master) |
| 140 | (erase-buffer) | 140 | (erase-buffer) |
| 141 | (insert " MULTIPLE LABELS IN CURRENT DOCUMENT:\n") | 141 | (insert " MULTIPLE LABELS IN CURRENT DOCUMENT:\n") |
| 142 | (insert | 142 | (insert |
| 143 | " Move point to label and type `r' to run a query-replace on the label\n" | 143 | " Move point to label and type `r' to run a query-replace on the label\n" |
| 144 | " and its references. Type `q' to exit this buffer.\n\n") | 144 | " and its references. Type `q' to exit this buffer.\n\n") |
| 145 | (insert " LABEL FILE\n") | 145 | (insert " LABEL FILE\n") |
| @@ -190,15 +190,15 @@ This command should be used with care, in particular in multifile | |||
| 190 | documents. You should not use it if another document refers to this | 190 | documents. You should not use it if another document refers to this |
| 191 | one with the `xr' package." | 191 | one with the `xr' package." |
| 192 | (interactive) | 192 | (interactive) |
| 193 | ;; Resan the entire document | 193 | ;; Rescan the entire document |
| 194 | (reftex-access-scan-info 1) | 194 | (reftex-access-scan-info 1) |
| 195 | ;; Get some insurance | 195 | ;; Get some insurance |
| 196 | (if (and (reftex-is-multi) | 196 | (if (and (reftex-is-multi) |
| 197 | (not (yes-or-no-p "Replacing all simple labels in multiple files is risky. Continue? "))) | 197 | (not (yes-or-no-p "Replacing all simple labels in multiple files is risky. Continue? "))) |
| 198 | (error "Abort")) | 198 | (error "Abort")) |
| 199 | ;; Make the translation list | 199 | ;; Make the translation list |
| 200 | (let* ((re-core (concat "\\(" | 200 | (let* ((re-core (concat "\\(" |
| 201 | (mapconcat 'cdr reftex-typekey-to-prefix-alist "\\|") | 201 | (mapconcat 'cdr reftex-typekey-to-prefix-alist "\\|") |
| 202 | "\\)")) | 202 | "\\)")) |
| 203 | (label-re (concat "\\`" re-core "\\([0-9]+\\)\\'")) | 203 | (label-re (concat "\\`" re-core "\\([0-9]+\\)\\'")) |
| 204 | (search-re (concat "[{,]\\(" re-core "\\([0-9]+\\)\\)[,}]")) | 204 | (search-re (concat "[{,]\\(" re-core "\\([0-9]+\\)\\)[,}]")) |
| @@ -231,11 +231,11 @@ one with the `xr' package." | |||
| 231 | (reftex-save-all-document-buffers) | 231 | (reftex-save-all-document-buffers) |
| 232 | 232 | ||
| 233 | ;; First test to check for erros | 233 | ;; First test to check for erros |
| 234 | (setq n (reftex-translate | 234 | (setq n (reftex-translate |
| 235 | files search-re translate-alist error-fmt 'test)) | 235 | files search-re translate-alist error-fmt 'test)) |
| 236 | 236 | ||
| 237 | ;; Now the real thing. | 237 | ;; Now the real thing. |
| 238 | (if (yes-or-no-p | 238 | (if (yes-or-no-p |
| 239 | (format "Replace %d items at %d places in %d files? " | 239 | (format "Replace %d items at %d places in %d files? " |
| 240 | (length translate-alist) n (length files))) | 240 | (length translate-alist) n (length files))) |
| 241 | (progn | 241 | (progn |
| @@ -253,9 +253,9 @@ one with the `xr' package." | |||
| 253 | 253 | ||
| 254 | (defun reftex-translate (files search-re translate-alist error-fmt test) | 254 | (defun reftex-translate (files search-re translate-alist error-fmt test) |
| 255 | ;; In FILES, look for SEARCH-RE and replace match 1 of it with | 255 | ;; In FILES, look for SEARCH-RE and replace match 1 of it with |
| 256 | ;; its association in TRANSLATE-ALSIT. | 256 | ;; its association in TRANSLATE-ALSIT. |
| 257 | ;; If we do not find an association and TEST is non-nil, query | 257 | ;; If we do not find an association and TEST is non-nil, query |
| 258 | ;; to ignore the problematic string. | 258 | ;; to ignore the problematic string. |
| 259 | ;; If TEST is nil, it is ignored without query. | 259 | ;; If TEST is nil, it is ignored without query. |
| 260 | ;; Return the number of replacements. | 260 | ;; Return the number of replacements. |
| 261 | (let ((n 0) file label match-data buf macro pos cell) | 261 | (let ((n 0) file label match-data buf macro pos cell) |
| @@ -281,7 +281,7 @@ one with the `xr' package." | |||
| 281 | (or (looking-at "\\\\ref") | 281 | (or (looking-at "\\\\ref") |
| 282 | (looking-at "\\\\[a-zA-Z]*ref\\(range\\)?[^a-zA-Z]") | 282 | (looking-at "\\\\[a-zA-Z]*ref\\(range\\)?[^a-zA-Z]") |
| 283 | (looking-at "\\\\ref[a-zA-Z]*[^a-zA-Z]") | 283 | (looking-at "\\\\ref[a-zA-Z]*[^a-zA-Z]") |
| 284 | (looking-at (format | 284 | (looking-at (format |
| 285 | reftex-find-label-regexp-format | 285 | reftex-find-label-regexp-format |
| 286 | (regexp-quote label))))) | 286 | (regexp-quote label))))) |
| 287 | ;; OK, we should replace it. | 287 | ;; OK, we should replace it. |
| @@ -351,7 +351,7 @@ Also checks if buffers visiting the files are in read-only mode." | |||
| 351 | 351 | ||
| 352 | (defun reftex-isearch-wrap-function () | 352 | (defun reftex-isearch-wrap-function () |
| 353 | (if (not isearch-word) | 353 | (if (not isearch-word) |
| 354 | (switch-to-buffer | 354 | (switch-to-buffer |
| 355 | (funcall isearch-next-buffer-function (current-buffer) t))) | 355 | (funcall isearch-next-buffer-function (current-buffer) t))) |
| 356 | (goto-char (if isearch-forward (point-min) (point-max)))) | 356 | (goto-char (if isearch-forward (point-min) (point-max)))) |
| 357 | 357 | ||
| @@ -435,7 +435,7 @@ With no argument, this command toggles | |||
| 435 | `reftex-isearch-minor-mode' on if ARG is positive, otherwise turn it off." | 435 | `reftex-isearch-minor-mode' on if ARG is positive, otherwise turn it off." |
| 436 | (interactive "P") | 436 | (interactive "P") |
| 437 | (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode)) | 437 | (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode)) |
| 438 | (setq reftex-isearch-minor-mode | 438 | (setq reftex-isearch-minor-mode |
| 439 | (not (or (and (null arg) reftex-isearch-minor-mode) | 439 | (not (or (and (null arg) reftex-isearch-minor-mode) |
| 440 | (<= (prefix-numeric-value arg) 0)))) | 440 | (<= (prefix-numeric-value arg) 0)))) |
| 441 | (unless (eq reftex-isearch-minor-mode old-reftex-isearch-minor-mode) | 441 | (unless (eq reftex-isearch-minor-mode old-reftex-isearch-minor-mode) |
| @@ -471,7 +471,7 @@ With no argument, this command toggles | |||
| 471 | ;; Force modeline redisplay. | 471 | ;; Force modeline redisplay. |
| 472 | (set-buffer-modified-p (buffer-modified-p)))) | 472 | (set-buffer-modified-p (buffer-modified-p)))) |
| 473 | 473 | ||
| 474 | (add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil | 474 | (add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil |
| 475 | 'reftex-isearch-minor-mode) | 475 | 'reftex-isearch-minor-mode) |
| 476 | 476 | ||
| 477 | ;;; reftex-global.el ends here | 477 | ;;; reftex-global.el ends here |
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index eeaa2cfa927..787a8b7c0f1 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el | |||
| @@ -81,7 +81,7 @@ that Ediff doesn't know about.") | |||
| 81 | ;; so that `kill-all-local-variables' (called by major-mode setting | 81 | ;; so that `kill-all-local-variables' (called by major-mode setting |
| 82 | ;; commands) won't destroy Ediff control variables. | 82 | ;; commands) won't destroy Ediff control variables. |
| 83 | ;; | 83 | ;; |
| 84 | ;; Plagiarised from `emerge-defvar-local' for XEmacs. | 84 | ;; Plagiarized from `emerge-defvar-local' for XEmacs. |
| 85 | (defmacro ediff-defvar-local (var value doc) | 85 | (defmacro ediff-defvar-local (var value doc) |
| 86 | "Defines VAR as a local variable." | 86 | "Defines VAR as a local variable." |
| 87 | (declare (indent defun)) | 87 | (declare (indent defun)) |
diff --git a/msdos/README b/msdos/README index 9f75d9c12bf..532d18726c6 100644 --- a/msdos/README +++ b/msdos/README | |||
| @@ -60,7 +60,7 @@ This document is Copyright (C) DJ Delorie and may be distributed | |||
| 60 | verbatim, but changing it is not allowed. | 60 | verbatim, but changing it is not allowed. |
| 61 | 61 | ||
| 62 | Source code copyright DJ Delorie is distributed under the terms of the | 62 | Source code copyright DJ Delorie is distributed under the terms of the |
| 63 | GNU General Public Licence, with the following exceptions: | 63 | GNU General Public License, with the following exceptions: |
| 64 | 64 | ||
| 65 | * Sources used to build crt0.o, gcrt0.o, libc.a, libdbg.a, and | 65 | * Sources used to build crt0.o, gcrt0.o, libc.a, libdbg.a, and |
| 66 | libemu.a are distributed under the terms of the GNU Library General | 66 | libemu.a are distributed under the terms of the GNU Library General |
| @@ -68,7 +68,7 @@ GNU General Public Licence, with the following exceptions: | |||
| 68 | 68 | ||
| 69 | * Any existing copyright or authorship information in any given source | 69 | * Any existing copyright or authorship information in any given source |
| 70 | file must remain intact. If you modify a source file, a notice to that | 70 | file must remain intact. If you modify a source file, a notice to that |
| 71 | effect must be added to the authorship information in the source file. | 71 | effect must be added to the authorship information in the source file. |
| 72 | 72 | ||
| 73 | * Runtime binaries, as provided by DJ in DJGPP, may be distributed | 73 | * Runtime binaries, as provided by DJ in DJGPP, may be distributed |
| 74 | without sources ONLY if the recipient is given sufficient information | 74 | without sources ONLY if the recipient is given sufficient information |
diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h index bf1e77b5ff7..aa27211c05c 100644 --- a/oldXMenu/XMenu.h +++ b/oldXMenu/XMenu.h | |||
| @@ -185,7 +185,7 @@ typedef struct _xmenu { | |||
| 185 | Window parent; /* Menu's parent window. */ | 185 | Window parent; /* Menu's parent window. */ |
| 186 | int width; /* Overall menu width. */ | 186 | int width; /* Overall menu width. */ |
| 187 | int height; /* Overall menu height. */ | 187 | int height; /* Overall menu height. */ |
| 188 | int x_pos; /* Oveall menu origin. */ | 188 | int x_pos; /* Overall menu origin. */ |
| 189 | int y_pos; /* Overall menu origin. */ | 189 | int y_pos; /* Overall menu origin. */ |
| 190 | Cursor mouse_cursor; /* Mouse cursor raster. */ | 190 | Cursor mouse_cursor; /* Mouse cursor raster. */ |
| 191 | XAssocTable *assoc_tab; /* XMWindow association table. */ | 191 | XAssocTable *assoc_tab; /* XMWindow association table. */ |
| @@ -1762,7 +1762,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size | |||
| 1762 | 1762 | ||
| 1763 | case CCL_STAT_QUIT: | 1763 | case CCL_STAT_QUIT: |
| 1764 | if (! ccl->quit_silently) | 1764 | if (! ccl->quit_silently) |
| 1765 | sprintf (msg, "\nCCL: Quited."); | 1765 | sprintf (msg, "\nCCL: Quitted."); |
| 1766 | break; | 1766 | break; |
| 1767 | 1767 | ||
| 1768 | default: | 1768 | default: |
diff --git a/src/font.c b/src/font.c index f6723157de1..ead8225471e 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -802,7 +802,7 @@ font_expand_wildcards (Lisp_Object *field, int n) | |||
| 802 | struct { | 802 | struct { |
| 803 | /* Minimum possible field. */ | 803 | /* Minimum possible field. */ |
| 804 | int from; | 804 | int from; |
| 805 | /* Maxinum possible field. */ | 805 | /* Maximum possible field. */ |
| 806 | int to; | 806 | int to; |
| 807 | /* Bit mask of possible field. Nth bit corresponds to Nth field. */ | 807 | /* Bit mask of possible field. Nth bit corresponds to Nth field. */ |
| 808 | int mask; | 808 | int mask; |
diff --git a/src/fontset.c b/src/fontset.c index 74a25a1ca04..5c9ebf8440a 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -1788,7 +1788,7 @@ update_auto_fontset_alist (Lisp_Object font_object, Lisp_Object fontset) | |||
| 1788 | /* Return a cons (FONT-OBJECT . GLYPH-CODE). | 1788 | /* Return a cons (FONT-OBJECT . GLYPH-CODE). |
| 1789 | FONT-OBJECT is the font for the character at POSITION in the current | 1789 | FONT-OBJECT is the font for the character at POSITION in the current |
| 1790 | buffer. This is computed from all the text properties and overlays | 1790 | buffer. This is computed from all the text properties and overlays |
| 1791 | that apply to POSITION. POSTION may be nil, in which case, | 1791 | that apply to POSITION. POSITION may be nil, in which case, |
| 1792 | FONT-SPEC is the font for displaying the character CH with the | 1792 | FONT-SPEC is the font for displaying the character CH with the |
| 1793 | default face. | 1793 | default face. |
| 1794 | 1794 | ||
diff --git a/src/keyboard.c b/src/keyboard.c index f8c31af3fbe..fb989d3ea95 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -8782,7 +8782,7 @@ typedef struct keyremap | |||
| 8782 | /* Positions [START, END) in the key sequence buffer | 8782 | /* Positions [START, END) in the key sequence buffer |
| 8783 | are the key that we have scanned so far. | 8783 | are the key that we have scanned so far. |
| 8784 | Those events are the ones that we will replace | 8784 | Those events are the ones that we will replace |
| 8785 | if PAREHT maps them into a key sequence. */ | 8785 | if PARENT maps them into a key sequence. */ |
| 8786 | int start, end; | 8786 | int start, end; |
| 8787 | } keyremap; | 8787 | } keyremap; |
| 8788 | 8788 | ||
diff --git a/src/nsfns.m b/src/nsfns.m index 20b021c6f5d..bcf14fe6105 100644 --- a/src/nsfns.m +++ b/src/nsfns.m | |||
| @@ -1267,7 +1267,7 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 1267 | #endif | 1267 | #endif |
| 1268 | 1268 | ||
| 1269 | init_frame_faces (f); | 1269 | init_frame_faces (f); |
| 1270 | 1270 | ||
| 1271 | /* The resources controlling the menu-bar and tool-bar are | 1271 | /* The resources controlling the menu-bar and tool-bar are |
| 1272 | processed specially at startup, and reflected in the mode | 1272 | processed specially at startup, and reflected in the mode |
| 1273 | variables; ignore them here. */ | 1273 | variables; ignore them here. */ |
| @@ -1656,7 +1656,7 @@ If omitted or nil, the selected frame's display is used. */) | |||
| 1656 | 1656 | ||
| 1657 | DEFUN ("x-display-backing-store", Fx_display_backing_store, | 1657 | DEFUN ("x-display-backing-store", Fx_display_backing_store, |
| 1658 | Sx_display_backing_store, 0, 1, 0, | 1658 | Sx_display_backing_store, 0, 1, 0, |
| 1659 | doc: /* Return whether the Nexstep display DISPLAY supports backing store. | 1659 | doc: /* Return whether the Nextstep display DISPLAY supports backing store. |
| 1660 | The value may be `buffered', `retained', or `non-retained'. | 1660 | The value may be `buffered', `retained', or `non-retained'. |
| 1661 | DISPLAY should be a frame, the display name as a string, or a terminal ID. | 1661 | DISPLAY should be a frame, the display name as a string, or a terminal ID. |
| 1662 | If omitted or nil, the selected frame's display is used. */) | 1662 | If omitted or nil, the selected frame's display is used. */) |
diff --git a/src/w32term.c b/src/w32term.c index f876cff0363..e2a06446976 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -3287,7 +3287,7 @@ w32_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window, | |||
| 3287 | 3287 | ||
| 3288 | /* Handle mouse button event on the tool-bar of frame F, at | 3288 | /* Handle mouse button event on the tool-bar of frame F, at |
| 3289 | frame-relative coordinates X/Y. EVENT_TYPE is either ButtionPress | 3289 | frame-relative coordinates X/Y. EVENT_TYPE is either ButtionPress |
| 3290 | or ButtonRelase. */ | 3290 | or ButtonRelease. */ |
| 3291 | 3291 | ||
| 3292 | static void | 3292 | static void |
| 3293 | w32_handle_tool_bar_click (struct frame *f, struct input_event *button_event) | 3293 | w32_handle_tool_bar_click (struct frame *f, struct input_event *button_event) |
diff --git a/src/xdisp.c b/src/xdisp.c index dfb794f38d3..efe7a6c9d00 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -22049,7 +22049,7 @@ get_glyph_face_and_encoding (struct frame *f, struct glyph *glyph, | |||
| 22049 | 22049 | ||
| 22050 | 22050 | ||
| 22051 | /* Get glyph code of character C in FONT in the two-byte form CHAR2B. | 22051 | /* Get glyph code of character C in FONT in the two-byte form CHAR2B. |
| 22052 | Retunr 1 if FONT has a glyph for C, otherwise return 0. */ | 22052 | Return 1 if FONT has a glyph for C, otherwise return 0. */ |
| 22053 | 22053 | ||
| 22054 | static inline int | 22054 | static inline int |
| 22055 | get_char_glyph_code (int c, struct font *font, XChar2b *char2b) | 22055 | get_char_glyph_code (int c, struct font *font, XChar2b *char2b) |
diff --git a/src/xfns.c b/src/xfns.c index 2359a1a82c2..6de412c4e68 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -3691,7 +3691,7 @@ If omitted or nil, that stands for the selected frame's display. */) | |||
| 3691 | 3691 | ||
| 3692 | DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, | 3692 | DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, |
| 3693 | doc: /* Return the "vendor ID" string of the X server of display TERMINAL. | 3693 | doc: /* Return the "vendor ID" string of the X server of display TERMINAL. |
| 3694 | \(Labelling every distributor as a "vendor" embodies the false assumption | 3694 | \(Labeling every distributor as a "vendor" embodies the false assumption |
| 3695 | that operating systems cannot be developed and distributed noncommercially.) | 3695 | that operating systems cannot be developed and distributed noncommercially.) |
| 3696 | The optional argument TERMINAL specifies which display to ask about. | 3696 | The optional argument TERMINAL specifies which display to ask about. |
| 3697 | TERMINAL should be a terminal object, a frame or a display name (a string). | 3697 | TERMINAL should be a terminal object, a frame or a display name (a string). |