diff options
| author | Paul Eggert | 2011-11-17 09:40:48 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-17 09:40:48 -0800 |
| commit | c5e87d104b7342f35459c7513d6b4cefea1e968e (patch) | |
| tree | b1e452497894607b5199474897953bf739552904 | |
| parent | df85d31593aab41321a8bac130e1f9c5b678e9d7 (diff) | |
| download | emacs-c5e87d104b7342f35459c7513d6b4cefea1e968e.tar.gz emacs-c5e87d104b7342f35459c7513d6b4cefea1e968e.zip | |
Spelling fixes.
66 files changed, 86 insertions, 90 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 9d78b7f948a..b796acd8b39 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1239,7 +1239,8 @@ | |||
| 1239 | 1239 | ||
| 1240 | 2010-03-27 Nick Roberts <nickrob@snap.net.nz> | 1240 | 2010-03-27 Nick Roberts <nickrob@snap.net.nz> |
| 1241 | 1241 | ||
| 1242 | doc/emacs/building.texi: Describe restored GDB/MI fuctionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz. | 1242 | doc/emacs/building.texi: Describe restored GDB/MI functionality |
| 1243 | removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz. | ||
| 1243 | doc/emacs/emacs.texi: Update node names for building.texi. | 1244 | doc/emacs/emacs.texi: Update node names for building.texi. |
| 1244 | 1245 | ||
| 1245 | 2010-03-24 Glenn Morris <rgm@gnu.org> | 1246 | 2010-03-24 Glenn Morris <rgm@gnu.org> |
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 0e72c4737bd..bbaf31ade85 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi | |||
| @@ -322,7 +322,7 @@ default value is @code{(links uid gid)} i.e.@: all the 3 optional | |||
| 322 | attributes are displayed. | 322 | attributes are displayed. |
| 323 | 323 | ||
| 324 | @vindex ls-lisp-emulation | 324 | @vindex ls-lisp-emulation |
| 325 | The variable @code{ls-lisp-emulation} controls the flavour of the | 325 | The variable @code{ls-lisp-emulation} controls the flavor of the |
| 326 | @code{ls} emulation by setting the defaults for the 3 options | 326 | @code{ls} emulation by setting the defaults for the 3 options |
| 327 | described above: @code{ls-lisp-ignore-case}, | 327 | described above: @code{ls-lisp-ignore-case}, |
| 328 | @code{ls-lisp-dirs-first}, and @code{ls-lisp-verbosity}. The value of | 328 | @code{ls-lisp-dirs-first}, and @code{ls-lisp-verbosity}. The value of |
diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile index f8e136f6bd9..e66dcc88f71 100644 --- a/doc/lispref/spellfile +++ b/doc/lispref/spellfile | |||
| @@ -331,7 +331,6 @@ for' | |||
| 331 | formfeed | 331 | formfeed |
| 332 | forms' | 332 | forms' |
| 333 | forw | 333 | forw |
| 334 | forwa | ||
| 335 | found' | 334 | found' |
| 336 | frob | 335 | frob |
| 337 | from' | 336 | from' |
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi index 49f455b4e41..374158c2c78 100644 --- a/doc/misc/ada-mode.texi +++ b/doc/misc/ada-mode.texi | |||
| @@ -1357,7 +1357,7 @@ specifies the casing of one word or word fragment. Comments may be | |||
| 1357 | included, separated from the word by a space. | 1357 | included, separated from the word by a space. |
| 1358 | 1358 | ||
| 1359 | If the word starts with an asterisk (@key{*}), it defines the casing | 1359 | If the word starts with an asterisk (@key{*}), it defines the casing |
| 1360 | af a word fragemnt (or ``substring''); part of a word between two | 1360 | af a word fragment (or ``substring''); part of a word between two |
| 1361 | underscores or word boundary. | 1361 | underscores or word boundary. |
| 1362 | 1362 | ||
| 1363 | For example: | 1363 | For example: |
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index a4d377ebdce..55c2c4c0ae8 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi | |||
| @@ -1173,7 +1173,7 @@ Full details on how these minor modes work are at @ref{Electric Keys}, | |||
| 1173 | and @ref{Indentation Engine Basics}. | 1173 | and @ref{Indentation Engine Basics}. |
| 1174 | 1174 | ||
| 1175 | You can toggle each of these minor modes on and off, and you can | 1175 | You can toggle each of these minor modes on and off, and you can |
| 1176 | configure @ccmode{} so that it starts up with your favourite | 1176 | configure @ccmode{} so that it starts up with your favorite |
| 1177 | combination of them (@pxref{Sample .emacs File}). By default, when | 1177 | combination of them (@pxref{Sample .emacs File}). By default, when |
| 1178 | you initialize a buffer, electric mode and syntactic-indentation mode | 1178 | you initialize a buffer, electric mode and syntactic-indentation mode |
| 1179 | are enabled but the other two modes are disabled. | 1179 | are enabled but the other two modes are disabled. |
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index 7528abca58d..262c3d734fe 100644 --- a/doc/misc/faq.texi +++ b/doc/misc/faq.texi | |||
| @@ -80,7 +80,7 @@ Emacs, the Emacs manual is often the best starting point. | |||
| 80 | 80 | ||
| 81 | @ifnottex | 81 | @ifnottex |
| 82 | @insertcopying | 82 | @insertcopying |
| 83 | @end ifnottex | 83 | @end ifnottex |
| 84 | 84 | ||
| 85 | @menu | 85 | @menu |
| 86 | * FAQ notation:: | 86 | * FAQ notation:: |
| @@ -368,7 +368,7 @@ only be known if and when a judge rules on its validity and scope. | |||
| 368 | There has never been a copyright infringement case involving the GPL to | 368 | There has never been a copyright infringement case involving the GPL to |
| 369 | set any precedents. Although legal actions have been brought against | 369 | set any precedents. Although legal actions have been brought against |
| 370 | companies for violating the terms of the GPL, so far all have been | 370 | companies for violating the terms of the GPL, so far all have been |
| 371 | settled out of court (in favour of the plaintiffs). Please take any | 371 | settled out of court (in favor of the plaintiffs). Please take any |
| 372 | discussion regarding this issue to the newsgroup | 372 | discussion regarding this issue to the newsgroup |
| 373 | @uref{news:gnu.misc.discuss}, which was created to hold the extensive | 373 | @uref{news:gnu.misc.discuss}, which was created to hold the extensive |
| 374 | flame wars on the subject. | 374 | flame wars on the subject. |
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi index c7d82245973..18e11aeeeb3 100644 --- a/doc/misc/newsticker.texi +++ b/doc/misc/newsticker.texi | |||
| @@ -52,7 +52,7 @@ developing GNU and promoting software freedom.'' | |||
| 52 | @node Top | 52 | @node Top |
| 53 | @top Newsticker | 53 | @top Newsticker |
| 54 | 54 | ||
| 55 | @insertcopying | 55 | @insertcopying |
| 56 | 56 | ||
| 57 | @end ifnottex | 57 | @end ifnottex |
| 58 | 58 | ||
| @@ -112,9 +112,9 @@ enclosed files (as delivered by podcasts, e.g.). | |||
| 112 | Here are screen shots of the @uref{newsticker-1.7.png, version 1.7 | 112 | Here are screen shots of the @uref{newsticker-1.7.png, version 1.7 |
| 113 | (current version)} and some older screen shots: | 113 | (current version)} and some older screen shots: |
| 114 | @uref{newsticker-1.6.png, version 1.6}, | 114 | @uref{newsticker-1.6.png, version 1.6}, |
| 115 | @uref{newsticker-1.5.png, version 1.5}, | 115 | @uref{newsticker-1.5.png, version 1.5}, |
| 116 | @uref{newsticker-1.4.png, version 1.4} | 116 | @uref{newsticker-1.4.png, version 1.4} |
| 117 | @uref{newsticker-1.3.png, version 1.3}, | 117 | @uref{newsticker-1.3.png, version 1.3}, |
| 118 | @uref{newsticker-1.0.png, version 1.0}. | 118 | @uref{newsticker-1.0.png, version 1.0}. |
| 119 | @end ifhtml | 119 | @end ifhtml |
| 120 | 120 | ||
| @@ -163,7 +163,7 @@ You can choose between two different frontends for reading headlines: | |||
| 163 | @item Newsticker's @emph{treeview} uses separate windows for the | 163 | @item Newsticker's @emph{treeview} uses separate windows for the |
| 164 | feeds (in tree form), a list of headlines for the current feed, and | 164 | feeds (in tree form), a list of headlines for the current feed, and |
| 165 | the content of the current headline. Feeds can be placed into groups | 165 | the content of the current headline. Feeds can be placed into groups |
| 166 | which itself can be placed in groups and so on. | 166 | which itself can be placed in groups and so on. |
| 167 | @item Newsticker's @emph{plainview} displays all headlines in a | 167 | @item Newsticker's @emph{plainview} displays all headlines in a |
| 168 | single buffer, called @samp{*newsticker*}. The modeline in the | 168 | single buffer, called @samp{*newsticker*}. The modeline in the |
| 169 | @samp{*newsticker*} buffer informs whenever new headlines have | 169 | @samp{*newsticker*} buffer informs whenever new headlines have |
| @@ -171,7 +171,7 @@ arrived. | |||
| 171 | @end itemize | 171 | @end itemize |
| 172 | In both views clicking mouse-button 2 or pressing RET on a headline | 172 | In both views clicking mouse-button 2 or pressing RET on a headline |
| 173 | will call @code{browse-url} to load the corresponding news story in | 173 | will call @code{browse-url} to load the corresponding news story in |
| 174 | your favourite web browser. | 174 | your favorite web browser. |
| 175 | 175 | ||
| 176 | @findex newsticker-start-ticker | 176 | @findex newsticker-start-ticker |
| 177 | @findex newsticker-stop-ticker | 177 | @findex newsticker-stop-ticker |
| @@ -205,7 +205,7 @@ and some of the most important options. | |||
| 205 | 205 | ||
| 206 | @item | 206 | @item |
| 207 | @code{newsticker-retrieval} contains options that define which news | 207 | @code{newsticker-retrieval} contains options that define which news |
| 208 | feeds are retrieved and how this is done. | 208 | feeds are retrieved and how this is done. |
| 209 | 209 | ||
| 210 | @itemize | 210 | @itemize |
| 211 | @item | 211 | @item |
| @@ -241,7 +241,7 @@ automatically mark headlines as immortal or old. | |||
| 241 | 241 | ||
| 242 | @item | 242 | @item |
| 243 | @code{newsticker-hooks} contains options for hooking other Emacs | 243 | @code{newsticker-hooks} contains options for hooking other Emacs |
| 244 | commands to newsticker functions. | 244 | commands to newsticker functions. |
| 245 | @itemize | 245 | @itemize |
| 246 | @item | 246 | @item |
| 247 | @vindex newsticker-new-item-functions | 247 | @vindex newsticker-new-item-functions |
| @@ -313,5 +313,3 @@ Byte-compiling newsticker.el is recommended. | |||
| 313 | @printindex cp | 313 | @printindex cp |
| 314 | 314 | ||
| 315 | @bye | 315 | @bye |
| 316 | |||
| 317 | |||
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 5fbc872d3e9..b1da9122934 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 | |||
| @@ -996,7 +996,7 @@ with no confirmation. | |||
| 996 | view-buffer selects the named buffer, view-file finds the named file; the | 996 | view-buffer selects the named buffer, view-file finds the named file; the |
| 997 | resulting buffer is placed into view-mode (a recursive edit). The normal | 997 | resulting buffer is placed into view-mode (a recursive edit). The normal |
| 998 | emacs commands are not available. Instead a set of special commands is | 998 | emacs commands are not available. Instead a set of special commands is |
| 999 | provided which faclitate moving around in the buffer, searching and | 999 | provided which facilitate moving around in the buffer, searching and |
| 1000 | scrolling by screenfuls. Exiting view-mode returns to the buffer in which | 1000 | scrolling by screenfuls. Exiting view-mode returns to the buffer in which |
| 1001 | the view-file or view-buffer command was given. | 1001 | the view-file or view-buffer command was given. |
| 1002 | Type ? or h when viewing for a complete list of view commands. | 1002 | Type ? or h when viewing for a complete list of view commands. |
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c763d7dce39..d043f41962e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -3642,7 +3642,7 @@ | |||
| 3642 | (lang_names): Add a NULL member for every entry, added an entry | 3642 | (lang_names): Add a NULL member for every entry, added an entry |
| 3643 | for makefiles. | 3643 | for makefiles. |
| 3644 | (Makefile_targets): New function. | 3644 | (Makefile_targets): New function. |
| 3645 | (Texinfo_nodes): Rename from Texinfo_fuctions and made | 3645 | (Texinfo_nodes): Rename from Texinfo_functions and made |
| 3646 | it conformant to the style of the rest of the code. | 3646 | it conformant to the style of the rest of the code. |
| 3647 | 3647 | ||
| 3648 | 2001-01-13 Gerd Moellmann <gerd@gnu.org> | 3648 | 2001-01-13 Gerd Moellmann <gerd@gnu.org> |
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 4baec98725c..e916db64f05 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 | |||
| @@ -9419,7 +9419,7 @@ | |||
| 9419 | (org-insert-labeled-timestamps-at-point): New option. | 9419 | (org-insert-labeled-timestamps-at-point): New option. |
| 9420 | (org-cycle, org-occur, org-scan-tags): Use `org-overview' instead | 9420 | (org-cycle, org-occur, org-scan-tags): Use `org-overview' instead |
| 9421 | of `hide-sublevels 1', in case the first headline is not level 1. | 9421 | of `hide-sublevels 1', in case the first headline is not level 1. |
| 9422 | (org-overview, org-content): New fuction. | 9422 | (org-overview, org-content): New function. |
| 9423 | (org-cycle-global-status, org-cycle-subtree-status): Make these | 9423 | (org-cycle-global-status, org-cycle-subtree-status): Make these |
| 9424 | variables buffer-local. | 9424 | variables buffer-local. |
| 9425 | (org-global-cycle): New command. | 9425 | (org-global-cycle): New command. |
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 14f07e7e00b..319cdb14b9b 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 | |||
| @@ -10127,7 +10127,7 @@ | |||
| 10127 | 2007-10-08 Richard Stallman <rms@gnu.org> | 10127 | 2007-10-08 Richard Stallman <rms@gnu.org> |
| 10128 | 10128 | ||
| 10129 | * wid-edit.el (widget-specify-button): Don't merge mouse-face with | 10129 | * wid-edit.el (widget-specify-button): Don't merge mouse-face with |
| 10130 | neighbouring buttons. | 10130 | neighboring buttons. |
| 10131 | 10131 | ||
| 10132 | 2007-10-08 Andreas Schwab <schwab@suse.de> | 10132 | 2007-10-08 Andreas Schwab <schwab@suse.de> |
| 10133 | 10133 | ||
| @@ -10151,7 +10151,7 @@ | |||
| 10151 | 2007-10-08 Stefan Monnier <monnier@iro.umontreal.ca> | 10151 | 2007-10-08 Stefan Monnier <monnier@iro.umontreal.ca> |
| 10152 | 10152 | ||
| 10153 | * wid-edit.el (widget-image-insert): Don't merge mouse-face with | 10153 | * wid-edit.el (widget-image-insert): Don't merge mouse-face with |
| 10154 | neighbouring buttons. | 10154 | neighboring buttons. |
| 10155 | 10155 | ||
| 10156 | * progmodes/compile.el (compilation-error-regexp-alist-alist): | 10156 | * progmodes/compile.el (compilation-error-regexp-alist-alist): |
| 10157 | Recognize gcc's use of "note" for informational messages. | 10157 | Recognize gcc's use of "note" for informational messages. |
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index cfaa1763224..cd91dfad28c 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 | |||
| @@ -17799,7 +17799,7 @@ | |||
| 17799 | (org-local-logging): New function. | 17799 | (org-local-logging): New function. |
| 17800 | (org-columns-open-link): Fix bug with opening link in column view. | 17800 | (org-columns-open-link): Fix bug with opening link in column view. |
| 17801 | (org-local-logging): New function. | 17801 | (org-local-logging): New function. |
| 17802 | (org-todo): Make sure that LOGGING properties are honoured. | 17802 | (org-todo): Make sure that LOGGING properties are honored. |
| 17803 | (org-todo-keywords): Improve docstring. | 17803 | (org-todo-keywords): Improve docstring. |
| 17804 | (org-startup-options): Cleanup startup options. | 17804 | (org-startup-options): Cleanup startup options. |
| 17805 | (org-set-regexps-and-options): Process the "!" markers. | 17805 | (org-set-regexps-and-options): Process the "!" markers. |
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index 9b4dddc076d..ddd8ad7e7ff 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 | |||
| @@ -12221,7 +12221,7 @@ | |||
| 12221 | 12221 | ||
| 12222 | 2010-03-27 Nick Roberts <nickrob@snap.net.nz> | 12222 | 2010-03-27 Nick Roberts <nickrob@snap.net.nz> |
| 12223 | 12223 | ||
| 12224 | Restore GDB/MI fuctionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz. | 12224 | Restore GDB/MI functionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz. |
| 12225 | * progmodes/gdb-mi.el: Restore. | 12225 | * progmodes/gdb-mi.el: Restore. |
| 12226 | * progmodes/gdb-ui.el: Remove. | 12226 | * progmodes/gdb-ui.el: Remove. |
| 12227 | * progmodes/gud.el: Re-accommodate for gdb-mi.el. | 12227 | * progmodes/gud.el: Re-accommodate for gdb-mi.el. |
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 777252ff25c..cb606cd0847 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 | |||
| @@ -6526,7 +6526,7 @@ | |||
| 6526 | 6526 | ||
| 6527 | * bibtex.el (bibtex-autokey-get-titles): Non capitalized title words | 6527 | * bibtex.el (bibtex-autokey-get-titles): Non capitalized title words |
| 6528 | are used for key generation as well. | 6528 | are used for key generation as well. |
| 6529 | (bibtex-member-of-regexp): Case is honoured for matches now. | 6529 | (bibtex-member-of-regexp): Case is honored for matches now. |
| 6530 | (bibtex-autokey-titleword-ignore): Added entries provide compatibility | 6530 | (bibtex-autokey-titleword-ignore): Added entries provide compatibility |
| 6531 | to former behavior. | 6531 | to former behavior. |
| 6532 | 6532 | ||
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index b15ee6078b0..4f867c24561 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 | |||
| @@ -10569,7 +10569,7 @@ | |||
| 10569 | 2000-10-10 Dave Love <fx@gnu.org> | 10569 | 2000-10-10 Dave Love <fx@gnu.org> |
| 10570 | 10570 | ||
| 10571 | * toolbar/tool-bar.el (tool-bar-add-item) | 10571 | * toolbar/tool-bar.el (tool-bar-add-item) |
| 10572 | (tool-bar-add-item-from-menu): Don't favour XPM icons on mono display. | 10572 | (tool-bar-add-item-from-menu): Don't favor XPM icons on mono display. |
| 10573 | 10573 | ||
| 10574 | * toolbar/attach.pbm, toolbar/cancel.pbm, toolbar/close.pbm: | 10574 | * toolbar/attach.pbm, toolbar/cancel.pbm, toolbar/close.pbm: |
| 10575 | * toolbar/copy.pbm, toolbar/cut.pbm, toolbar/exit.pbm: | 10575 | * toolbar/copy.pbm, toolbar/cut.pbm, toolbar/exit.pbm: |
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index b2121de260d..3c2871594fc 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el | |||
| @@ -810,7 +810,7 @@ Optional RECURSING is for internal use, to limit recursion." | |||
| 810 | (forward-char -1))))))) | 810 | (forward-char -1))))))) |
| 811 | 811 | ||
| 812 | (error | 812 | (error |
| 813 | ;; zero work list so we don't get stuck futily retrying. | 813 | ;; zero work list so we don't get stuck futilely retrying. |
| 814 | ;; error recording done by allout-widgets-hook-error-handler. | 814 | ;; error recording done by allout-widgets-hook-error-handler. |
| 815 | (setq allout-widgets-changes-record nil)))) | 815 | (setq allout-widgets-changes-record nil)))) |
| 816 | ;;;_ , major change handlers: | 816 | ;;;_ , major change handlers: |
diff --git a/lisp/allout.el b/lisp/allout.el index d3d4cf835ad..8cbdbee7303 100644 --- a/lisp/allout.el +++ b/lisp/allout.el | |||
| @@ -3557,7 +3557,7 @@ number is used as the index for the numbered prefix (allowing, eg, | |||
| 3557 | sequential renumbering to not require this function counting back the | 3557 | sequential renumbering to not require this function counting back the |
| 3558 | index for each successive sibling)." | 3558 | index for each successive sibling)." |
| 3559 | ;;;_ . Code: | 3559 | ;;;_ . Code: |
| 3560 | ;; The options are ordered in likely frequence of use, most common | 3560 | ;; The options are ordered in likely frequency of use, most common |
| 3561 | ;; highest, least lowest. Ie, more likely to be doing prefix | 3561 | ;; highest, least lowest. Ie, more likely to be doing prefix |
| 3562 | ;; adjustments than soliciting, and yet more than numbering. | 3562 | ;; adjustments than soliciting, and yet more than numbering. |
| 3563 | ;; Current prefix is least dominant, but most likely to be commonly | 3563 | ;; Current prefix is least dominant, but most likely to be commonly |
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 4e45383eaec..48b4c5be164 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Morten Welinder <terra@gnu.org> | 5 | ;; Author: Morten Welinder <terra@gnu.org> |
| 6 | ;; Keywords: files archives msdog editing major-mode | 6 | ;; Keywords: files archives msdog editing major-mode |
| 7 | ;; Favourite-brand-of-beer: None, I hate beer. | 7 | ;; Favorite-brand-of-beer: None, I hate beer. |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 10 | 10 | ||
| @@ -75,7 +75,7 @@ | |||
| 75 | ;; | 75 | ;; |
| 76 | ;; LZH A series of (header,file). Headers are checksummed. No | 76 | ;; LZH A series of (header,file). Headers are checksummed. No |
| 77 | ;; interaction among members. | 77 | ;; interaction among members. |
| 78 | ;; Headers come in three flavours called level 0, 1 and 2 headers. | 78 | ;; Headers come in three flavors called level 0, 1 and 2 headers. |
| 79 | ;; Level 2 header is free of DOS specific restrictions and most | 79 | ;; Level 2 header is free of DOS specific restrictions and most |
| 80 | ;; prevalently used. Also level 1 and 2 headers consist of base | 80 | ;; prevalently used. Also level 1 and 2 headers consist of base |
| 81 | ;; and extension headers. For more details see | 81 | ;; and extension headers. For more details see |
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 1ec474e828e..c9b8fdac613 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el | |||
| @@ -407,7 +407,7 @@ discover the reason." | |||
| 407 | (if arg | 407 | (if arg |
| 408 | (run-hooks 'timeclock-done-hook)))) | 408 | (run-hooks 'timeclock-done-hook)))) |
| 409 | 409 | ||
| 410 | ;; Should today-only be removed in favour of timeclock-relative? - gm | 410 | ;; Should today-only be removed in favor of timeclock-relative? - gm |
| 411 | (defsubst timeclock-workday-remaining (&optional today-only) | 411 | (defsubst timeclock-workday-remaining (&optional today-only) |
| 412 | "Return the number of seconds until the workday is complete. | 412 | "Return the number of seconds until the workday is complete. |
| 413 | The amount returned is relative to the value of `timeclock-workday'. | 413 | The amount returned is relative to the value of `timeclock-workday'. |
| @@ -547,7 +547,7 @@ non-nil, the amount returned will be relative to past time worked." | |||
| 547 | 547 | ||
| 548 | (defalias 'timeclock-seconds-to-time 'seconds-to-time) | 548 | (defalias 'timeclock-seconds-to-time 'seconds-to-time) |
| 549 | 549 | ||
| 550 | ;; Should today-only be removed in favour of timeclock-relative? - gm | 550 | ;; Should today-only be removed in favor of timeclock-relative? - gm |
| 551 | (defsubst timeclock-when-to-leave (&optional today-only) | 551 | (defsubst timeclock-when-to-leave (&optional today-only) |
| 552 | "Return a time value representing the end of today's workday. | 552 | "Return a time value representing the end of today's workday. |
| 553 | If TODAY-ONLY is non-nil, the value returned will be relative only to | 553 | If TODAY-ONLY is non-nil, the value returned will be relative only to |
| @@ -569,7 +569,7 @@ This string is relative to the value of `timeclock-workday'. If | |||
| 569 | SHOW-SECONDS is non-nil, the value printed/returned will include | 569 | SHOW-SECONDS is non-nil, the value printed/returned will include |
| 570 | seconds. If TODAY-ONLY is non-nil, the value returned will be | 570 | seconds. If TODAY-ONLY is non-nil, the value returned will be |
| 571 | relative only to the time worked today, and not to past time." | 571 | relative only to the time worked today, and not to past time." |
| 572 | ;; Should today-only be removed in favour of timeclock-relative? - gm | 572 | ;; Should today-only be removed in favor of timeclock-relative? - gm |
| 573 | (interactive) | 573 | (interactive) |
| 574 | (let* ((then (timeclock-when-to-leave today-only)) | 574 | (let* ((then (timeclock-when-to-leave today-only)) |
| 575 | (string | 575 | (string |
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index 6709236c541..41a569564d0 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | ;; | 54 | ;; |
| 55 | ;; Here, we will treat each section separately (excluding D) | 55 | ;; Here, we will treat each section separately (excluding D) |
| 56 | ;; They can then be strung together in user-visible commands to | 56 | ;; They can then be strung together in user-visible commands to |
| 57 | ;; fulfil specific needs. | 57 | ;; fulfill specific needs. |
| 58 | ;; | 58 | ;; |
| 59 | ;; COLLECTORS: | 59 | ;; COLLECTORS: |
| 60 | ;; | 60 | ;; |
diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el index 57067936a90..95a68673b8c 100644 --- a/lisp/cedet/semantic/ia-sb.el +++ b/lisp/cedet/semantic/ia-sb.el | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | nil | 36 | nil |
| 37 | (setq semantic-ia-sb-key-map (speedbar-make-specialized-keymap)) | 37 | (setq semantic-ia-sb-key-map (speedbar-make-specialized-keymap)) |
| 38 | 38 | ||
| 39 | ;; Basic featuers. | 39 | ;; Basic features. |
| 40 | (define-key semantic-ia-sb-key-map "\C-m" 'speedbar-edit-line) | 40 | (define-key semantic-ia-sb-key-map "\C-m" 'speedbar-edit-line) |
| 41 | (define-key semantic-ia-sb-key-map "I" 'semantic-ia-sb-show-tag-info) | 41 | (define-key semantic-ia-sb-key-map "I" 'semantic-ia-sb-show-tag-info) |
| 42 | ) | 42 | ) |
diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el index 50de8e4f57f..2aae39d4b21 100644 --- a/lisp/cedet/semantic/ia.el +++ b/lisp/cedet/semantic/ia.el | |||
| @@ -119,7 +119,7 @@ Completion options are calculated with `semantic-analyze-possible-completions'." | |||
| 119 | ;; completions. | 119 | ;; completions. |
| 120 | ;; | 120 | ;; |
| 121 | ;; This is a way of making this fcn more useful since | 121 | ;; This is a way of making this fcn more useful since |
| 122 | ;; the smart completion engine sometimes failes. | 122 | ;; the smart completion engine sometimes fails. |
| 123 | (semantic-complete-symbol)) | 123 | (semantic-complete-symbol)) |
| 124 | ;; Use try completion to seek a common substring. | 124 | ;; Use try completion to seek a common substring. |
| 125 | (let ((tc (try-completion (or pre "") syms))) | 125 | (let ((tc (try-completion (or pre "") syms))) |
diff --git a/lisp/desktop.el b/lisp/desktop.el index f4991c5bcc6..8a61bec0eea 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Morten Welinder <terra@diku.dk> | 5 | ;; Author: Morten Welinder <terra@diku.dk> |
| 6 | ;; Keywords: convenience | 6 | ;; Keywords: convenience |
| 7 | ;; Favourite-brand-of-beer: None, I hate beer. | 7 | ;; Favorite-brand-of-beer: None, I hate beer. |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 10 | 10 | ||
diff --git a/lisp/follow.el b/lisp/follow.el index aa40c27a7a9..92efc8d8cfa 100644 --- a/lisp/follow.el +++ b/lisp/follow.el | |||
| @@ -652,7 +652,7 @@ the rightmost is selected. If ARG is nil, the leftmost window is | |||
| 652 | selected if the original window is the first one in the frame. | 652 | selected if the original window is the first one in the frame. |
| 653 | 653 | ||
| 654 | To bind this command to a hotkey, place the following line | 654 | To bind this command to a hotkey, place the following line |
| 655 | in your `~/.emacs' file, replacing [f7] by your favourite key: | 655 | in your `~/.emacs' file, replacing [f7] by your favorite key: |
| 656 | (global-set-key [f7] 'follow-delete-other-windows-and-split)" | 656 | (global-set-key [f7] 'follow-delete-other-windows-and-split)" |
| 657 | (interactive "P") | 657 | (interactive "P") |
| 658 | (let ((other (or (and (null arg) | 658 | (let ((other (or (and (null arg) |
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 779c84296f4..e52f898b184 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 | |||
| @@ -5562,7 +5562,7 @@ | |||
| 5562 | 5562 | ||
| 5563 | 2003-01-14 Kevin Greiner <kgreiner@xpediantsolutions.com> | 5563 | 2003-01-14 Kevin Greiner <kgreiner@xpediantsolutions.com> |
| 5564 | * gnus-agent.el (gnus-agent-get-undownloaded-list): Include the | 5564 | * gnus-agent.el (gnus-agent-get-undownloaded-list): Include the |
| 5565 | fictious headers generated by nnagent (ie. Undownloaded Article | 5565 | fictitious headers generated by nnagent (ie. Undownloaded Article |
| 5566 | ####) in the list of articles that have not been downloaded. | 5566 | ####) in the list of articles that have not been downloaded. |
| 5567 | 5567 | ||
| 5568 | * gnus-int.el (): Added require declarations to resolve | 5568 | * gnus-int.el (): Added require declarations to resolve |
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index 32e40f68fc2..71f8cf82d39 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el | |||
| @@ -1130,7 +1130,7 @@ article's mark is toggled." | |||
| 1130 | (setq alist (cdr alist))) | 1130 | (setq alist (cdr alist))) |
| 1131 | ((> a h) | 1131 | ((> a h) |
| 1132 | ;; Headers that are not in the alist should be | 1132 | ;; Headers that are not in the alist should be |
| 1133 | ;; fictious (see nnagent-retrieve-headers); they | 1133 | ;; fictitious (see nnagent-retrieve-headers); they |
| 1134 | ;; imply that this article isn't in the agent. | 1134 | ;; imply that this article isn't in the agent. |
| 1135 | (gnus-agent-append-to-list tail-undownloaded h) | 1135 | (gnus-agent-append-to-list tail-undownloaded h) |
| 1136 | (gnus-agent-append-to-list tail-unfetched h) | 1136 | (gnus-agent-append-to-list tail-unfetched h) |
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 4c0f6069373..dd41947a2af 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el | |||
| @@ -535,7 +535,7 @@ that the symbol of the saver function, which is specified by | |||
| 535 | 535 | ||
| 536 | ;; Note that "Rmail format" is mbox since Emacs 23, but Babyl before. | 536 | ;; Note that "Rmail format" is mbox since Emacs 23, but Babyl before. |
| 537 | (defcustom gnus-default-article-saver 'gnus-summary-save-in-rmail | 537 | (defcustom gnus-default-article-saver 'gnus-summary-save-in-rmail |
| 538 | "A function to save articles in your favourite format. | 538 | "A function to save articles in your favorite format. |
| 539 | The function will be called by way of the `gnus-summary-save-article' | 539 | The function will be called by way of the `gnus-summary-save-article' |
| 540 | command, and friends such as `gnus-summary-save-article-rmail'. | 540 | command, and friends such as `gnus-summary-save-article-rmail'. |
| 541 | 541 | ||
diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el index 2111d34eac5..a44a03b6913 100644 --- a/lisp/gnus/sieve.el +++ b/lisp/gnus/sieve.el | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | ;;; Commentary: | 22 | ;;; Commentary: |
| 23 | 23 | ||
| 24 | ;; This file contain utilities to facilate upload, download and | 24 | ;; This file contain utilities to facilitate upload, download and |
| 25 | ;; general management of sieve scripts. Currently only the | 25 | ;; general management of sieve scripts. Currently only the |
| 26 | ;; Managesieve protocol is supported (using sieve-manage.el), but when | 26 | ;; Managesieve protocol is supported (using sieve-manage.el), but when |
| 27 | ;; (useful) alternatives become available, they might be supported as | 27 | ;; (useful) alternatives become available, they might be supported as |
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 56859269e02..cd9f1fa6b43 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el | |||
| @@ -360,7 +360,7 @@ commands in `hfy-etags-cmd-alist'." | |||
| 360 | :type '(repeat symbol)) | 360 | :type '(repeat symbol)) |
| 361 | 361 | ||
| 362 | (defun hfy-which-etags () | 362 | (defun hfy-which-etags () |
| 363 | "Return a string indicating which flavour of etags we are using." | 363 | "Return a string indicating which flavor of etags we are using." |
| 364 | (let ((v (shell-command-to-string (concat hfy-etags-bin " --version")))) | 364 | (let ((v (shell-command-to-string (concat hfy-etags-bin " --version")))) |
| 365 | (cond ((string-match "exube" v) "exuberant ctags") | 365 | (cond ((string-match "exube" v) "exuberant ctags") |
| 366 | ((string-match "GNU E" v) "emacs etags" )) )) | 366 | ((string-match "GNU E" v) "emacs etags" )) )) |
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index 83386f2e852..008eb92dbbc 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el | |||
| @@ -371,7 +371,7 @@ consonant. It is a list vowel characters or 0. The element 0 | |||
| 371 | indicate the place to embed a consonant. | 371 | indicate the place to embed a consonant. |
| 372 | 372 | ||
| 373 | Optional WITH-MAA-SAKOD-RULE is a rule to re-order and modify VOWEL | 373 | Optional WITH-MAA-SAKOD-RULE is a rule to re-order and modify VOWEL |
| 374 | follwoing a consonant and preceding a maa-sakod character. If it is | 374 | following a consonant and preceding a maa-sakod character. If it is |
| 375 | nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is always | 375 | nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is always |
| 376 | appended at the tail. | 376 | appended at the tail. |
| 377 | 377 | ||
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el index e723e154dc1..4034566afca 100644 --- a/lisp/language/vietnamese.el +++ b/lisp/language/vietnamese.el | |||
| @@ -84,7 +84,7 @@ | |||
| 84 | (documentation . "\ | 84 | (documentation . "\ |
| 85 | For Vietnamese, Emacs uses special charsets internally. | 85 | For Vietnamese, Emacs uses special charsets internally. |
| 86 | They can be decoded from and encoded to VISCII, VSCII, TCVN-5712, VIQR | 86 | They can be decoded from and encoded to VISCII, VSCII, TCVN-5712, VIQR |
| 87 | and windows-1258. VSCII is deprecated in favour of TCVN-5712. The | 87 | and windows-1258. VSCII is deprecated in favor of TCVN-5712. The |
| 88 | Current setting gives higher priority to the coding system VISCII than | 88 | Current setting gives higher priority to the coding system VISCII than |
| 89 | TCVN-5712. If you prefer TCVN-5712, please do: (prefer-coding-system | 89 | TCVN-5712. If you prefer TCVN-5712, please do: (prefer-coding-system |
| 90 | 'vietnamese-tcvn). There are two Vietnamese input methods: VIQR and | 90 | 'vietnamese-tcvn). There are two Vietnamese input methods: VIQR and |
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 744560a8223..7f595db4814 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el | |||
| @@ -11099,7 +11099,7 @@ the rightmost is selected. If ARG is nil, the leftmost window is | |||
| 11099 | selected if the original window is the first one in the frame. | 11099 | selected if the original window is the first one in the frame. |
| 11100 | 11100 | ||
| 11101 | To bind this command to a hotkey, place the following line | 11101 | To bind this command to a hotkey, place the following line |
| 11102 | in your `~/.emacs' file, replacing [f7] by your favourite key: | 11102 | in your `~/.emacs' file, replacing [f7] by your favorite key: |
| 11103 | (global-set-key [f7] 'follow-delete-other-windows-and-split) | 11103 | (global-set-key [f7] 'follow-delete-other-windows-and-split) |
| 11104 | 11104 | ||
| 11105 | \(fn &optional ARG)" t nil) | 11105 | \(fn &optional ARG)" t nil) |
| @@ -26109,7 +26109,7 @@ That's all. Here's the board after two moves: | |||
| 26109 | 26109 | ||
| 26110 | o o o | 26110 | o o o |
| 26111 | 26111 | ||
| 26112 | Pick your favourite shortcuts: | 26112 | Pick your favorite shortcuts: |
| 26113 | 26113 | ||
| 26114 | \\{solitaire-mode-map} | 26114 | \\{solitaire-mode-map} |
| 26115 | 26115 | ||
diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el index 2bc0248506a..14a76746797 100644 --- a/lisp/mail/rmail-spam-filter.el +++ b/lisp/mail/rmail-spam-filter.el | |||
| @@ -554,4 +554,4 @@ checks to see if the old format is used, and updates it if necessary." | |||
| 554 | 554 | ||
| 555 | (provide 'rmail-spam-filter) | 555 | (provide 'rmail-spam-filter) |
| 556 | 556 | ||
| 557 | ;;; rmail-spam-fitler ends here | 557 | ;;; rmail-spam-filter ends here |
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 5a3f57720f4..b12c47e7f1f 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 | |||
| @@ -691,7 +691,7 @@ | |||
| 691 | variable `mh-scan-date-regexp'. | 691 | variable `mh-scan-date-regexp'. |
| 692 | 692 | ||
| 693 | * mh-customize.el (mh-auto-fields-prompt-flag): Made reference to | 693 | * mh-customize.el (mh-auto-fields-prompt-flag): Made reference to |
| 694 | `mh-auto-fileds-lists'. | 694 | `mh-auto-fields-lists'. |
| 695 | (mh-forward-hook): Fixed docstring typo. | 695 | (mh-forward-hook): Fixed docstring typo. |
| 696 | 696 | ||
| 697 | 2004-08-07 Bill Wohler <wohler@newt.com> | 697 | 2004-08-07 Bill Wohler <wohler@newt.com> |
| @@ -832,7 +832,7 @@ | |||
| 832 | and byte-compiles all the source files with a single instance of | 832 | and byte-compiles all the source files with a single instance of |
| 833 | XEmacs. | 833 | XEmacs. |
| 834 | (dist): Added $(MH-E-XEMACS-SRC) to tarball. | 834 | (dist): Added $(MH-E-XEMACS-SRC) to tarball. |
| 835 | (AUTO_PRELOADS): Removed, in favour of 'AUTOLOAD_PACKAGE_NAME' and | 835 | (AUTO_PRELOADS): Removed, in favor of 'AUTOLOAD_PACKAGE_NAME' and |
| 836 | 'AUTOLOAD_FILE'. | 836 | 'AUTOLOAD_FILE'. |
| 837 | (AUTOLOAD_PACKAGE_NAME): New. | 837 | (AUTOLOAD_PACKAGE_NAME): New. |
| 838 | (AUTOLOAD_FILE): New. | 838 | (AUTOLOAD_FILE): New. |
| @@ -1257,7 +1257,7 @@ | |||
| 1257 | 1257 | ||
| 1258 | * Makefile (XEMACS_OPTIONS): Add '-no-autoloads' to give a cleaner | 1258 | * Makefile (XEMACS_OPTIONS): Add '-no-autoloads' to give a cleaner |
| 1259 | build environment. | 1259 | build environment. |
| 1260 | (AUTO_PRELOADS): Removed, in favour of 'AUTOLOAD_PACKAGE_NAME' and | 1260 | (AUTO_PRELOADS): Removed, in favor of 'AUTOLOAD_PACKAGE_NAME' and |
| 1261 | 'AUTOLOAD_FILE'. | 1261 | 'AUTOLOAD_FILE'. |
| 1262 | (AUTOLOAD_PACKAGE_NAME): New. | 1262 | (AUTOLOAD_PACKAGE_NAME): New. |
| 1263 | (AUTOLOAD_FILE): New. | 1263 | (AUTOLOAD_FILE): New. |
| @@ -1469,7 +1469,7 @@ | |||
| 1469 | 1469 | ||
| 1470 | * mh-mime.el (mh-mml-secure-message-sign-pgpmime): Add an optional | 1470 | * mh-mime.el (mh-mml-secure-message-sign-pgpmime): Add an optional |
| 1471 | dontsign argument to remove an existing secure message directive. | 1471 | dontsign argument to remove an existing secure message directive. |
| 1472 | Update the docstring -- this fuction does not allow for | 1472 | Update the docstring -- this function does not allow for |
| 1473 | encrypt/sign, just sign directives. | 1473 | encrypt/sign, just sign directives. |
| 1474 | 1474 | ||
| 1475 | * mh-mime.el (mh-mml-secure-message-sign-pgpmime): Use | 1475 | * mh-mime.el (mh-mml-secure-message-sign-pgpmime): Use |
| @@ -5130,7 +5130,7 @@ | |||
| 5130 | 5130 | ||
| 5131 | * mh-utils.el (mh-face-display-function): Fix bug that was | 5131 | * mh-utils.el (mh-face-display-function): Fix bug that was |
| 5132 | corrupting xface images when displayed with XEmacs' internal | 5132 | corrupting xface images when displayed with XEmacs' internal |
| 5133 | xface image support. Also make XEmacs honour 'mh-show-xface-face' | 5133 | xface image support. Also make XEmacs honor 'mh-show-xface-face' |
| 5134 | when using internal xface image support. | 5134 | when using internal xface image support. |
| 5135 | 5135 | ||
| 5136 | 2003-02-12 Peter S Galbraith <psg@debian.org> | 5136 | 2003-02-12 Peter S Galbraith <psg@debian.org> |
| @@ -8048,7 +8048,7 @@ | |||
| 8048 | 2002-10-26 Peter S Galbraith <psg@debia.org> | 8048 | 2002-10-26 Peter S Galbraith <psg@debia.org> |
| 8049 | 8049 | ||
| 8050 | * mh-comp.el (mh-search-addr-regexp, mh-re-search-to-cc): Remove | 8050 | * mh-comp.el (mh-search-addr-regexp, mh-re-search-to-cc): Remove |
| 8051 | `mh-re-search-to-cc' in favour of more generalized new function | 8051 | `mh-re-search-to-cc' in favor of more generalized new function |
| 8052 | `mh-search-addr-regexp'. | 8052 | `mh-search-addr-regexp'. |
| 8053 | (mh-insert-mail-followup-to): Use it. | 8053 | (mh-insert-mail-followup-to): Use it. |
| 8054 | 8054 | ||
diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el index 8c4bbb4a785..68a0a6a85d4 100644 --- a/lisp/net/mairix.el +++ b/lisp/net/mairix.el | |||
| @@ -51,7 +51,7 @@ | |||
| 51 | ;; Currently, RMail, Gnus (with mbox files), and VM are supported as | 51 | ;; Currently, RMail, Gnus (with mbox files), and VM are supported as |
| 52 | ;; mail programs, but it is pretty easy to interface it with other | 52 | ;; mail programs, but it is pretty easy to interface it with other |
| 53 | ;; ones as well. Please see the docs and the source for details. | 53 | ;; ones as well. Please see the docs and the source for details. |
| 54 | ;; In a nutshell: include your favourite mail program in | 54 | ;; In a nutshell: include your favorite mail program in |
| 55 | ;; `mairix-mail-program' and write functions for | 55 | ;; `mairix-mail-program' and write functions for |
| 56 | ;; `mairix-display-functions' and `mairix-get-mail-header-functions'. | 56 | ;; `mairix-display-functions' and `mairix-get-mail-header-functions'. |
| 57 | ;; If you have written such functions for your Emacs mail program of | 57 | ;; If you have written such functions for your Emacs mail program of |
| @@ -945,4 +945,3 @@ Use cursor keys or C-n,C-p to select next/previous search.\n\n") | |||
| 945 | (provide 'mairix) | 945 | (provide 'mairix) |
| 946 | 946 | ||
| 947 | ;;; mairix.el ends here | 947 | ;;; mairix.el ends here |
| 948 | |||
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el index 906044079cd..16b36df07f8 100644 --- a/lisp/net/newst-plainview.el +++ b/lisp/net/newst-plainview.el | |||
| @@ -783,11 +783,11 @@ Return new buffer position." | |||
| 783 | (newsticker--buffer-set-uptodate nil) | 783 | (newsticker--buffer-set-uptodate nil) |
| 784 | (newsticker--ticker-text-setup) | 784 | (newsticker--ticker-text-setup) |
| 785 | (newsticker-buffer-update) | 785 | (newsticker-buffer-update) |
| 786 | ;; go back to where we came frome | 786 | ;; Go back to where we came from. |
| 787 | (goto-char pos) | 787 | (goto-char pos) |
| 788 | (end-of-line) | 788 | (end-of-line) |
| 789 | (newsticker--buffer-goto '(feed) nil t)))) | 789 | (newsticker--buffer-goto '(feed) nil t)))) |
| 790 | 790 | ||
| 791 | (defun newsticker-mark-all-items-at-point-as-read () | 791 | (defun newsticker-mark-all-items-at-point-as-read () |
| 792 | "Mark all items as read and clear ticker contents." | 792 | "Mark all items as read and clear ticker contents." |
| 793 | (interactive) | 793 | (interactive) |
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el index 3a2cf3f04f7..0a1e07e63f1 100644 --- a/lisp/net/newsticker.el +++ b/lisp/net/newsticker.el | |||
| @@ -106,7 +106,7 @@ | |||
| 106 | ;; asynchronous download of headlines. The modeline in the `*newsticker*' | 106 | ;; asynchronous download of headlines. The modeline in the `*newsticker*' |
| 107 | ;; buffer informs whenever new headlines have arrived. Clicking | 107 | ;; buffer informs whenever new headlines have arrived. Clicking |
| 108 | ;; mouse-button 2 or pressing RET in this buffer on a headline will call | 108 | ;; mouse-button 2 or pressing RET in this buffer on a headline will call |
| 109 | ;; browse-url to load the corresponding news story in your favourite web | 109 | ;; browse-url to load the corresponding news story in your favorite web |
| 110 | ;; browser. | 110 | ;; browser. |
| 111 | 111 | ||
| 112 | ;; The scrolling, or flashing of headlines in the echo area, can be started | 112 | ;; The scrolling, or flashing of headlines in the echo area, can be started |
diff --git a/lisp/obsolete/s-region.el b/lisp/obsolete/s-region.el index b06861c0efc..8fb6703aa25 100644 --- a/lisp/obsolete/s-region.el +++ b/lisp/obsolete/s-region.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Morten Welinder <terra@diku.dk> | 5 | ;; Author: Morten Welinder <terra@diku.dk> |
| 6 | ;; Keywords: terminals | 6 | ;; Keywords: terminals |
| 7 | ;; Favourite-brand-of-beer: None, I hate beer. | 7 | ;; Favorite-brand-of-beer: None, I hate beer. |
| 8 | ;; Obsolete-since: 24.1 | 8 | ;; Obsolete-since: 24.1 |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index bcc708ae6e3..b946d147e5b 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog | |||
| @@ -8074,7 +8074,7 @@ | |||
| 8074 | 2010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> | 8074 | 2010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> |
| 8075 | 8075 | ||
| 8076 | * org-list.el (org-insert-item-internal): Guessing of blank lines | 8076 | * org-list.el (org-insert-item-internal): Guessing of blank lines |
| 8077 | number is made by looking at neighbours items, if any. | 8077 | number is made by looking at neighboring items, if any. |
| 8078 | 8078 | ||
| 8079 | 2010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> | 8079 | 2010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> |
| 8080 | 8080 | ||
| @@ -15571,7 +15571,7 @@ | |||
| 15571 | * org.el (org-agenda-tags-todo-honor-ignore-options): | 15571 | * org.el (org-agenda-tags-todo-honor-ignore-options): |
| 15572 | Declare variable. | 15572 | Declare variable. |
| 15573 | 15573 | ||
| 15574 | * org-table.el (org-table-insert-hline): Fix typo in fuction call | 15574 | * org-table.el (org-table-insert-hline): Fix typo in function call |
| 15575 | to `backward-char'. | 15575 | to `backward-char'. |
| 15576 | 15576 | ||
| 15577 | * org-exp.el (org-export-as-html): Remove the initial space from | 15577 | * org-exp.el (org-export-as-html): Remove the initial space from |
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el index 9f40c5bd9d5..d5f9beea337 100644 --- a/lisp/org/org-beamer.el +++ b/lisp/org/org-beamer.el | |||
| @@ -411,7 +411,7 @@ the value will be inserted right after the documentclass statement." | |||
| 411 | 411 | ||
| 412 | 412 | ||
| 413 | ;; Functions to initialize and post-process | 413 | ;; Functions to initialize and post-process |
| 414 | ;; These fuctions will be hooked into various places in the export process | 414 | ;; These functions will be hooked into various places in the export process |
| 415 | 415 | ||
| 416 | (defun org-beamer-initialize-open-trackers () | 416 | (defun org-beamer-initialize-open-trackers () |
| 417 | "Reset variables that track if certain environments are open during export." | 417 | "Reset variables that track if certain environments are open during export." |
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el index bd2b168f2bc..138d99a36d9 100644 --- a/lisp/org/org-bibtex.el +++ b/lisp/org/org-bibtex.el | |||
| @@ -221,7 +221,7 @@ | |||
| 221 | 221 | ||
| 222 | (defcustom org-bibtex-prefix nil | 222 | (defcustom org-bibtex-prefix nil |
| 223 | "Optional prefix for all bibtex property names. | 223 | "Optional prefix for all bibtex property names. |
| 224 | For example setting to 'BIB_' would allow interoperability with fireforg." | 224 | For example setting to 'BIB_' would allow interoperability with Fireforg." |
| 225 | :group 'org-bibtex | 225 | :group 'org-bibtex |
| 226 | :type 'string) | 226 | :type 'string) |
| 227 | 227 | ||
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index 1a14c71d510..9184f0c3d54 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el | |||
| @@ -1177,7 +1177,7 @@ some heuristics to guess the result." | |||
| 1177 | ;; When `org-blank-before-new-entry' says so, it is 1. | 1177 | ;; When `org-blank-before-new-entry' says so, it is 1. |
| 1178 | ((eq insert-blank-p t) 1) | 1178 | ((eq insert-blank-p t) 1) |
| 1179 | ;; `plain-list-item' is 'auto. Count blank lines separating | 1179 | ;; `plain-list-item' is 'auto. Count blank lines separating |
| 1180 | ;; neighbours items in list. | 1180 | ;; neighboring items in list. |
| 1181 | (t (let ((next-p (org-list-get-next-item item struct prevs))) | 1181 | (t (let ((next-p (org-list-get-next-item item struct prevs))) |
| 1182 | (cond | 1182 | (cond |
| 1183 | ;; Is there a next item? | 1183 | ;; Is there a next item? |
diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el index e15debfd90c..8819f416f1d 100644 --- a/lisp/org/org-remember.el +++ b/lisp/org/org-remember.el | |||
| @@ -63,7 +63,7 @@ and `org-remember-default-headline'. To force prompting anyway, use | |||
| 63 | \\[universal-argument] \\[org-remember-finalize] to file the note. | 63 | \\[universal-argument] \\[org-remember-finalize] to file the note. |
| 64 | 64 | ||
| 65 | When this variable is nil, \\[org-remember-finalize] gives you the prompts, and | 65 | When this variable is nil, \\[org-remember-finalize] gives you the prompts, and |
| 66 | \\[universal-argument] \\[org-remember-finalize] triggers the fasttrack." | 66 | \\[universal-argument] \\[org-remember-finalize] triggers the fast track." |
| 67 | :group 'org-remember | 67 | :group 'org-remember |
| 68 | :type 'boolean) | 68 | :type 'boolean) |
| 69 | 69 | ||
diff --git a/lisp/org/org.el b/lisp/org/org.el index f88ed3c7ebc..25bfb8a78e8 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -1480,7 +1480,7 @@ When nil, the link search tries to match a phrase with all words | |||
| 1480 | in the search text." | 1480 | in the search text." |
| 1481 | :group 'org-link-follow | 1481 | :group 'org-link-follow |
| 1482 | :type '(choice | 1482 | :type '(choice |
| 1483 | (const :tag "Use fuzy text search" nil) | 1483 | (const :tag "Use fuzzy text search" nil) |
| 1484 | (const :tag "Match only exact headline" t) | 1484 | (const :tag "Match only exact headline" t) |
| 1485 | (const :tag "Match exact headline or query to create it" | 1485 | (const :tag "Match exact headline or query to create it" |
| 1486 | query-to-create))) | 1486 | query-to-create))) |
diff --git a/lisp/play/bruce.el b/lisp/play/bruce.el index 168d528ecb1..a41d5a3d3d1 100644 --- a/lisp/play/bruce.el +++ b/lisp/play/bruce.el | |||
| @@ -110,7 +110,7 @@ | |||
| 110 | :group 'games) | 110 | :group 'games) |
| 111 | 111 | ||
| 112 | (defcustom bruce-phrases-file "~/bruce.lines" | 112 | (defcustom bruce-phrases-file "~/bruce.lines" |
| 113 | "Keep your favourite phrases here." | 113 | "Keep your favorite phrases here." |
| 114 | :type 'file | 114 | :type 'file |
| 115 | :group 'bruce) | 115 | :group 'bruce) |
| 116 | 116 | ||
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el index 55b0a564fef..a46c2ba8171 100644 --- a/lisp/play/fortune.el +++ b/lisp/play/fortune.el | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | ;; (lambda () | 52 | ;; (lambda () |
| 53 | ;; (define-key gnus-article-mode-map "i" 'fortune-from-region))) | 53 | ;; (define-key gnus-article-mode-map "i" 'fortune-from-region))) |
| 54 | ;; which allows marking a region and then pressing "i" so that the marked | 54 | ;; which allows marking a region and then pressing "i" so that the marked |
| 55 | ;; region will be automatically added to my favourite fortune-file. | 55 | ;; region will be automatically added to my favorite fortune-file. |
| 56 | 56 | ||
| 57 | ;;; Code: | 57 | ;;; Code: |
| 58 | 58 | ||
diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el index 722c3b43033..b52ade6fdb7 100644 --- a/lisp/play/solitaire.el +++ b/lisp/play/solitaire.el | |||
| @@ -190,7 +190,7 @@ That's all. Here's the board after two moves: | |||
| 190 | 190 | ||
| 191 | o o o | 191 | o o o |
| 192 | 192 | ||
| 193 | Pick your favourite shortcuts: | 193 | Pick your favorite shortcuts: |
| 194 | 194 | ||
| 195 | \\{solitaire-mode-map}" | 195 | \\{solitaire-mode-map}" |
| 196 | 196 | ||
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 007203a8b21..ce04d8b390e 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el | |||
| @@ -1837,7 +1837,7 @@ after indenting." | |||
| 1837 | (and (< (point) pos) | 1837 | (and (< (point) pos) |
| 1838 | (goto-char pos)) | 1838 | (goto-char pos)) |
| 1839 | (if auto-fill-function | 1839 | (if auto-fill-function |
| 1840 | ;; GM NO-UPDATE not honoured, since this calls f90-update-line. | 1840 | ;; GM NO-UPDATE not honored, since this calls f90-update-line. |
| 1841 | (f90-do-auto-fill) | 1841 | (f90-do-auto-fill) |
| 1842 | (or no-update (f90-update-line))) | 1842 | (or no-update (f90-update-line))) |
| 1843 | (set-marker pos nil))) | 1843 | (set-marker pos nil))) |
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index 009400504b2..e98ca58f3e0 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el | |||
| @@ -571,7 +571,7 @@ in the Fortran entry in `hs-special-modes-alist'.") | |||
| 571 | ;; An alternative is to match on THEN at a line end, eg: | 571 | ;; An alternative is to match on THEN at a line end, eg: |
| 572 | ;; ".*)[ \t]*then[ \t]*\\($\\|!\\)" | 572 | ;; ".*)[ \t]*then[ \t]*\\($\\|!\\)" |
| 573 | ;; This would also match ELSE branches, though. This does not seem | 573 | ;; This would also match ELSE branches, though. This does not seem |
| 574 | ;; right to me, because then one has neighbouring blocks that are | 574 | ;; right to me, because then one has neighboring blocks that are |
| 575 | ;; not nested in each other. | 575 | ;; not nested in each other. |
| 576 | "\\(if[ \t]*(\\(.*\\|" | 576 | "\\(if[ \t]*(\\(.*\\|" |
| 577 | ".*\n\\([^if]*\\([^i].\\|.[^f]\\|.\\>\\)\\)\\)\\<then\\|" | 577 | ".*\n\\([^if]*\\([^i].\\|.[^f]\\|.\\>\\)\\)\\)\\<then\\|" |
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index a2dd67a0f13..2708346f05f 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el | |||
| @@ -991,7 +991,7 @@ on a line. Then `NAME:' must be followed by the routine name on the | |||
| 991 | same or the next line. When KEYWORD is non-nil, looks first for a | 991 | same or the next line. When KEYWORD is non-nil, looks first for a |
| 992 | `KEYWORDS' section. It is amazing how inconsisten this is through | 992 | `KEYWORDS' section. It is amazing how inconsisten this is through |
| 993 | some IDL libraries I have seen. We settle for a line containing an | 993 | some IDL libraries I have seen. We settle for a line containing an |
| 994 | upper case \"KEYWORD\" string. If this line is not fould we search | 994 | upper case \"KEYWORD\" string. If this line is not found we search |
| 995 | for the keyword anyway to increase the hit-rate | 995 | for the keyword anyway to increase the hit-rate |
| 996 | 996 | ||
| 997 | When one of these sections exists we check for a line starting with any of | 997 | When one of these sections exists we check for a line starting with any of |
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 293ba49d4ae..c49519ed179 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el | |||
| @@ -532,7 +532,7 @@ not be enclosed in { } or ( )." | |||
| 532 | ;; should return an exit status of zero if the target `foo' is | 532 | ;; should return an exit status of zero if the target `foo' is |
| 533 | ;; up to date and a nonzero exit status otherwise. | 533 | ;; up to date and a nonzero exit status otherwise. |
| 534 | ;; Many makes can do this although the docs/manpages do not mention | 534 | ;; Many makes can do this although the docs/manpages do not mention |
| 535 | ;; it. Try it with your favourite one. GNU make, System V make, and | 535 | ;; it. Try it with your favorite one. GNU make, System V make, and |
| 536 | ;; Dennis Vadura's DMake have no problems. | 536 | ;; Dennis Vadura's DMake have no problems. |
| 537 | ;; Set the variable `makefile-brave-make' to the name of the | 537 | ;; Set the variable `makefile-brave-make' to the name of the |
| 538 | ;; make utility that does this on your system. | 538 | ;; make utility that does this on your system. |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 8d2e6715444..a0a368777e7 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -2553,7 +2553,7 @@ If the traceback target file path is invalid, we look for the | |||
| 2553 | most recently visited python-mode buffer which either has the | 2553 | most recently visited python-mode buffer which either has the |
| 2554 | name of the current function or class, or which defines the | 2554 | name of the current function or class, or which defines the |
| 2555 | function or class. This is to provide for scripts not in the | 2555 | function or class. This is to provide for scripts not in the |
| 2556 | local filesytem (e.g., Zope's 'Script \(Python)', but it's not | 2556 | local file system (e.g., Zope's 'Script \(Python)', but it's not |
| 2557 | Zope specific). If you put a copy of the script in a buffer | 2557 | Zope specific). If you put a copy of the script in a buffer |
| 2558 | named for the script and activate python-mode, then pdbtrack will | 2558 | named for the script and activate python-mode, then pdbtrack will |
| 2559 | find it." | 2559 | find it." |
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index da2b4e81577..bca5c93e0a5 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el | |||
| @@ -985,7 +985,7 @@ Find all the unescaped \" characters within said subshell, remembering that | |||
| 985 | subshells can nest." | 985 | subshells can nest." |
| 986 | ;; FIXME: This can (and often does) match multiple lines, yet it makes no | 986 | ;; FIXME: This can (and often does) match multiple lines, yet it makes no |
| 987 | ;; effort to handle multiline cases correctly, so it ends up being | 987 | ;; effort to handle multiline cases correctly, so it ends up being |
| 988 | ;; rather flakey. | 988 | ;; rather flaky. |
| 989 | (when (eq ?\" (nth 3 (syntax-ppss))) ; Check we matched an opening quote. | 989 | (when (eq ?\" (nth 3 (syntax-ppss))) ; Check we matched an opening quote. |
| 990 | ;; bingo we have a $( or a ` inside a "" | 990 | ;; bingo we have a $( or a ` inside a "" |
| 991 | (let (;; `state' can be: double-quote, backquote, code. | 991 | (let (;; `state' can be: double-quote, backquote, code. |
diff --git a/lisp/term.el b/lisp/term.el index 87e5a734701..e1638aecc76 100644 --- a/lisp/term.el +++ b/lisp/term.el | |||
| @@ -294,7 +294,7 @@ | |||
| 294 | ;; # Notice that the ^[ character is an ESC, not two chars. You can | 294 | ;; # Notice that the ^[ character is an ESC, not two chars. You can |
| 295 | ;; # get it in various ways, for example by typing | 295 | ;; # get it in various ways, for example by typing |
| 296 | ;; # echo -e '\033' > escape.file | 296 | ;; # echo -e '\033' > escape.file |
| 297 | ;; # or by using your favourite editor | 297 | ;; # or by using your favorite editor |
| 298 | ;; | 298 | ;; |
| 299 | ;; foreach temp (cd pushd) | 299 | ;; foreach temp (cd pushd) |
| 300 | ;; alias $temp "$temp \!* ; echo 'AnSiTc' $cwd_hack" | 300 | ;; alias $temp "$temp \!* ; echo 'AnSiTc' $cwd_hack" |
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 6f9e7e1bdb0..81e92487eb0 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el | |||
| @@ -1534,7 +1534,7 @@ is a regular expression for matching the lines with items." | |||
| 1534 | 1534 | ||
| 1535 | (defvar rst-preferred-bullets | 1535 | (defvar rst-preferred-bullets |
| 1536 | '(?- ?* ?+) | 1536 | '(?- ?* ?+) |
| 1537 | "List of favourite bullets to set for straightening bullets.") | 1537 | "List of favorite bullets to set for straightening bullets.") |
| 1538 | 1538 | ||
| 1539 | (defun rst-straighten-bullets-region (beg end) | 1539 | (defun rst-straighten-bullets-region (beg end) |
| 1540 | "Make all the bulleted list items in the region consistent. | 1540 | "Make all the bulleted list items in the region consistent. |
diff --git a/lisp/url/url-future.el b/lisp/url/url-future.el index ac85a3cec47..8a2c112715c 100644 --- a/lisp/url/url-future.el +++ b/lisp/url/url-future.el | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | ;; So, to get the value: | 36 | ;; So, to get the value: |
| 37 | ;; (when (url-future-completed-p future) (url-future-value future)) | 37 | ;; (when (url-future-completed-p future) (url-future-value future)) |
| 38 | 38 | ||
| 39 | ;; See the ERT tests and the code for futher details. | 39 | ;; See the ERT tests and the code for further details. |
| 40 | 40 | ||
| 41 | ;;; Code: | 41 | ;;; Code: |
| 42 | 42 | ||
diff --git a/nt/gmake.defs b/nt/gmake.defs index 46d4acf76dd..a1ff7af853e 100644 --- a/nt/gmake.defs +++ b/nt/gmake.defs | |||
| @@ -95,7 +95,7 @@ THISDIR = . | |||
| 95 | ifdef USING_SH | 95 | ifdef USING_SH |
| 96 | sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2) | 96 | sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2) |
| 97 | sh_output := $(shell echo foo") | 97 | sh_output := $(shell echo foo") |
| 98 | # This single quote " is to fix fintification due to previous line | 98 | # This single quote " is to fix fontification due to previous line |
| 99 | ifeq "$(sh_output)" "" | 99 | ifeq "$(sh_output)" "" |
| 100 | NEW_CYGWIN = 1 | 100 | NEW_CYGWIN = 1 |
| 101 | endif | 101 | endif |
| @@ -311,4 +311,3 @@ export XMFLAGS | |||
| 311 | 311 | ||
| 312 | $(BLD)/%.o: %.c | 312 | $(BLD)/%.o: %.c |
| 313 | $(CC) $(CFLAGS) $(CC_OUT)$@ $< | 313 | $(CC) $(CFLAGS) $(CC_OUT)$@ $< |
| 314 | |||
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index b40b5ca7084..5d04eea75d4 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog | |||
| @@ -167,7 +167,7 @@ | |||
| 167 | 2007-02-25 Glenn Morris <rgm@gnu.org> | 167 | 2007-02-25 Glenn Morris <rgm@gnu.org> |
| 168 | 168 | ||
| 169 | * XCrAssoc.c, XDelAssoc.c, XDestAssoc.c, XLookAssoc.c: | 169 | * XCrAssoc.c, XDelAssoc.c, XDestAssoc.c, XLookAssoc.c: |
| 170 | * XMakeAssoc.c: Remove license text in favour of including | 170 | * XMakeAssoc.c: Remove license text in favor of including |
| 171 | copyright.h, as was done in original X11 source. | 171 | copyright.h, as was done in original X11 source. |
| 172 | 172 | ||
| 173 | 2004-12-27 Jan Djärv <jan.h.d@swipnet.se> | 173 | 2004-12-27 Jan Djärv <jan.h.d@swipnet.se> |
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index beb66847253..181b11b5a2b 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 | |||
| @@ -20702,11 +20702,11 @@ | |||
| 20702 | (free_frame_menubar): Only compile if not USE_GTK. GTK version | 20702 | (free_frame_menubar): Only compile if not USE_GTK. GTK version |
| 20703 | is in gtkutil.c. | 20703 | is in gtkutil.c. |
| 20704 | (popup_selection_callback): New version for USE_GTK. | 20704 | (popup_selection_callback): New version for USE_GTK. |
| 20705 | (create_and_show_popup_menu): New fuction, one USE_GTK version and | 20705 | (create_and_show_popup_menu): New function, one USE_GTK version and |
| 20706 | one USE_X_TOOLKIT version. | 20706 | one USE_X_TOOLKIT version. |
| 20707 | (xmenu_show): Call create_and_show_popup_menu. | 20707 | (xmenu_show): Call create_and_show_popup_menu. |
| 20708 | (dialog_selection_callback): New version for USE_GTK. | 20708 | (dialog_selection_callback): New version for USE_GTK. |
| 20709 | (create_and_show_dialog): New fuction, one USE_GTK version and | 20709 | (create_and_show_dialog): New function, one USE_GTK version and |
| 20710 | one USE_X_TOOLKIT version. | 20710 | one USE_X_TOOLKIT version. |
| 20711 | (xdialog_show): Call create_and_show_dialog. | 20711 | (xdialog_show): Call create_and_show_dialog. |
| 20712 | 20712 | ||
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index f9372aa666a..141a570040c 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 | |||
| @@ -1138,7 +1138,7 @@ | |||
| 1138 | ntproc.c and simplified to match other changes (all handles are | 1138 | ntproc.c and simplified to match other changes (all handles are |
| 1139 | already non-inheritable). | 1139 | already non-inheritable). |
| 1140 | 1140 | ||
| 1141 | (get_emacs_configuration): Detect Windows flavour (Windows 95 or | 1141 | (get_emacs_configuration): Detect Windows flavor (Windows 95 or |
| 1142 | NT) at run-time. Change OS name for Windows 95 to be "win95". | 1142 | NT) at run-time. Change OS name for Windows 95 to be "win95". |
| 1143 | 1143 | ||
| 1144 | (fd_info): New variable. Array of extra info for file descriptors | 1144 | (fd_info): New variable. Array of extra info for file descriptors |
diff --git a/src/dispnew.c b/src/dispnew.c index 7b594c5b4e8..6ba834ba339 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -3491,7 +3491,7 @@ redraw_overlapping_rows (struct window *w, int yb) | |||
| 3491 | if (row->used[RIGHT_MARGIN_AREA]) | 3491 | if (row->used[RIGHT_MARGIN_AREA]) |
| 3492 | rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps); | 3492 | rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps); |
| 3493 | 3493 | ||
| 3494 | /* Record in neighbour rows that ROW overwrites part of | 3494 | /* Record in neighbor rows that ROW overwrites part of |
| 3495 | their display. */ | 3495 | their display. */ |
| 3496 | if (overlaps & OVERLAPS_PRED) | 3496 | if (overlaps & OVERLAPS_PRED) |
| 3497 | MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1; | 3497 | MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1; |
diff --git a/src/font.c b/src/font.c index 3fc5fc944b4..9559c65e7ed 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -954,7 +954,7 @@ font_expand_wildcards (Lisp_Object *field, int n) | |||
| 954 | } | 954 | } |
| 955 | } | 955 | } |
| 956 | 956 | ||
| 957 | /* Decide all fileds from restrictions in RANGE. */ | 957 | /* Decide all fields from restrictions in RANGE. */ |
| 958 | for (i = j = 0; i < n ; i++) | 958 | for (i = j = 0; i < n ; i++) |
| 959 | { | 959 | { |
| 960 | if (j < range[i].from) | 960 | if (j < range[i].from) |
diff --git a/src/keymap.c b/src/keymap.c index 739dfd8f2de..6f9cf288f6d 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -998,7 +998,7 @@ copy_keymap_item (Lisp_Object elt) | |||
| 998 | } | 998 | } |
| 999 | else | 999 | else |
| 1000 | { | 1000 | { |
| 1001 | /* It may be an old fomat menu item. | 1001 | /* It may be an old format menu item. |
| 1002 | Skip the optional menu string. */ | 1002 | Skip the optional menu string. */ |
| 1003 | if (STRINGP (XCAR (tem))) | 1003 | if (STRINGP (XCAR (tem))) |
| 1004 | { | 1004 | { |
diff --git a/src/process.c b/src/process.c index 9b15e4c56c0..53382d804f2 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -3120,7 +3120,7 @@ usage: (make-network-process &rest ARGS) */) | |||
| 3120 | { | 3120 | { |
| 3121 | struct hostent *host_info_ptr; | 3121 | struct hostent *host_info_ptr; |
| 3122 | 3122 | ||
| 3123 | /* gethostbyname may fail with TRY_AGAIN, but we don't honour that, | 3123 | /* gethostbyname may fail with TRY_AGAIN, but we don't honor that, |
| 3124 | as it may `hang' Emacs for a very long time. */ | 3124 | as it may `hang' Emacs for a very long time. */ |
| 3125 | immediate_quit = 1; | 3125 | immediate_quit = 1; |
| 3126 | QUIT; | 3126 | QUIT; |
diff --git a/src/w32proc.c b/src/w32proc.c index c2020b40241..279816bcc3e 100644 --- a/src/w32proc.c +++ b/src/w32proc.c | |||
| @@ -174,7 +174,7 @@ delete_child (child_process *cp) | |||
| 174 | cp->status = STATUS_READ_ERROR; | 174 | cp->status = STATUS_READ_ERROR; |
| 175 | SetEvent (cp->char_consumed); | 175 | SetEvent (cp->char_consumed); |
| 176 | #if 0 | 176 | #if 0 |
| 177 | /* We used to forceably terminate the thread here, but it | 177 | /* We used to forcibly terminate the thread here, but it |
| 178 | is normally unnecessary, and in abnormal cases, the worst that | 178 | is normally unnecessary, and in abnormal cases, the worst that |
| 179 | will happen is we have an extra idle thread hanging around | 179 | will happen is we have an extra idle thread hanging around |
| 180 | waiting for the zombie process. */ | 180 | waiting for the zombie process. */ |
diff --git a/src/w32term.h b/src/w32term.h index 710394583e4..02392133837 100644 --- a/src/w32term.h +++ b/src/w32term.h | |||
| @@ -637,7 +637,7 @@ extern void x_delete_display (struct w32_display_info *dpyinfo); | |||
| 637 | 637 | ||
| 638 | /* Keypad command key support. W32 doesn't have virtual keys defined | 638 | /* Keypad command key support. W32 doesn't have virtual keys defined |
| 639 | for the function keys on the keypad (they are mapped to the standard | 639 | for the function keys on the keypad (they are mapped to the standard |
| 640 | fuction keys), so we define our own. */ | 640 | function keys), so we define our own. */ |
| 641 | #define VK_NUMPAD_BEGIN 0x92 | 641 | #define VK_NUMPAD_BEGIN 0x92 |
| 642 | #define VK_NUMPAD_CLEAR (VK_NUMPAD_BEGIN + 0) | 642 | #define VK_NUMPAD_CLEAR (VK_NUMPAD_BEGIN + 0) |
| 643 | #define VK_NUMPAD_ENTER (VK_NUMPAD_BEGIN + 1) | 643 | #define VK_NUMPAD_ENTER (VK_NUMPAD_BEGIN + 1) |