diff options
| author | Paul Eggert | 2011-12-11 21:32:49 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-12-11 21:32:49 -0800 |
| commit | 333f9019e29e9b6de3a7ec07448be1d364ba540b (patch) | |
| tree | fd19625604abbd2784e9c9de92c613ff965ea11d | |
| parent | 11636b221d2897aed5ca9a762d7b61afd20b6168 (diff) | |
| download | emacs-333f9019e29e9b6de3a7ec07448be1d364ba540b.tar.gz emacs-333f9019e29e9b6de3a7ec07448be1d364ba540b.zip | |
Spelling fixes.
78 files changed, 146 insertions, 148 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 7661b8c401b..d1dbbfd0831 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1676,7 +1676,7 @@ | |||
| 1676 | 2009-08-31 Nick Roberts <nickrob@snap.net.nz> | 1676 | 2009-08-31 Nick Roberts <nickrob@snap.net.nz> |
| 1677 | 1677 | ||
| 1678 | * building.texi (Threads Buffer, Multithreaded Debugging): | 1678 | * building.texi (Threads Buffer, Multithreaded Debugging): |
| 1679 | Re-organise these two sections. | 1679 | Reorganize these two sections. |
| 1680 | 1680 | ||
| 1681 | 2009-08-29 Eli Zaretskii <eliz@gnu.org> | 1681 | 2009-08-29 Eli Zaretskii <eliz@gnu.org> |
| 1682 | 1682 | ||
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index d620c9e3c4c..44d44e7528c 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -9754,7 +9754,7 @@ | |||
| 9754 | directory have been changed to reflect this. | 9754 | directory have been changed to reflect this. |
| 9755 | 9755 | ||
| 9756 | * All instances of @indentedresultt{} have been changed to | 9756 | * All instances of @indentedresultt{} have been changed to |
| 9757 | ` @result{}', using 5 spaces at the begining of the line. | 9757 | ` @result{}', using 5 spaces at the beginning of the line. |
| 9758 | 9758 | ||
| 9759 | 1989-04-24 Robert J. Chassell (bob@rice-chex.ai.mit.edu) | 9759 | 1989-04-24 Robert J. Chassell (bob@rice-chex.ai.mit.edu) |
| 9760 | 9760 | ||
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index cefa917a4e1..98eaf1f8ade 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi | |||
| @@ -1381,7 +1381,7 @@ Operating System Interface | |||
| 1381 | * System Environment:: Distinguish the name and kind of system. | 1381 | * System Environment:: Distinguish the name and kind of system. |
| 1382 | * User Identification:: Finding the name and user id of the user. | 1382 | * User Identification:: Finding the name and user id of the user. |
| 1383 | * Time of Day:: Getting the current time. | 1383 | * Time of Day:: Getting the current time. |
| 1384 | * Time Conversion:: Converting a time from numeric form to | 1384 | * Time Conversion:: Converting a time from numeric form to |
| 1385 | calendrical data and vice versa. | 1385 | calendrical data and vice versa. |
| 1386 | * Time Parsing:: Converting a time from numeric form to text | 1386 | * Time Parsing:: Converting a time from numeric form to text |
| 1387 | and vice versa. | 1387 | and vice versa. |
| @@ -1438,7 +1438,7 @@ Tips and Conventions | |||
| 1438 | GNU Emacs Internals | 1438 | GNU Emacs Internals |
| 1439 | 1439 | ||
| 1440 | * Building Emacs:: How the dumped Emacs is made. | 1440 | * Building Emacs:: How the dumped Emacs is made. |
| 1441 | * Pure Storage:: A kludge to make preloaded Lisp functions sharable. | 1441 | * Pure Storage:: Kludge to make preloaded Lisp functions shareable. |
| 1442 | * Garbage Collection:: Reclaiming space for Lisp objects no longer used. | 1442 | * Garbage Collection:: Reclaiming space for Lisp objects no longer used. |
| 1443 | * Memory Usage:: Info about total size of Lisp objects made so far. | 1443 | * Memory Usage:: Info about total size of Lisp objects made so far. |
| 1444 | * Writing Emacs Primitives:: Writing C code for Emacs. | 1444 | * Writing Emacs Primitives:: Writing C code for Emacs. |
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index 0168c564e34..9ef4646b50b 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi | |||
| @@ -13,7 +13,7 @@ internal aspects of GNU Emacs that may be of interest to C programmers. | |||
| 13 | 13 | ||
| 14 | @menu | 14 | @menu |
| 15 | * Building Emacs:: How the dumped Emacs is made. | 15 | * Building Emacs:: How the dumped Emacs is made. |
| 16 | * Pure Storage:: A kludge to make preloaded Lisp functions sharable. | 16 | * Pure Storage:: Kludge to make preloaded Lisp functions shareable. |
| 17 | * Garbage Collection:: Reclaiming space for Lisp objects no longer used. | 17 | * Garbage Collection:: Reclaiming space for Lisp objects no longer used. |
| 18 | * Memory Usage:: Info about total size of Lisp objects made so far. | 18 | * Memory Usage:: Info about total size of Lisp objects made so far. |
| 19 | * Writing Emacs Primitives:: Writing C code for Emacs. | 19 | * Writing Emacs Primitives:: Writing C code for Emacs. |
| @@ -196,7 +196,7 @@ function definition in pure storage. If it is non-@code{nil}, then the | |||
| 196 | function definition is copied into pure storage. | 196 | function definition is copied into pure storage. |
| 197 | 197 | ||
| 198 | This flag is @code{t} while loading all of the basic functions for | 198 | This flag is @code{t} while loading all of the basic functions for |
| 199 | building Emacs initially (allowing those functions to be sharable and | 199 | building Emacs initially (allowing those functions to be shareable and |
| 200 | non-collectible). Dumping Emacs as an executable always writes | 200 | non-collectible). Dumping Emacs as an executable always writes |
| 201 | @code{nil} in this variable, regardless of the value it actually has | 201 | @code{nil} in this variable, regardless of the value it actually has |
| 202 | before and after dumping. | 202 | before and after dumping. |
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 298c7c3d1a8..46dbbb08e57 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi | |||
| @@ -1580,7 +1580,7 @@ decoding functions (@pxref{Explicit Encoding}). | |||
| 1580 | Sometimes, you need to prefer several coding systems for some | 1580 | Sometimes, you need to prefer several coding systems for some |
| 1581 | operation, rather than fix a single one. Emacs lets you specify a | 1581 | operation, rather than fix a single one. Emacs lets you specify a |
| 1582 | priority order for using coding systems. This ordering affects the | 1582 | priority order for using coding systems. This ordering affects the |
| 1583 | sorting of lists of coding sysems returned by functions such as | 1583 | sorting of lists of coding systems returned by functions such as |
| 1584 | @code{find-coding-systems-region} (@pxref{Lisp and Coding Systems}). | 1584 | @code{find-coding-systems-region} (@pxref{Lisp and Coding Systems}). |
| 1585 | 1585 | ||
| 1586 | @defun coding-system-priority-list &optional highestp | 1586 | @defun coding-system-priority-list &optional highestp |
diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi index 914ba5b1fd8..c89447fc139 100644 --- a/doc/lispref/vol1.texi +++ b/doc/lispref/vol1.texi | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | @end ifset | 44 | @end ifset |
| 45 | 45 | ||
| 46 | @c per rms and peterb, use 10pt fonts for the main text, mostly to | 46 | @c per rms and peterb, use 10pt fonts for the main text, mostly to |
| 47 | @c save on paper cost. | 47 | @c save on paper cost. |
| 48 | @c Do this inside @tex for now, so current makeinfo does not complain. | 48 | @c Do this inside @tex for now, so current makeinfo does not complain. |
| 49 | @tex | 49 | @tex |
| 50 | @ifset smallbook | 50 | @ifset smallbook |
| @@ -1402,7 +1402,7 @@ Operating System Interface | |||
| 1402 | * System Environment:: Distinguish the name and kind of system. | 1402 | * System Environment:: Distinguish the name and kind of system. |
| 1403 | * User Identification:: Finding the name and user id of the user. | 1403 | * User Identification:: Finding the name and user id of the user. |
| 1404 | * Time of Day:: Getting the current time. | 1404 | * Time of Day:: Getting the current time. |
| 1405 | * Time Conversion:: Converting a time from numeric form to | 1405 | * Time Conversion:: Converting a time from numeric form to |
| 1406 | calendrical data and vice versa. | 1406 | calendrical data and vice versa. |
| 1407 | * Time Parsing:: Converting a time from numeric form to text | 1407 | * Time Parsing:: Converting a time from numeric form to text |
| 1408 | and vice versa. | 1408 | and vice versa. |
| @@ -1458,7 +1458,7 @@ Tips and Conventions | |||
| 1458 | GNU Emacs Internals | 1458 | GNU Emacs Internals |
| 1459 | 1459 | ||
| 1460 | * Building Emacs:: How the dumped Emacs is made. | 1460 | * Building Emacs:: How the dumped Emacs is made. |
| 1461 | * Pure Storage:: A kludge to make preloaded Lisp functions sharable. | 1461 | * Pure Storage:: Kludge to make preloaded Lisp functions shareable. |
| 1462 | * Garbage Collection:: Reclaiming space for Lisp objects no longer used. | 1462 | * Garbage Collection:: Reclaiming space for Lisp objects no longer used. |
| 1463 | * Memory Usage:: Info about total size of Lisp objects made so far. | 1463 | * Memory Usage:: Info about total size of Lisp objects made so far. |
| 1464 | * Writing Emacs Primitives:: Writing C code for Emacs. | 1464 | * Writing Emacs Primitives:: Writing C code for Emacs. |
diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 1f84b267c9b..d45d23da365 100644 --- a/doc/lispref/vol2.texi +++ b/doc/lispref/vol2.texi | |||
| @@ -1401,7 +1401,7 @@ Operating System Interface | |||
| 1401 | * System Environment:: Distinguish the name and kind of system. | 1401 | * System Environment:: Distinguish the name and kind of system. |
| 1402 | * User Identification:: Finding the name and user id of the user. | 1402 | * User Identification:: Finding the name and user id of the user. |
| 1403 | * Time of Day:: Getting the current time. | 1403 | * Time of Day:: Getting the current time. |
| 1404 | * Time Conversion:: Converting a time from numeric form to | 1404 | * Time Conversion:: Converting a time from numeric form to |
| 1405 | calendrical data and vice versa. | 1405 | calendrical data and vice versa. |
| 1406 | * Time Parsing:: Converting a time from numeric form to text | 1406 | * Time Parsing:: Converting a time from numeric form to text |
| 1407 | and vice versa. | 1407 | and vice versa. |
| @@ -1457,7 +1457,7 @@ Tips and Conventions | |||
| 1457 | GNU Emacs Internals | 1457 | GNU Emacs Internals |
| 1458 | 1458 | ||
| 1459 | * Building Emacs:: How the dumped Emacs is made. | 1459 | * Building Emacs:: How the dumped Emacs is made. |
| 1460 | * Pure Storage:: A kludge to make preloaded Lisp functions sharable. | 1460 | * Pure Storage:: Kludge to make preloaded Lisp functions shareable. |
| 1461 | * Garbage Collection:: Reclaiming space for Lisp objects no longer used. | 1461 | * Garbage Collection:: Reclaiming space for Lisp objects no longer used. |
| 1462 | * Memory Usage:: Info about total size of Lisp objects made so far. | 1462 | * Memory Usage:: Info about total size of Lisp objects made so far. |
| 1463 | * Writing Emacs Primitives:: Writing C code for Emacs. | 1463 | * Writing Emacs Primitives:: Writing C code for Emacs. |
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 535efd86270..d0c15c1940e 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi | |||
| @@ -16873,7 +16873,7 @@ The @kbd{t U} (@code{calc-unix-time}) [@code{unixtime}] command | |||
| 16873 | converts a date form into a Unix time value, which is the number of | 16873 | converts a date form into a Unix time value, which is the number of |
| 16874 | seconds since midnight on Jan 1, 1970, or vice-versa. The numeric result | 16874 | seconds since midnight on Jan 1, 1970, or vice-versa. The numeric result |
| 16875 | will be an integer if the current precision is 12 or less; for higher | 16875 | will be an integer if the current precision is 12 or less; for higher |
| 16876 | precisions, the result may be a float with (@var{precision}@minus{}12) | 16876 | precision, the result may be a float with (@var{precision}@minus{}12) |
| 16877 | digits after the decimal. Just as for @kbd{t J}, the numeric time | 16877 | digits after the decimal. Just as for @kbd{t J}, the numeric time |
| 16878 | is interpreted in the GMT time zone and the date form is interpreted | 16878 | is interpreted in the GMT time zone and the date form is interpreted |
| 16879 | in the current or specified zone. Some systems use Unix-like | 16879 | in the current or specified zone. Some systems use Unix-like |
| @@ -16943,7 +16943,7 @@ from a date form as an integer in the range 0 to 59. | |||
| 16943 | The @kbd{M-6 t P} [@code{second}] function extracts the second | 16943 | The @kbd{M-6 t P} [@code{second}] function extracts the second |
| 16944 | from a date form. If the current precision is 12 or less, | 16944 | from a date form. If the current precision is 12 or less, |
| 16945 | the result is an integer in the range 0 to 59. For higher | 16945 | the result is an integer in the range 0 to 59. For higher |
| 16946 | precisions, the result may instead be a floating-point number. | 16946 | precision, the result may instead be a floating-point number. |
| 16947 | 16947 | ||
| 16948 | @tindex weekday | 16948 | @tindex weekday |
| 16949 | The @kbd{M-7 t P} [@code{weekday}] function extracts the weekday | 16949 | The @kbd{M-7 t P} [@code{weekday}] function extracts the weekday |
| @@ -18499,7 +18499,7 @@ counterparts, which are also available separately as @code{calc-sech} | |||
| 18499 | Calc can compute a variety of less common functions that arise in | 18499 | Calc can compute a variety of less common functions that arise in |
| 18500 | various branches of mathematics. All of the functions described in | 18500 | various branches of mathematics. All of the functions described in |
| 18501 | this section allow arbitrary complex arguments and, except as noted, | 18501 | this section allow arbitrary complex arguments and, except as noted, |
| 18502 | will work to arbitrarily large precisions. They can not at present | 18502 | will work to arbitrarily large precision. They can not at present |
| 18503 | handle error forms or intervals as arguments. | 18503 | handle error forms or intervals as arguments. |
| 18504 | 18504 | ||
| 18505 | NOTE: These functions are still experimental. In particular, their | 18505 | NOTE: These functions are still experimental. In particular, their |
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index d5f403e5cdb..c36e45e60f7 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi | |||
| @@ -2160,7 +2160,7 @@ A space between the function name and opening parenthesis when calling | |||
| 2160 | a user function. The last character of the function name and the | 2160 | a user function. The last character of the function name and the |
| 2161 | opening parenthesis are highlighted. This font-locking rule will | 2161 | opening parenthesis are highlighted. This font-locking rule will |
| 2162 | spuriously highlight a valid concatenation expression where an | 2162 | spuriously highlight a valid concatenation expression where an |
| 2163 | identifier precedes a parenthesised expression. Unfortunately. | 2163 | identifier precedes a parenthesized expression. Unfortunately. |
| 2164 | 2164 | ||
| 2165 | @item | 2165 | @item |
| 2166 | Whitespace following the @samp{\} in what otherwise looks like an | 2166 | Whitespace following the @samp{\} in what otherwise looks like an |
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index 88b068ccd5b..06a52107d71 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi | |||
| @@ -1816,7 +1816,7 @@ handled by a hook function. | |||
| 1816 | @defvar dbus-event-error-hooks | 1816 | @defvar dbus-event-error-hooks |
| 1817 | This hook variable keeps a list of functions, which are called when a | 1817 | This hook variable keeps a list of functions, which are called when a |
| 1818 | D-Bus error happens in the event handler. Every function must accept | 1818 | D-Bus error happens in the event handler. Every function must accept |
| 1819 | two arguments, the event and the error variable catched in | 1819 | two arguments, the event and the error variable caught in |
| 1820 | @code{condition-case} by @code{dbus-error}. | 1820 | @code{condition-case} by @code{dbus-error}. |
| 1821 | 1821 | ||
| 1822 | Such functions can be used the adapt the error signal to be raised. | 1822 | Such functions can be used the adapt the error signal to be raised. |
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi index 19ee9705484..a2a4017eb64 100644 --- a/doc/misc/ebrowse.texi +++ b/doc/misc/ebrowse.texi | |||
| @@ -482,7 +482,7 @@ name. | |||
| 482 | @table @kbd | 482 | @table @kbd |
| 483 | @item SPC | 483 | @item SPC |
| 484 | This command views the class declaration if the database | 484 | This command views the class declaration if the database |
| 485 | contains informations about it. If you don't parse the entire source | 485 | contains information about it. If you don't parse the entire source |
| 486 | you are working on, some classes will only be known to exist but the | 486 | you are working on, some classes will only be known to exist but the |
| 487 | location of their declarations and definitions will not be known.@refill | 487 | location of their declarations and definitions will not be known.@refill |
| 488 | 488 | ||
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index c44cc1c9b09..91440dcfe8f 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi | |||
| @@ -417,7 +417,7 @@ called with a @acronym{MIME} handle as the argument. | |||
| 417 | @vindex mm-inline-text-html-with-images | 417 | @vindex mm-inline-text-html-with-images |
| 418 | Some @acronym{HTML} mails might have the trick of spammers using | 418 | Some @acronym{HTML} mails might have the trick of spammers using |
| 419 | @samp{<img>} tags. It is likely to be intended to verify whether you | 419 | @samp{<img>} tags. It is likely to be intended to verify whether you |
| 420 | have read the mail. You can prevent your personal informations from | 420 | have read the mail. You can prevent your personal information from |
| 421 | leaking by setting this option to @code{nil} (which is the default). | 421 | leaking by setting this option to @code{nil} (which is the default). |
| 422 | It is currently ignored by Emacs/w3. For emacs-w3m, you may use the | 422 | It is currently ignored by Emacs/w3. For emacs-w3m, you may use the |
| 423 | command @kbd{t} on the image anchor to show an image even if it is | 423 | command @kbd{t} on the image anchor to show an image even if it is |
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index ace7bb42c21..7bd3e4ac7fa 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi | |||
| @@ -1838,7 +1838,7 @@ inconvenient since you are not displaying the found mail | |||
| 1838 | in Gnus. Here comes nnir into action. Nnir is a front end | 1838 | in Gnus. Here comes nnir into action. Nnir is a front end |
| 1839 | to search engines like swish-e or swish++ and | 1839 | to search engines like swish-e or swish++ and |
| 1840 | others. You index your mail with one of those search | 1840 | others. You index your mail with one of those search |
| 1841 | engines and with the help of nnir you can search trough | 1841 | engines and with the help of nnir you can search through |
| 1842 | the indexed mail and generate a temporary group with all | 1842 | the indexed mail and generate a temporary group with all |
| 1843 | messages which met your search criteria. If this sound | 1843 | messages which met your search criteria. If this sound |
| 1844 | cool to you get nnir.el from | 1844 | cool to you get nnir.el from |
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 5ae86c4e631..68c7e8bbdbc 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi | |||
| @@ -4622,7 +4622,7 @@ Sieve is a server-side mail filtering language. In Gnus you can use | |||
| 4622 | the @code{sieve} group parameter (@pxref{Group Parameters}) to specify | 4622 | the @code{sieve} group parameter (@pxref{Group Parameters}) to specify |
| 4623 | sieve rules that should apply to each group. Gnus provides two | 4623 | sieve rules that should apply to each group. Gnus provides two |
| 4624 | commands to translate all these group parameters into a proper Sieve | 4624 | commands to translate all these group parameters into a proper Sieve |
| 4625 | script that can be transfered to the server somehow. | 4625 | script that can be transferred to the server somehow. |
| 4626 | 4626 | ||
| 4627 | @vindex gnus-sieve-file | 4627 | @vindex gnus-sieve-file |
| 4628 | @vindex gnus-sieve-region-start | 4628 | @vindex gnus-sieve-region-start |
| @@ -8332,7 +8332,7 @@ Files with name matching this regular expression won't be viewed. | |||
| 8332 | Files with a @acronym{MIME} type matching this variable won't be viewed. | 8332 | Files with a @acronym{MIME} type matching this variable won't be viewed. |
| 8333 | Note that Gnus tries to guess what type the file is based on the name. | 8333 | Note that Gnus tries to guess what type the file is based on the name. |
| 8334 | @code{gnus-uu} is not a @acronym{MIME} package (yet), so this is slightly | 8334 | @code{gnus-uu} is not a @acronym{MIME} package (yet), so this is slightly |
| 8335 | kludgey. | 8335 | kludgy. |
| 8336 | 8336 | ||
| 8337 | @item gnus-uu-tmp-dir | 8337 | @item gnus-uu-tmp-dir |
| 8338 | @vindex gnus-uu-tmp-dir | 8338 | @vindex gnus-uu-tmp-dir |
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index e2c2594b66e..1cea074fa2b 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi | |||
| @@ -528,8 +528,8 @@ differ. | |||
| 528 | @cindex methods, inline | 528 | @cindex methods, inline |
| 529 | @cindex methods, external | 529 | @cindex methods, external |
| 530 | Loading or saving a remote file requires that the content of the file | 530 | Loading or saving a remote file requires that the content of the file |
| 531 | be transfered between the two machines. The content of the file can | 531 | be transferred between the two machines. The content of the file can |
| 532 | be transfered using one of two methods: the @dfn{inline method} over | 532 | be transferred using one of two methods: the @dfn{inline method} over |
| 533 | the same connection used to log in to the remote machine, or the | 533 | the same connection used to log in to the remote machine, or the |
| 534 | @dfn{external method} through another connection using a remote copy | 534 | @dfn{external method} through another connection using a remote copy |
| 535 | program such as @command{rcp}, @command{scp} or @command{rsync}. | 535 | program such as @command{rcp}, @command{scp} or @command{rsync}. |
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt index 6117e72be2a..03a797bb709 100644 --- a/etc/srecode/el.srt +++ b/etc/srecode/el.srt | |||
| @@ -109,7 +109,7 @@ $<MODEFCN:declaration:function$ | |||
| 109 | '($MODESYM$-mode-font-lock-keywords | 109 | '($MODESYM$-mode-font-lock-keywords |
| 110 | nil ;; perform string/comment fontification | 110 | nil ;; perform string/comment fontification |
| 111 | nil ;; keywords are case sensitive. | 111 | nil ;; keywords are case sensitive. |
| 112 | ;; This puts _ & - as a word constituant, | 112 | ;; This puts _ & - as a word constituent, |
| 113 | ;; simplifying our keywords significantly | 113 | ;; simplifying our keywords significantly |
| 114 | ((?_ . "w") (?- . "w")))) | 114 | ((?_ . "w") (?- . "w")))) |
| 115 | (run-hooks '$MODESYM$-mode-hook) | 115 | (run-hooks '$MODESYM$-mode-hook) |
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 922a96ad194..40404828e0f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -3137,7 +3137,7 @@ | |||
| 3137 | (main): Call put_entries here even in CTAGS mode. | 3137 | (main): Call put_entries here even in CTAGS mode. |
| 3138 | (main, process_file): Check the return values of fclose and pclose. | 3138 | (main, process_file): Check the return values of fclose and pclose. |
| 3139 | (process_file): Do not call put_entries after parsing each file. | 3139 | (process_file): Do not call put_entries after parsing each file. |
| 3140 | (process_file): Canonicalise file names even for ctags. | 3140 | (process_file): Canonicalize file names even for ctags. |
| 3141 | (process_file): Set curfile here... | 3141 | (process_file): Set curfile here... |
| 3142 | (find_entries): ... not here any more. | 3142 | (find_entries): ... not here any more. |
| 3143 | (add_node): In etags mode, build a linked list of entries (on | 3143 | (add_node): In etags mode, build a linked list of entries (on |
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 0b96f4a36eb..558718a5a5f 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 | |||
| @@ -7261,7 +7261,7 @@ | |||
| 7261 | * progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable. | 7261 | * progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable. |
| 7262 | (gdb-breakpoint-regexp, gdb-mouse-toggle-breakpoint-margin) | 7262 | (gdb-breakpoint-regexp, gdb-mouse-toggle-breakpoint-margin) |
| 7263 | (gdb-mouse-toggle-breakpoint-fringe, gdb-delete-breakpoint) | 7263 | (gdb-mouse-toggle-breakpoint-fringe, gdb-delete-breakpoint) |
| 7264 | (gdb-goto-breakpoint): Generalise for breakpoints with multiple | 7264 | (gdb-goto-breakpoint): Generalize for breakpoints with multiple |
| 7265 | locations. | 7265 | locations. |
| 7266 | (gdb-info-breakpoints-custom, gdb-assembler-custom) | 7266 | (gdb-info-breakpoints-custom, gdb-assembler-custom) |
| 7267 | (gdb-toggle-breakpoint): Update for new gdb-breakpoint-regexp. | 7267 | (gdb-toggle-breakpoint): Update for new gdb-breakpoint-regexp. |
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index ab1eb3591cd..6e13c1156ce 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 | |||
| @@ -8618,7 +8618,7 @@ | |||
| 8618 | (menu-bar-showhide-tool-bar-menu-customize-enable-right) | 8618 | (menu-bar-showhide-tool-bar-menu-customize-enable-right) |
| 8619 | (menu-bar-showhide-tool-bar-menu-customize-enable-bottom) | 8619 | (menu-bar-showhide-tool-bar-menu-customize-enable-bottom) |
| 8620 | (menu-bar-showhide-tool-bar-menu-customize-enable-top): New functions | 8620 | (menu-bar-showhide-tool-bar-menu-customize-enable-top): New functions |
| 8621 | (menu-bar-showhide-tool-bar-menu): If tool bar is moveable, | 8621 | (menu-bar-showhide-tool-bar-menu): If tool bar is movable, |
| 8622 | make a menu for Options => toolbar that can move it. | 8622 | make a menu for Options => toolbar that can move it. |
| 8623 | 8623 | ||
| 8624 | 2010-07-29 Chong Yidong <cyd@stupidchicken.com> | 8624 | 2010-07-29 Chong Yidong <cyd@stupidchicken.com> |
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index b97bcea89cc..e0f9bc9ade2 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 | |||
| @@ -8647,7 +8647,7 @@ | |||
| 8647 | * comint.el, inf-lisp.el, shell.el: Updated to meet Olin's | 8647 | * comint.el, inf-lisp.el, shell.el: Updated to meet Olin's |
| 8648 | version 2.0 comint offerings. | 8648 | version 2.0 comint offerings. |
| 8649 | * ring.el: The underlying history mechanism for comint. | 8649 | * ring.el: The underlying history mechanism for comint. |
| 8650 | Generalised handling of a ring data type based on vectors. | 8650 | Generalized handling of a ring data type based on vectors. |
| 8651 | * history.el: For now, a symlink to ring.el. | 8651 | * history.el: For now, a symlink to ring.el. |
| 8652 | * loaddefs.el: Updated shell-prompt-pattern doc string. | 8652 | * loaddefs.el: Updated shell-prompt-pattern doc string. |
| 8653 | 8653 | ||
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 37387121777..b05707abe5c 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 | |||
| @@ -13088,7 +13088,7 @@ | |||
| 13088 | 13088 | ||
| 13089 | 1997-07-25 Simon Marshall <simon@frobnitz.gnu.ai.mit.edu> | 13089 | 1997-07-25 Simon Marshall <simon@frobnitz.gnu.ai.mit.edu> |
| 13090 | 13090 | ||
| 13091 | * complete.el: Customise; as subgroup of minibuffer. | 13091 | * complete.el: Customize; as subgroup of minibuffer. |
| 13092 | (partial-completion-mode): New option to toggle mode. | 13092 | (partial-completion-mode): New option to toggle mode. |
| 13093 | (partial-completion-mode): New command to toggle mode. | 13093 | (partial-completion-mode): New command to toggle mode. |
| 13094 | Add and remove hooks here, i.e., not at the top-level. | 13094 | Add and remove hooks here, i.e., not at the top-level. |
| @@ -13617,7 +13617,7 @@ | |||
| 13617 | 13617 | ||
| 13618 | 1997-07-15 Simon Marshall <simon@albert.gnu.ai.mit.edu> | 13618 | 1997-07-15 Simon Marshall <simon@albert.gnu.ai.mit.edu> |
| 13619 | 13619 | ||
| 13620 | * mouse-sel.el: Customise; create mouse-sel as subgroup of mouse. | 13620 | * mouse-sel.el: Customize; create mouse-sel as subgroup of mouse. |
| 13621 | (mouse-sel-mode): New option to toggle mode. | 13621 | (mouse-sel-mode): New option to toggle mode. |
| 13622 | (mouse-sel-mode): New command to toggle mode. | 13622 | (mouse-sel-mode): New command to toggle mode. |
| 13623 | (mouse-sel-set-selection-function): If mouse-sel-default-bindings is | 13623 | (mouse-sel-set-selection-function): If mouse-sel-default-bindings is |
| @@ -13625,7 +13625,7 @@ | |||
| 13625 | (mouse-sel-bindings): New function to install/restore mouse bindings. | 13625 | (mouse-sel-bindings): New function to install/restore mouse bindings. |
| 13626 | This is called by mouse-sel-mode, i.e., not at the top-level. | 13626 | This is called by mouse-sel-mode, i.e., not at the top-level. |
| 13627 | 13627 | ||
| 13628 | * delsel.el: Customise; as part of editing-basics group. | 13628 | * delsel.el: Customize; as part of editing-basics group. |
| 13629 | (delete-selection-mode): Convert to autoloaded option. Default to nil. | 13629 | (delete-selection-mode): Convert to autoloaded option. Default to nil. |
| 13630 | (delete-selection-mode): Define before option. | 13630 | (delete-selection-mode): Define before option. |
| 13631 | Modify pre-command-hook here, i.e., not at the top-level. | 13631 | Modify pre-command-hook here, i.e., not at the top-level. |
| @@ -14943,7 +14943,7 @@ | |||
| 14943 | paren-matching) and put all blink-matching-paren variables in the | 14943 | paren-matching) and put all blink-matching-paren variables in the |
| 14944 | former (as opposed to the latter) group. | 14944 | former (as opposed to the latter) group. |
| 14945 | 14945 | ||
| 14946 | * paren.el: Customise; paren-showing as a subgroup of paren-matching. | 14946 | * paren.el: Customize; paren-showing as a subgroup of paren-matching. |
| 14947 | (show-paren-style): New variable. | 14947 | (show-paren-style): New variable. |
| 14948 | (show-paren-match-face) | 14948 | (show-paren-match-face) |
| 14949 | (show-paren-mismatch-face): New faces. | 14949 | (show-paren-mismatch-face): New faces. |
| @@ -18871,7 +18871,7 @@ | |||
| 18871 | 18871 | ||
| 18872 | 1997-04-16 Simon Marshall <simon@wombat.gnu.ai.mit.edu> | 18872 | 1997-04-16 Simon Marshall <simon@wombat.gnu.ai.mit.edu> |
| 18873 | 18873 | ||
| 18874 | * font-lock.el: Customise. | 18874 | * font-lock.el: Customize. |
| 18875 | (font-lock-defaults-alist): Leave ~ syntax alone in C++. | 18875 | (font-lock-defaults-alist): Leave ~ syntax alone in C++. |
| 18876 | (font-lock-match-c++-style-declaration-item-and-skip-to-next): Match ~ | 18876 | (font-lock-match-c++-style-declaration-item-and-skip-to-next): Match ~ |
| 18877 | characters here. | 18877 | characters here. |
| @@ -18883,10 +18883,10 @@ | |||
| 18883 | (font-lock-compile-keywords): Don't set font-lock-keywords. | 18883 | (font-lock-compile-keywords): Don't set font-lock-keywords. |
| 18884 | (font-lock-fontify-keywords-region): Set it here. | 18884 | (font-lock-fontify-keywords-region): Set it here. |
| 18885 | 18885 | ||
| 18886 | * fast-lock.el: Customise. | 18886 | * fast-lock.el: Customize. |
| 18887 | (fast-lock-cache-data): Simplify calls of font-lock-compile-keywords. | 18887 | (fast-lock-cache-data): Simplify calls of font-lock-compile-keywords. |
| 18888 | 18888 | ||
| 18889 | * lazy-lock.el: Customise. | 18889 | * lazy-lock.el: Customize. |
| 18890 | (lazy-lock-fontify-conservatively): Fontify around WINDOW's point. | 18890 | (lazy-lock-fontify-conservatively): Fontify around WINDOW's point. |
| 18891 | 18891 | ||
| 18892 | * shell.el (shell-font-lock-keywords): Use EVAL form for prompt. | 18892 | * shell.el (shell-font-lock-keywords): Use EVAL form for prompt. |
diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el index 97d955eb07d..e21a095c821 100644 --- a/lisp/calc/calc-poly.el +++ b/lisp/calc/calc-poly.el | |||
| @@ -147,7 +147,7 @@ | |||
| 147 | 147 | ||
| 148 | ;;; Return only quotient to top of stack (nil if zero) | 148 | ;;; Return only quotient to top of stack (nil if zero) |
| 149 | 149 | ||
| 150 | ;; calc-poly-div-remainder is a local variable for | 150 | ;; calc-poly-div-remainder is a local variable for |
| 151 | ;; calc-poly-div (in calc-alg.el), but is used by | 151 | ;; calc-poly-div (in calc-alg.el), but is used by |
| 152 | ;; calcFunc-pdiv, which is called by calc-poly-div. | 152 | ;; calcFunc-pdiv, which is called by calc-poly-div. |
| 153 | (defvar calc-poly-div-remainder) | 153 | (defvar calc-poly-div-remainder) |
| @@ -512,7 +512,7 @@ | |||
| 512 | ;;; Given an expression find all variables that are polynomial bases. | 512 | ;;; Given an expression find all variables that are polynomial bases. |
| 513 | ;;; Return list in the form '( (var1 degree1) (var2 degree2) ... ). | 513 | ;;; Return list in the form '( (var1 degree1) (var2 degree2) ... ). |
| 514 | 514 | ||
| 515 | ;; The variable math-poly-base-total-base is local to | 515 | ;; The variable math-poly-base-total-base is local to |
| 516 | ;; math-total-polynomial-base, but is used by math-polynomial-p1, | 516 | ;; math-total-polynomial-base, but is used by math-polynomial-p1, |
| 517 | ;; which is called by math-total-polynomial-base. | 517 | ;; which is called by math-total-polynomial-base. |
| 518 | (defvar math-poly-base-total-base) | 518 | (defvar math-poly-base-total-base) |
| @@ -539,19 +539,19 @@ | |||
| 539 | nil) | 539 | nil) |
| 540 | 540 | ||
| 541 | ;; The variable math-factored-vars is local to calcFunc-factors and | 541 | ;; The variable math-factored-vars is local to calcFunc-factors and |
| 542 | ;; calcFunc-factor, but is used by math-factor-expr and | 542 | ;; calcFunc-factor, but is used by math-factor-expr and |
| 543 | ;; math-factor-expr-part, which are called (directly and indirectly) by | 543 | ;; math-factor-expr-part, which are called (directly and indirectly) by |
| 544 | ;; calcFunc-factor and calcFunc-factors. | 544 | ;; calcFunc-factor and calcFunc-factors. |
| 545 | (defvar math-factored-vars) | 545 | (defvar math-factored-vars) |
| 546 | 546 | ||
| 547 | ;; The variable math-fact-expr is local to calcFunc-factors, | 547 | ;; The variable math-fact-expr is local to calcFunc-factors, |
| 548 | ;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try | 548 | ;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try |
| 549 | ;; and math-factor-expr-part, which are called (directly and indirectly) by | 549 | ;; and math-factor-expr-part, which are called (directly and indirectly) by |
| 550 | ;; calcFunc-factor, calcFunc-factors and math-factor-expr. | 550 | ;; calcFunc-factor, calcFunc-factors and math-factor-expr. |
| 551 | (defvar math-fact-expr) | 551 | (defvar math-fact-expr) |
| 552 | 552 | ||
| 553 | ;; The variable math-to-list is local to calcFunc-factors and | 553 | ;; The variable math-to-list is local to calcFunc-factors and |
| 554 | ;; calcFunc-factor, but is used by math-accum-factors, which is | 554 | ;; calcFunc-factor, but is used by math-accum-factors, which is |
| 555 | ;; called (indirectly) by calcFunc-factors and calcFunc-factor. | 555 | ;; called (indirectly) by calcFunc-factors and calcFunc-factor. |
| 556 | (defvar math-to-list) | 556 | (defvar math-to-list) |
| 557 | 557 | ||
| @@ -729,7 +729,7 @@ | |||
| 729 | '(1))) | 729 | '(1))) |
| 730 | 730 | ||
| 731 | ;; We now have a square-free polynomial with integer coefs. | 731 | ;; We now have a square-free polynomial with integer coefs. |
| 732 | ;; For now, we use a kludgey method that finds linear and | 732 | ;; For now, we use a kludgy method that finds linear and |
| 733 | ;; quadratic terms using floating-point root-finding. | 733 | ;; quadratic terms using floating-point root-finding. |
| 734 | (if (setq t1 (let ((calc-symbolic-mode nil)) | 734 | (if (setq t1 (let ((calc-symbolic-mode nil)) |
| 735 | (math-poly-all-roots nil p t))) | 735 | (math-poly-all-roots nil p t))) |
| @@ -749,7 +749,7 @@ | |||
| 749 | (math-add | 749 | (math-add |
| 750 | (math-add | 750 | (math-add |
| 751 | (math-mul den (math-pow math-fet-x 2)) | 751 | (math-mul den (math-pow math-fet-x 2)) |
| 752 | (math-mul (math-mul coef1 den) | 752 | (math-mul (math-mul coef1 den) |
| 753 | math-fet-x)) | 753 | math-fet-x)) |
| 754 | (math-mul coef0 den))) | 754 | (math-mul coef0 den))) |
| 755 | (let ((den (math-lcm-denoms coef0))) | 755 | (let ((den (math-lcm-denoms coef0))) |
| @@ -1077,7 +1077,7 @@ If no partial fraction representation can be found, return nil." | |||
| 1077 | ((and (eq (car-safe expr) '^) | 1077 | ((and (eq (car-safe expr) '^) |
| 1078 | (memq (car-safe (nth 1 expr)) '(+ -)) | 1078 | (memq (car-safe (nth 1 expr)) '(+ -)) |
| 1079 | (integerp (nth 2 expr)) | 1079 | (integerp (nth 2 expr)) |
| 1080 | (if (and | 1080 | (if (and |
| 1081 | (or (math-known-matrixp (nth 1 (nth 1 expr))) | 1081 | (or (math-known-matrixp (nth 1 (nth 1 expr))) |
| 1082 | (math-known-matrixp (nth 2 (nth 1 expr))) | 1082 | (math-known-matrixp (nth 2 (nth 1 expr))) |
| 1083 | (and | 1083 | (and |
| @@ -1090,11 +1090,11 @@ If no partial fraction representation can be found, return nil." | |||
| 1090 | (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr)) | 1090 | (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr)) |
| 1091 | (list '* (nth 2 (nth 1 expr)) (nth 1 expr)) | 1091 | (list '* (nth 2 (nth 1 expr)) (nth 1 expr)) |
| 1092 | nil (eq (car (nth 1 expr)) '-)) | 1092 | nil (eq (car (nth 1 expr)) '-)) |
| 1093 | (math-add-or-sub (list '* (nth 1 (nth 1 expr)) | 1093 | (math-add-or-sub (list '* (nth 1 (nth 1 expr)) |
| 1094 | (list '^ (nth 1 expr) | 1094 | (list '^ (nth 1 expr) |
| 1095 | (1- (nth 2 expr)))) | 1095 | (1- (nth 2 expr)))) |
| 1096 | (list '* (nth 2 (nth 1 expr)) | 1096 | (list '* (nth 2 (nth 1 expr)) |
| 1097 | (list '^ (nth 1 expr) | 1097 | (list '^ (nth 1 expr) |
| 1098 | (1- (nth 2 expr)))) | 1098 | (1- (nth 2 expr)))) |
| 1099 | nil (eq (car (nth 1 expr)) '-))) | 1099 | nil (eq (car (nth 1 expr)) '-))) |
| 1100 | (if (> (nth 2 expr) 0) | 1100 | (if (> (nth 2 expr) 0) |
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el index 98f744dca6e..1a2061d01e7 100644 --- a/lisp/cedet/semantic/bovine/el.el +++ b/lisp/cedet/semantic/bovine/el.el | |||
| @@ -497,15 +497,15 @@ used to perform the override." | |||
| 497 | Unfortunately, this requires that the tag in question has been loaded | 497 | Unfortunately, this requires that the tag in question has been loaded |
| 498 | into Emacs Lisp's memory." | 498 | into Emacs Lisp's memory." |
| 499 | (let ((obsoletethis (intern-soft (semantic-tag-name tag))) | 499 | (let ((obsoletethis (intern-soft (semantic-tag-name tag))) |
| 500 | (obsoletor nil)) | 500 | (obsoleter nil)) |
| 501 | ;; This asks if our tag is available in the Emacs name space for querying. | 501 | ;; This asks if our tag is available in the Emacs name space for querying. |
| 502 | (when obsoletethis | 502 | (when obsoletethis |
| 503 | (mapatoms (lambda (a) | 503 | (mapatoms (lambda (a) |
| 504 | (let ((oi (get a 'byte-obsolete-info))) | 504 | (let ((oi (get a 'byte-obsolete-info))) |
| 505 | (if (and oi (eq (car oi) obsoletethis)) | 505 | (if (and oi (eq (car oi) obsoletethis)) |
| 506 | (setq obsoletor a))))) | 506 | (setq obsoleter a))))) |
| 507 | (if obsoletor | 507 | (if obsoleter |
| 508 | (format "\n@obsolete{%s,%s}" obsoletor (semantic-tag-name tag)) | 508 | (format "\n@obsolete{%s,%s}" obsoleter (semantic-tag-name tag)) |
| 509 | "")))) | 509 | "")))) |
| 510 | 510 | ||
| 511 | (define-mode-local-override semantic-documentation-for-tag | 511 | (define-mode-local-override semantic-documentation-for-tag |
diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el index b4d94321bc1..a6d86691206 100644 --- a/lisp/cedet/semantic/find.el +++ b/lisp/cedet/semantic/find.el | |||
| @@ -427,7 +427,7 @@ TABLE is a tag table. See `semantic-something-to-tag-table'." | |||
| 427 | 427 | ||
| 428 | ;;; Old Style Brute Force Search Routines | 428 | ;;; Old Style Brute Force Search Routines |
| 429 | ;; | 429 | ;; |
| 430 | ;; These functions will search through tags lists explicity for | 430 | ;; These functions will search through tags lists explicitly for |
| 431 | ;; desired information. | 431 | ;; desired information. |
| 432 | 432 | ||
| 433 | ;; The -by-name nonterminal search can use the built in fcn | 433 | ;; The -by-name nonterminal search can use the built in fcn |
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index 98b1ab55c32..1a79adc650d 100644 --- a/lisp/cedet/semantic/grammar.el +++ b/lisp/cedet/semantic/grammar.el | |||
| @@ -1290,7 +1290,7 @@ the change bounds to encompass the whole nonterminal tag." | |||
| 1290 | semantic-grammar-mode-keywords-3) | 1290 | semantic-grammar-mode-keywords-3) |
| 1291 | nil ;; perform string/comment fontification | 1291 | nil ;; perform string/comment fontification |
| 1292 | nil ;; keywords are case sensitive. | 1292 | nil ;; keywords are case sensitive. |
| 1293 | ;; This puts _ & - as a word constituant, | 1293 | ;; This puts _ & - as a word constituent, |
| 1294 | ;; simplifying our keywords significantly | 1294 | ;; simplifying our keywords significantly |
| 1295 | ((?_ . "w") (?- . "w")))) | 1295 | ((?_ . "w") (?- . "w")))) |
| 1296 | ;; Setup Semantic to parse grammar | 1296 | ;; Setup Semantic to parse grammar |
diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el index f92ae88c14e..884342a1df2 100644 --- a/lisp/cedet/semantic/wisent/comp.el +++ b/lisp/cedet/semantic/wisent/comp.el | |||
| @@ -2640,7 +2640,7 @@ there are any reduce/reduce conflicts.") | |||
| 2640 | 2640 | ||
| 2641 | (defun wisent-print-results () | 2641 | (defun wisent-print-results () |
| 2642 | "Print information on generated parser. | 2642 | "Print information on generated parser. |
| 2643 | Report detailed informations if `wisent-verbose-flag' or | 2643 | Report detailed information if `wisent-verbose-flag' or |
| 2644 | `wisent-debug-flag' are non-nil." | 2644 | `wisent-debug-flag' are non-nil." |
| 2645 | (when (or wisent-verbose-flag wisent-debug-flag) | 2645 | (when (or wisent-verbose-flag wisent-debug-flag) |
| 2646 | (wisent-print-useless)) | 2646 | (wisent-print-useless)) |
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index 0a99b7869e8..ed2b0e2cfdb 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el | |||
| @@ -194,7 +194,7 @@ we can tell font lock about them.") | |||
| 194 | '(srecode-font-lock-keywords | 194 | '(srecode-font-lock-keywords |
| 195 | nil ;; perform string/comment fontification | 195 | nil ;; perform string/comment fontification |
| 196 | nil ;; keywords are case sensitive. | 196 | nil ;; keywords are case sensitive. |
| 197 | ;; This puts _ & - as a word constituant, | 197 | ;; This puts _ & - as a word constituent, |
| 198 | ;; simplifying our keywords significantly | 198 | ;; simplifying our keywords significantly |
| 199 | ((?_ . "w") (?- . "w"))))) | 199 | ((?_ . "w") (?- . "w"))))) |
| 200 | 200 | ||
diff --git a/lisp/comint.el b/lisp/comint.el index c0b02e5a230..77734b69af6 100644 --- a/lisp/comint.el +++ b/lisp/comint.el | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | ;; It is pretty easy to make new derived modes for other processes. | 45 | ;; It is pretty easy to make new derived modes for other processes. |
| 46 | 46 | ||
| 47 | ;; For documentation on the functionality provided by Comint mode, and | 47 | ;; For documentation on the functionality provided by Comint mode, and |
| 48 | ;; the hooks available for customising it, see the comments below. | 48 | ;; the hooks available for customizing it, see the comments below. |
| 49 | ;; For further information on the standard derived modes (shell, | 49 | ;; For further information on the standard derived modes (shell, |
| 50 | ;; inferior-lisp, inferior-scheme, ...), see the relevant source files. | 50 | ;; inferior-lisp, inferior-scheme, ...), see the relevant source files. |
| 51 | 51 | ||
diff --git a/lisp/delim-col.el b/lisp/delim-col.el index 96a0745dd31..a0a8af80389 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el | |||
| @@ -97,7 +97,7 @@ | |||
| 97 | ;; operates over the text rectangle selected which rectangle diagonal is | 97 | ;; operates over the text rectangle selected which rectangle diagonal is |
| 98 | ;; given by the region start and end. | 98 | ;; given by the region start and end. |
| 99 | ;; | 99 | ;; |
| 100 | ;; See `delimit-columns-format' variable documentation for column formating. | 100 | ;; See `delimit-columns-format' variable documentation for column formatting. |
| 101 | ;; | 101 | ;; |
| 102 | ;; `delimit-columns-region' is useful when you have columns of text that | 102 | ;; `delimit-columns-region' is useful when you have columns of text that |
| 103 | ;; are not well aligned, like: | 103 | ;; are not well aligned, like: |
| @@ -171,7 +171,7 @@ For examples below, consider: | |||
| 171 | 171 | ||
| 172 | Valid values are: | 172 | Valid values are: |
| 173 | 173 | ||
| 174 | nil no formating. That is, `delimit-columns-after' is followed by | 174 | nil no formatting. That is, `delimit-columns-after' is followed by |
| 175 | `delimit-columns-separator'. | 175 | `delimit-columns-separator'. |
| 176 | For example, the result is: \"<ccc>:<dddd>:\" | 176 | For example, the result is: \"<ccc>:<dddd>:\" |
| 177 | 177 | ||
| @@ -190,9 +190,9 @@ Valid values are: | |||
| 190 | For example, the result is: \"<ccc >:<dddd >:\" | 190 | For example, the result is: \"<ccc >:<dddd >:\" |
| 191 | 191 | ||
| 192 | Any other value is treated as t." | 192 | Any other value is treated as t." |
| 193 | :type '(choice :menu-tag "Column Formating" | 193 | :type '(choice :menu-tag "Column Formatting" |
| 194 | :tag "Column Formating" | 194 | :tag "Column Formatting" |
| 195 | (const :tag "No Formating" nil) | 195 | (const :tag "No Formatting" nil) |
| 196 | (const :tag "Column Alignment" t) | 196 | (const :tag "Column Alignment" t) |
| 197 | (const :tag "Separator Alignment" separator) | 197 | (const :tag "Separator Alignment" separator) |
| 198 | (const :tag "Column Padding" padding)) | 198 | (const :tag "Column Padding" padding)) |
| @@ -404,7 +404,7 @@ START and END delimits the corners of text rectangle." | |||
| 404 | (re-search-forward delimit-columns-separator | 404 | (re-search-forward delimit-columns-separator |
| 405 | delimit-columns-limit 'move)) | 405 | delimit-columns-limit 'move)) |
| 406 | (setq ncol (1+ ncol))) | 406 | (setq ncol (1+ ncol))) |
| 407 | ;; insert first formating | 407 | ;; insert first formatting |
| 408 | (insert delimit-columns-str-before delimit-columns-before) | 408 | (insert delimit-columns-str-before delimit-columns-before) |
| 409 | ;; Adjust all columns but last one | 409 | ;; Adjust all columns but last one |
| 410 | (while (progn | 410 | (while (progn |
| @@ -436,7 +436,7 @@ START and END delimits the corners of text rectangle." | |||
| 436 | (setq spaces (and delimit-columns-format | 436 | (setq spaces (and delimit-columns-format |
| 437 | (make-string (aref delimit-columns-max ncol) | 437 | (make-string (aref delimit-columns-max ncol) |
| 438 | ?\s))))) | 438 | ?\s))))) |
| 439 | ;; insert last formating | 439 | ;; insert last formatting |
| 440 | (cond ((null delimit-columns-format) | 440 | (cond ((null delimit-columns-format) |
| 441 | (insert delimit-columns-after delimit-columns-str-after)) | 441 | (insert delimit-columns-after delimit-columns-str-after)) |
| 442 | ((eq delimit-columns-format 'padding) | 442 | ((eq delimit-columns-format 'padding) |
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index a68c4dfdf69..b17fa6b1471 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el | |||
| @@ -368,7 +368,7 @@ interpreted as a register number." | |||
| 368 | 368 | ||
| 369 | (defcustom cua-check-pending-input t | 369 | (defcustom cua-check-pending-input t |
| 370 | "If non-nil, don't override prefix key if input pending. | 370 | "If non-nil, don't override prefix key if input pending. |
| 371 | It is rumoured that `input-pending-p' is unreliable under some window | 371 | It is rumored that `input-pending-p' is unreliable under some window |
| 372 | managers, so try setting this to nil, if prefix override doesn't work." | 372 | managers, so try setting this to nil, if prefix override doesn't work." |
| 373 | :type 'boolean | 373 | :type 'boolean |
| 374 | :group 'cua) | 374 | :group 'cua) |
diff --git a/lisp/epa-dired.el b/lisp/epa-dired.el index 0834a8df23a..d51045a5e37 100644 --- a/lisp/epa-dired.el +++ b/lisp/epa-dired.el | |||
| @@ -67,7 +67,7 @@ If no one is selected, default secret key is used. " | |||
| 67 | (while file-list | 67 | (while file-list |
| 68 | (epa-encrypt-file | 68 | (epa-encrypt-file |
| 69 | (expand-file-name (car file-list)) | 69 | (expand-file-name (car file-list)) |
| 70 | (epa-select-keys (epg-make-context) "Select recipents for encryption. | 70 | (epa-select-keys (epg-make-context) "Select recipients for encryption. |
| 71 | If no one is selected, symmetric encryption will be performed. ")) | 71 | If no one is selected, symmetric encryption will be performed. ")) |
| 72 | (setq file-list (cdr file-list))) | 72 | (setq file-list (cdr file-list))) |
| 73 | (revert-buffer))) | 73 | (revert-buffer))) |
diff --git a/lisp/epa-file.el b/lisp/epa-file.el index bef67ba4f69..4d05563719d 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el | |||
| @@ -235,7 +235,7 @@ encryption is used." | |||
| 235 | (current-buffer))))) | 235 | (current-buffer))))) |
| 236 | (epa-select-keys | 236 | (epa-select-keys |
| 237 | context | 237 | context |
| 238 | "Select recipents for encryption. | 238 | "Select recipients for encryption. |
| 239 | If no one is selected, symmetric encryption will be performed. " | 239 | If no one is selected, symmetric encryption will be performed. " |
| 240 | recipients) | 240 | recipients) |
| 241 | (if epa-file-encrypt-to | 241 | (if epa-file-encrypt-to |
| @@ -273,7 +273,7 @@ If no one is selected, symmetric encryption will be performed. " | |||
| 273 | (epg-sub-key-id (car (epg-key-sub-key-list key)))) | 273 | (epg-sub-key-id (car (epg-key-sub-key-list key)))) |
| 274 | (epa-select-keys | 274 | (epa-select-keys |
| 275 | (epg-make-context) | 275 | (epg-make-context) |
| 276 | "Select recipents for encryption. | 276 | "Select recipients for encryption. |
| 277 | If no one is selected, symmetric encryption will be performed. ")))) | 277 | If no one is selected, symmetric encryption will be performed. ")))) |
| 278 | 278 | ||
| 279 | ;;;###autoload | 279 | ;;;###autoload |
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03 index 135d8f788f8..3e687202d38 100644 --- a/lisp/erc/ChangeLog.03 +++ b/lisp/erc/ChangeLog.03 | |||
| @@ -416,7 +416,7 @@ | |||
| 416 | * erc-button.el: New variable erc-button-wrap-long-urls. | 416 | * erc-button.el: New variable erc-button-wrap-long-urls. |
| 417 | Modified erc-button-add-buttons: | 417 | Modified erc-button-add-buttons: |
| 418 | New optional argument REGEXP. | 418 | New optional argument REGEXP. |
| 419 | If we're buttonising a URL and erc-button-wrap-long-urls is | 419 | If we're buttonizing a URL and erc-button-wrap-long-urls is |
| 420 | non-nil, try and wrap them | 420 | non-nil, try and wrap them |
| 421 | 421 | ||
| 422 | Modified erc-button-add-buttons-1: | 422 | Modified erc-button-add-buttons-1: |
| @@ -822,7 +822,7 @@ | |||
| 822 | (define-erc-module): the enable and disable routines now update erc-modules | 822 | (define-erc-module): the enable and disable routines now update erc-modules |
| 823 | accordingly | 823 | accordingly |
| 824 | erc-modules: new variable controlling the modules which erc has loaded/will | 824 | erc-modules: new variable controlling the modules which erc has loaded/will |
| 825 | load. when customising, it will automatically enable modules. it won't | 825 | load. when customizing, it will automatically enable modules. it won't |
| 826 | automatically disable modules which are removed, yet. | 826 | automatically disable modules which are removed, yet. |
| 827 | (erc-update-modules): enable all modules in `erc-modules' | 827 | (erc-update-modules): enable all modules in `erc-modules' |
| 828 | 828 | ||
| @@ -1058,7 +1058,7 @@ | |||
| 1058 | * erc.el(erc-process-input-line): | 1058 | * erc.el(erc-process-input-line): |
| 1059 | when displaying the help for a function, if no | 1059 | when displaying the help for a function, if no |
| 1060 | documentation exists, don't fall over | 1060 | documentation exists, don't fall over |
| 1061 | (erc-cmd-SAY): new function for quoting lines begining with / | 1061 | (erc-cmd-SAY): new function for quoting lines beginning with / |
| 1062 | (erc-server-NICK): | 1062 | (erc-server-NICK): |
| 1063 | - fix a bug where the "is now known as" message doesn't appear on newly | 1063 | - fix a bug where the "is now known as" message doesn't appear on newly |
| 1064 | created /query buffers | 1064 | created /query buffers |
| @@ -1491,7 +1491,7 @@ | |||
| 1491 | * erc.el: | 1491 | * erc.el: |
| 1492 | * removed duplicate do-no-parse-args properties for the defaliased defuns | 1492 | * removed duplicate do-no-parse-args properties for the defaliased defuns |
| 1493 | (erc-process-input-line): show function signature when incorrect args | 1493 | (erc-process-input-line): show function signature when incorrect args |
| 1494 | (erc-extract-command-from-line): canonicalise defaliases before extracting | 1494 | (erc-extract-command-from-line): canonicalize defaliases before extracting |
| 1495 | plist | 1495 | plist |
| 1496 | (erc-cmd-CLEAR): fixed | 1496 | (erc-cmd-CLEAR): fixed |
| 1497 | (erc-cmd-UNIGNORE): fixed again | 1497 | (erc-cmd-UNIGNORE): fixed again |
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index 1aa2c34c395..cab84951143 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el | |||
| @@ -160,7 +160,7 @@ it's far more automatic. `pushd' allows the user to decide which | |||
| 160 | directories gets pushed, and its size is unlimited. | 160 | directories gets pushed, and its size is unlimited. |
| 161 | 161 | ||
| 162 | `eshell-last-dir-ring' is meant for users who don't use `pushd' | 162 | `eshell-last-dir-ring' is meant for users who don't use `pushd' |
| 163 | explicity very much, but every once in a while would like to return to | 163 | explicitly very much, but every once in a while would like to return to |
| 164 | a previously visited directory without having to type in the whole | 164 | a previously visited directory without having to type in the whole |
| 165 | thing again." | 165 | thing again." |
| 166 | :type 'integer | 166 | :type 'integer |
diff --git a/lisp/forms.el b/lisp/forms.el index 215f3ce88f7..0d92dc3ffd9 100644 --- a/lisp/forms.el +++ b/lisp/forms.el | |||
| @@ -709,7 +709,7 @@ Commands: Equivalent keys in read-only mode: | |||
| 709 | (forms-first-record)) | 709 | (forms-first-record)) |
| 710 | ) | 710 | ) |
| 711 | 711 | ||
| 712 | ;; user customising | 712 | ;; user customizing |
| 713 | ;;(message "forms: proceeding setup (user hooks)...") | 713 | ;;(message "forms: proceeding setup (user hooks)...") |
| 714 | (run-mode-hooks 'forms-mode-hook 'forms-mode-hooks) | 714 | (run-mode-hooks 'forms-mode-hook 'forms-mode-hooks) |
| 715 | ;;(message "forms: setting up... done.") | 715 | ;;(message "forms: setting up... done.") |
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 72f99e65184..00b5417fa37 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -3595,7 +3595,7 @@ | |||
| 3595 | (autoload): Silence byte-compiler. | 3595 | (autoload): Silence byte-compiler. |
| 3596 | (nnir-open-server): Add a hook for nnir groups. | 3596 | (nnir-open-server): Add a hook for nnir groups. |
| 3597 | (nnir-request-move-article): Don't mangle the header. Better to use | 3597 | (nnir-request-move-article): Don't mangle the header. Better to use |
| 3598 | formating variables (which will be added in the future). | 3598 | formatting variables (which will be added in the future). |
| 3599 | (nnir-registry-action): Update the registry using the original article | 3599 | (nnir-registry-action): Update the registry using the original article |
| 3600 | group name. | 3600 | group name. |
| 3601 | (nnir-mode): Install nnir-specific hooks for updating the registry. | 3601 | (nnir-mode): Install nnir-specific hooks for updating the registry. |
| @@ -21851,7 +21851,7 @@ | |||
| 21851 | 21851 | ||
| 21852 | 2004-01-06 Steve Youngs <sryoungs@bigpond.net.au> | 21852 | 2004-01-06 Steve Youngs <sryoungs@bigpond.net.au> |
| 21853 | 21853 | ||
| 21854 | * gnus-ems.el (gnus-mode-line-modified): Don't conditionalise on | 21854 | * gnus-ems.el (gnus-mode-line-modified): Don't conditionalize on |
| 21855 | XEmacs version. | 21855 | XEmacs version. |
| 21856 | 21856 | ||
| 21857 | * dns.el (dns-make-network-process): Use `open-network-stream' | 21857 | * dns.el (dns-make-network-process): Use `open-network-stream' |
diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el index 340c7255958..50208cc5b0b 100644 --- a/lisp/gnus/plstore.el +++ b/lisp/gnus/plstore.el | |||
| @@ -420,7 +420,7 @@ SECRET-KEYS is a plist containing secret data." | |||
| 420 | (current-buffer))))) | 420 | (current-buffer))))) |
| 421 | (epa-select-keys | 421 | (epa-select-keys |
| 422 | context | 422 | context |
| 423 | "Select recipents for encryption. | 423 | "Select recipients for encryption. |
| 424 | If no one is selected, symmetric encryption will be performed. " | 424 | If no one is selected, symmetric encryption will be performed. " |
| 425 | recipients) | 425 | recipients) |
| 426 | (if plstore-encrypt-to | 426 | (if plstore-encrypt-to |
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index 6c8db872c0b..a0fae8d8671 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | ;;; Commentary: | 26 | ;;; Commentary: |
| 27 | 27 | ||
| 28 | ;; These functions should be automatically loaded when called, but you | 28 | ;; These functions should be automatically loaded when called, but you |
| 29 | ;; can explicity (require 'ibuf-ext) in your ~/.emacs to have them | 29 | ;; can explicitly (require 'ibuf-ext) in your ~/.emacs to have them |
| 30 | ;; preloaded. | 30 | ;; preloaded. |
| 31 | 31 | ||
| 32 | ;;; Code: | 32 | ;;; Code: |
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el index ef09cdda2de..f0a5ebbee40 100644 --- a/lisp/international/mule-util.el +++ b/lisp/international/mule-util.el | |||
| @@ -314,7 +314,7 @@ Optional 5th argument NIL-FOR-TOO-LONG non-nil means return nil | |||
| 314 | (defmacro with-coding-priority (coding-systems &rest body) | 314 | (defmacro with-coding-priority (coding-systems &rest body) |
| 315 | "Execute BODY like `progn' with CODING-SYSTEMS at the front of priority list. | 315 | "Execute BODY like `progn' with CODING-SYSTEMS at the front of priority list. |
| 316 | CODING-SYSTEMS is a list of coding systems. See `set-coding-system-priority'. | 316 | CODING-SYSTEMS is a list of coding systems. See `set-coding-system-priority'. |
| 317 | This affects the implicit sorting of lists of coding sysems returned by | 317 | This affects the implicit sorting of lists of coding systems returned by |
| 318 | operations such as `find-coding-systems-region'." | 318 | operations such as `find-coding-systems-region'." |
| 319 | (let ((current (make-symbol "current"))) | 319 | (let ((current (make-symbol "current"))) |
| 320 | `(let ((,current (coding-system-priority-list))) | 320 | `(let ((,current (coding-system-priority-list))) |
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index 576f443c8e2..5b7601c6335 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el | |||
| @@ -437,7 +437,7 @@ and send the mail again%s." | |||
| 437 | (car bug)) | 437 | (car bug)) |
| 438 | items)) | 438 | items)) |
| 439 | (nreverse items)))) | 439 | (nreverse items)))) |
| 440 | (widget-insert "No bugs maching your keywords found.\n")) | 440 | (widget-insert "No bugs matching your keywords found.\n")) |
| 441 | (widget-insert "\n") | 441 | (widget-insert "\n") |
| 442 | (widget-create 'push-button | 442 | (widget-create 'push-button |
| 443 | :notify (lambda (&rest ignore) | 443 | :notify (lambda (&rest ignore) |
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index a0d2281bfe8..06d200c4e3e 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el | |||
| @@ -2854,7 +2854,7 @@ NO-ERROR, if a listing for DIRECTORY cannot be obtained." | |||
| 2854 | ;; that a wasted listing is not done: | 2854 | ;; that a wasted listing is not done: |
| 2855 | ;; 1. When looking for a .dired file in dired-x.el. | 2855 | ;; 1. When looking for a .dired file in dired-x.el. |
| 2856 | ;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid | 2856 | ;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid |
| 2857 | ;; subdirectory. This is of course an OS dependent judgement. | 2857 | ;; subdirectory. This is of course an OS dependent judgment. |
| 2858 | 2858 | ||
| 2859 | (defvar dired-local-variables-file) | 2859 | (defvar dired-local-variables-file) |
| 2860 | (defmacro ange-ftp-allow-child-lookup (dir file) | 2860 | (defmacro ange-ftp-allow-child-lookup (dir file) |
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 8a8d9e6332f..9254fef8a7f 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el | |||
| @@ -101,7 +101,7 @@ Otherwise, return result of last form in BODY, or all other errors." | |||
| 101 | (defvar dbus-event-error-hooks nil | 101 | (defvar dbus-event-error-hooks nil |
| 102 | "Functions to be called when a D-Bus error happens in the event handler. | 102 | "Functions to be called when a D-Bus error happens in the event handler. |
| 103 | Every function must accept two arguments, the event and the error variable | 103 | Every function must accept two arguments, the event and the error variable |
| 104 | catched in `condition-case' by `dbus-error'.") | 104 | caught in `condition-case' by `dbus-error'.") |
| 105 | 105 | ||
| 106 | 106 | ||
| 107 | ;;; Hash table of registered functions. | 107 | ;;; Hash table of registered functions. |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index ee4c8966626..da6f8a69e6d 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | 44 | ||
| 45 | (defcustom tramp-inline-compress-start-size 4096 | 45 | (defcustom tramp-inline-compress-start-size 4096 |
| 46 | "*The minimum size of compressing where inline transfer. | 46 | "*The minimum size of compressing where inline transfer. |
| 47 | When inline transfer, compress transfered data of file | 47 | When inline transfer, compress transferred data of file |
| 48 | whose size is this value or above (up to `tramp-copy-size-limit'). | 48 | whose size is this value or above (up to `tramp-copy-size-limit'). |
| 49 | If it is nil, no compression at all will be applied." | 49 | If it is nil, no compression at all will be applied." |
| 50 | :group 'tramp | 50 | :group 'tramp |
| @@ -3726,7 +3726,7 @@ process to set up. VEC specifies the connection." | |||
| 3726 | ;; Check whether the output of "uname -sr" has been changed. If | 3726 | ;; Check whether the output of "uname -sr" has been changed. If |
| 3727 | ;; yes, this is a strong indication that we must expire all | 3727 | ;; yes, this is a strong indication that we must expire all |
| 3728 | ;; connection properties. We start again with | 3728 | ;; connection properties. We start again with |
| 3729 | ;; `tramp-maybe-open-connection', it will be catched there. | 3729 | ;; `tramp-maybe-open-connection', it will be caught there. |
| 3730 | (tramp-message vec 5 "Checking system information") | 3730 | (tramp-message vec 5 "Checking system information") |
| 3731 | (let ((old-uname (tramp-get-connection-property vec "uname" nil)) | 3731 | (let ((old-uname (tramp-get-connection-property vec "uname" nil)) |
| 3732 | (new-uname | 3732 | (new-uname |
| @@ -4215,7 +4215,7 @@ connection if a previous connection has died for some reason." | |||
| 4215 | (tramp-send-command vec "echo are you awake" t t) | 4215 | (tramp-send-command vec "echo are you awake" t t) |
| 4216 | (unless (and (memq (process-status p) '(run open)) | 4216 | (unless (and (memq (process-status p) '(run open)) |
| 4217 | (tramp-wait-for-output p 10)) | 4217 | (tramp-wait-for-output p 10)) |
| 4218 | ;; The error will be catched locally. | 4218 | ;; The error will be caught locally. |
| 4219 | (tramp-error vec 'file-error "Awake did fail"))) | 4219 | (tramp-error vec 'file-error "Awake did fail"))) |
| 4220 | (file-error | 4220 | (file-error |
| 4221 | (tramp-flush-connection-property vec) | 4221 | (tramp-flush-connection-property vec) |
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el index 279ea54e4cc..17b22aa03ba 100644 --- a/lisp/net/xesam.el +++ b/lisp/net/xesam.el | |||
| @@ -172,7 +172,7 @@ | |||
| 172 | 172 | ||
| 173 | (defface xesam-highlight '((t :inherit match)) | 173 | (defface xesam-highlight '((t :inherit match)) |
| 174 | "Face to highlight query entries. | 174 | "Face to highlight query entries. |
| 175 | It will be overlayed by `widget-documentation-face', so it shall | 175 | It will be overlaid by `widget-documentation-face', so it shall |
| 176 | be different at least in one face property not set in that face." | 176 | be different at least in one face property not set in that face." |
| 177 | :group 'xesam) | 177 | :group 'xesam) |
| 178 | 178 | ||
diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el index c33794f668d..0c0580b55dc 100644 --- a/lisp/obsolete/old-whitespace.el +++ b/lisp/obsolete/old-whitespace.el | |||
| @@ -515,12 +515,12 @@ See `whitespace-buffer' docstring for a summary of the problems." | |||
| 515 | (whitespace-check-whitespace-mode current-prefix-arg) | 515 | (whitespace-check-whitespace-mode current-prefix-arg) |
| 516 | (if (and buffer-file-name whitespace-mode) | 516 | (if (and buffer-file-name whitespace-mode) |
| 517 | (let ((whitespace-any nil) | 517 | (let ((whitespace-any nil) |
| 518 | (whitespace-tabwith 8) | 518 | (whitespace-tabwidth 8) |
| 519 | (whitespace-tabwith-saved tab-width)) | 519 | (whitespace-tabwidth-saved tab-width)) |
| 520 | 520 | ||
| 521 | ;; since all printable TABS should be 8, irrespective of how | 521 | ;; since all printable TABS should be 8, irrespective of how |
| 522 | ;; they are displayed. | 522 | ;; they are displayed. |
| 523 | (setq tab-width whitespace-tabwith) | 523 | (setq tab-width whitespace-tabwidth) |
| 524 | 524 | ||
| 525 | (if (and whitespace-check-buffer-leading | 525 | (if (and whitespace-check-buffer-leading |
| 526 | (whitespace-buffer-leading)) | 526 | (whitespace-buffer-leading)) |
| @@ -562,7 +562,7 @@ See `whitespace-buffer' docstring for a summary of the problems." | |||
| 562 | (message "The region is now clean") | 562 | (message "The region is now clean") |
| 563 | (message "%s is now clean" buffer-file-name))) | 563 | (message "%s is now clean" buffer-file-name))) |
| 564 | (whitespace-update-modeline))) | 564 | (whitespace-update-modeline))) |
| 565 | (setq tab-width whitespace-tabwith-saved)))) | 565 | (setq tab-width whitespace-tabwidth-saved)))) |
| 566 | 566 | ||
| 567 | ;;;###autoload | 567 | ;;;###autoload |
| 568 | (defun whitespace-cleanup-region (s e) | 568 | (defun whitespace-cleanup-region (s e) |
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 555709f1fa8..6f835c7bfa4 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog | |||
| @@ -7124,7 +7124,7 @@ | |||
| 7124 | 2010-11-11 Dan Davison <davison@stats.ox.ac.uk> | 7124 | 2010-11-11 Dan Davison <davison@stats.ox.ac.uk> |
| 7125 | 7125 | ||
| 7126 | * ob.el (org-babel-get-src-block-info): Form info list correctly | 7126 | * ob.el (org-babel-get-src-block-info): Form info list correctly |
| 7127 | when parenthesised arguments are missing. | 7127 | when parenthesized arguments are missing. |
| 7128 | 7128 | ||
| 7129 | 2010-11-11 Dan Davison <davison@stats.ox.ac.uk> | 7129 | 2010-11-11 Dan Davison <davison@stats.ox.ac.uk> |
| 7130 | 7130 | ||
diff --git a/lisp/org/org.el b/lisp/org/org.el index afd4ea6b4c3..8aca74e69cc 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -2580,7 +2580,7 @@ To turn this on on a per-file basis, insert anywhere in the file: | |||
| 2580 | (defcustom org-time-stamp-custom-formats | 2580 | (defcustom org-time-stamp-custom-formats |
| 2581 | '("<%m/%d/%y %a>" . "<%m/%d/%y %a %H:%M>") ; american | 2581 | '("<%m/%d/%y %a>" . "<%m/%d/%y %a %H:%M>") ; american |
| 2582 | "Custom formats for time stamps. See `format-time-string' for the syntax. | 2582 | "Custom formats for time stamps. See `format-time-string' for the syntax. |
| 2583 | These are overlayed over the default ISO format if the variable | 2583 | These are overlaid over the default ISO format if the variable |
| 2584 | `org-display-custom-times' is set. Time like %H:%M should be at the | 2584 | `org-display-custom-times' is set. Time like %H:%M should be at the |
| 2585 | end of the second format. The custom formats are also honored by export | 2585 | end of the second format. The custom formats are also honored by export |
| 2586 | commands, if custom time display is turned on at the time of export." | 2586 | commands, if custom time display is turned on at the time of export." |
| @@ -15109,7 +15109,7 @@ The command returns the inserted time stamp." | |||
| 15109 | (org-restart-font-lock) | 15109 | (org-restart-font-lock) |
| 15110 | (setq org-table-may-need-update t) | 15110 | (setq org-table-may-need-update t) |
| 15111 | (if org-display-custom-times | 15111 | (if org-display-custom-times |
| 15112 | (message "Time stamps are overlayed with custom format") | 15112 | (message "Time stamps are overlaid with custom format") |
| 15113 | (message "Time stamp overlays removed"))) | 15113 | (message "Time stamp overlays removed"))) |
| 15114 | 15114 | ||
| 15115 | (defun org-display-custom-time (beg end) | 15115 | (defun org-display-custom-time (beg end) |
| @@ -18961,7 +18961,7 @@ contexts are: | |||
| 18961 | :target on a <<target>> | 18961 | :target on a <<target>> |
| 18962 | :radio-target on a <<<radio-target>>> | 18962 | :radio-target on a <<<radio-target>>> |
| 18963 | :latex-fragment on a LaTeX fragment | 18963 | :latex-fragment on a LaTeX fragment |
| 18964 | :latex-preview on a LaTeX fragment with overlayed preview image | 18964 | :latex-preview on a LaTeX fragment with overlaid preview image |
| 18965 | 18965 | ||
| 18966 | This function expects the position to be visible because it uses font-lock | 18966 | This function expects the position to be visible because it uses font-lock |
| 18967 | faces as a help to recognize the following contexts: :table-special, :link, | 18967 | faces as a help to recognize the following contexts: :table-special, :link, |
diff --git a/lisp/proced.el b/lisp/proced.el index e4987bd926c..baee7c0f6ee 100644 --- a/lisp/proced.el +++ b/lisp/proced.el | |||
| @@ -1332,7 +1332,7 @@ Prefix ARG controls sort order, see `proced-sort-interactive'." | |||
| 1332 | (proced-sort-interactive key arg) | 1332 | (proced-sort-interactive key arg) |
| 1333 | (message "No sorter defined here.")))))) | 1333 | (message "No sorter defined here.")))))) |
| 1334 | 1334 | ||
| 1335 | ;;; Formating | 1335 | ;;; Formatting |
| 1336 | 1336 | ||
| 1337 | (defun proced-format-time (time) | 1337 | (defun proced-format-time (time) |
| 1338 | "Format time interval TIME." | 1338 | "Format time interval TIME." |
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 64734420a8c..17ff4bd32a6 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el | |||
| @@ -499,7 +499,7 @@ Used to define `ada-*-keywords.'")) | |||
| 499 | 499 | ||
| 500 | (defvar ada-case-exception-substring '() | 500 | (defvar ada-case-exception-substring '() |
| 501 | "Alist of substrings (entities) that have special casing. | 501 | "Alist of substrings (entities) that have special casing. |
| 502 | The substrings are detected for word constituant when the word | 502 | The substrings are detected for word constituent when the word |
| 503 | is not itself in `ada-case-exception', and only for substrings that | 503 | is not itself in `ada-case-exception', and only for substrings that |
| 504 | either are at the beginning or end of the word, or start after '_'.") | 504 | either are at the beginning or end of the word, or start after '_'.") |
| 505 | 505 | ||
| @@ -1773,7 +1773,7 @@ ATTENTION: This function might take very long for big buffers!" | |||
| 1773 | ;; `ada-insert-paramlist'. | 1773 | ;; `ada-insert-paramlist'. |
| 1774 | ;; Both steps are called from `ada-format-paramlist'. | 1774 | ;; Both steps are called from `ada-format-paramlist'. |
| 1775 | ;; Note: Comments inside the parameter list are lost. | 1775 | ;; Note: Comments inside the parameter list are lost. |
| 1776 | ;; The syntax has to be correct, or the reformating will fail. | 1776 | ;; The syntax has to be correct, or the reformatting will fail. |
| 1777 | ;;-------------------------------------------------------------- | 1777 | ;;-------------------------------------------------------------- |
| 1778 | 1778 | ||
| 1779 | (defun ada-format-paramlist () | 1779 | (defun ada-format-paramlist () |
| @@ -2139,7 +2139,7 @@ command like: | |||
| 2139 | 2139 | ||
| 2140 | (while command-line-args-left | 2140 | (while command-line-args-left |
| 2141 | (let ((source (car command-line-args-left))) | 2141 | (let ((source (car command-line-args-left))) |
| 2142 | (message "Formating %s" source) | 2142 | (message "Formatting %s" source) |
| 2143 | (find-file source) | 2143 | (find-file source) |
| 2144 | (ada-indent-region (point-min) (point-max)) | 2144 | (ada-indent-region (point-min) (point-max)) |
| 2145 | (ada-adjust-case-buffer) | 2145 | (ada-adjust-case-buffer) |
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 2f6a7be393a..f30457992a3 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | ;;; for lookup and completion in Ada mode. | 30 | ;;; for lookup and completion in Ada mode. |
| 31 | ;;; | 31 | ;;; |
| 32 | ;;; If a file *.`adp' exists in the ada-file directory, then it is | 32 | ;;; If a file *.`adp' exists in the ada-file directory, then it is |
| 33 | ;;; read for configuration informations. It is read only the first | 33 | ;;; read for configuration information. It is read only the first |
| 34 | ;;; time a cross-reference is asked for, and is not read later. | 34 | ;;; time a cross-reference is asked for, and is not read later. |
| 35 | 35 | ||
| 36 | ;;; You need Emacs >= 20.2 to run this package | 36 | ;;; You need Emacs >= 20.2 to run this package |
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 8213a83461b..f44b34ac351 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el | |||
| @@ -545,7 +545,7 @@ | |||
| 545 | (defun c-awk-vsemi-status-unknown-p () | 545 | (defun c-awk-vsemi-status-unknown-p () |
| 546 | ;; Are we unsure whether there is a virtual semicolon on the current line? | 546 | ;; Are we unsure whether there is a virtual semicolon on the current line? |
| 547 | ;; DO NOT under any circumstances attempt to calculate this; that would | 547 | ;; DO NOT under any circumstances attempt to calculate this; that would |
| 548 | ;; defeat the (admittedly kludgey) purpose of this function, which is to | 548 | ;; defeat the (admittedly kludgy) purpose of this function, which is to |
| 549 | ;; prevent an infinite recursion in c-beginning-of-statement-1 when point | 549 | ;; prevent an infinite recursion in c-beginning-of-statement-1 when point |
| 550 | ;; starts at a `while' token. | 550 | ;; starts at a `while' token. |
| 551 | (not (c-get-char-property (c-point 'eol) 'c-awk-NL-prop))) | 551 | (not (c-get-char-property (c-point 'eol) 'c-awk-NL-prop))) |
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 4981bbfd2bc..686695bc838 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el | |||
| @@ -1360,7 +1360,7 @@ No indentation or other \"electric\" behavior is performed." | |||
| 1360 | ;; Determine where we are with respect to functions (or other brace | 1360 | ;; Determine where we are with respect to functions (or other brace |
| 1361 | ;; constructs, included in the term "function" in the rest of this comment). | 1361 | ;; constructs, included in the term "function" in the rest of this comment). |
| 1362 | ;; Point is assumed to be outside any macro or literal. | 1362 | ;; Point is assumed to be outside any macro or literal. |
| 1363 | ;; This is used by c-\(begining\|end\)-of-defun. | 1363 | ;; This is used by c-\(beginning\|end\)-of-defun. |
| 1364 | ;; | 1364 | ;; |
| 1365 | ;; Return one of these symbols: | 1365 | ;; Return one of these symbols: |
| 1366 | ;; at-header : we're at the start of a function's header. | 1366 | ;; at-header : we're at the start of a function's header. |
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index cd483d20f2f..28e7ffae40e 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el | |||
| @@ -2113,7 +2113,7 @@ comment at the start of cc-engine.el for more info." | |||
| 2113 | ;; buffer). Otherwise, return nil. | 2113 | ;; buffer). Otherwise, return nil. |
| 2114 | ;; | 2114 | ;; |
| 2115 | ;; This function is almost the same as `c-literal-limits'. It differs in | 2115 | ;; This function is almost the same as `c-literal-limits'. It differs in |
| 2116 | ;; that it is a lower level function, and that it rigourously follows the | 2116 | ;; that it is a lower level function, and that it rigorously follows the |
| 2117 | ;; syntax from BOB, whereas `c-literal-limits' uses a "local" safe position. | 2117 | ;; syntax from BOB, whereas `c-literal-limits' uses a "local" safe position. |
| 2118 | ;; | 2118 | ;; |
| 2119 | ;; NOTE: This function manipulates `c-state-nonlit-pos-cache'. This cache | 2119 | ;; NOTE: This function manipulates `c-state-nonlit-pos-cache'. This cache |
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index ac4d1bf9e57..c18789de07b 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el | |||
| @@ -1211,7 +1211,7 @@ casts and declarations are fontified. Used on level 2 and higher." | |||
| 1211 | ;; o - '<> if the arglist is of angle bracket type; | 1211 | ;; o - '<> if the arglist is of angle bracket type; |
| 1212 | ;; o - 'arglist if it's some other arglist; | 1212 | ;; o - 'arglist if it's some other arglist; |
| 1213 | ;; o - nil, if not in an arglist at all. This includes the | 1213 | ;; o - nil, if not in an arglist at all. This includes the |
| 1214 | ;; parenthesised condition which follows "if", "while", etc. | 1214 | ;; parenthesized condition which follows "if", "while", etc. |
| 1215 | context | 1215 | context |
| 1216 | ;; The position of the next token after the closing paren of | 1216 | ;; The position of the next token after the closing paren of |
| 1217 | ;; the last detected cast. | 1217 | ;; the last detected cast. |
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 37818638d41..0bfca84cd96 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el | |||
| @@ -522,7 +522,7 @@ don't have EOL terminated statements. " | |||
| 522 | 522 | ||
| 523 | (c-lang-defconst c-vsemi-status-unknown-p-fn | 523 | (c-lang-defconst c-vsemi-status-unknown-p-fn |
| 524 | "Contains a function \"are we unsure whether there is a virtual semicolon on this line?\". | 524 | "Contains a function \"are we unsure whether there is a virtual semicolon on this line?\". |
| 525 | The (admittedly kludgey) purpose of such a function is to prevent an infinite | 525 | The (admittedly kludgy) purpose of such a function is to prevent an infinite |
| 526 | recursion in c-beginning-of-statement-1 when point starts at a `while' token. | 526 | recursion in c-beginning-of-statement-1 when point starts at a `while' token. |
| 527 | The function MUST NOT UNDER ANY CIRCUMSTANCES call c-beginning-of-statement-1, | 527 | The function MUST NOT UNDER ANY CIRCUMSTANCES call c-beginning-of-statement-1, |
| 528 | even indirectly. This variable contains nil for languages which don't have | 528 | even indirectly. This variable contains nil for languages which don't have |
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index cc5a5236255..6a40378935c 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el | |||
| @@ -943,7 +943,7 @@ Note that the style variables are always made local to the buffer." | |||
| 943 | ;; Note that this function must be FAST rather than accurate. Note | 943 | ;; Note that this function must be FAST rather than accurate. Note |
| 944 | ;; also that it only has any effect when font locking is enabled. | 944 | ;; also that it only has any effect when font locking is enabled. |
| 945 | ;; We exploit this by checking for font-lock-*-face instead of doing | 945 | ;; We exploit this by checking for font-lock-*-face instead of doing |
| 946 | ;; rigourous syntactic analysis. | 946 | ;; rigorous syntactic analysis. |
| 947 | 947 | ||
| 948 | ;; If either change boundary is wholly inside an identifier, delete | 948 | ;; If either change boundary is wholly inside an identifier, delete |
| 949 | ;; it/them from the cache. Don't worry about being inside a string | 949 | ;; it/them from the cache. Don't worry about being inside a string |
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 75d71d2d8a9..b379ce67fd7 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el | |||
| @@ -108,7 +108,7 @@ To change the default value, use Customize or call the function | |||
| 108 | 108 | ||
| 109 | Setting it causes the grep commands to put point at the end of their | 109 | Setting it causes the grep commands to put point at the end of their |
| 110 | output window so that the end of the output is always visible rather | 110 | output window so that the end of the output is always visible rather |
| 111 | than the begining." | 111 | than the beginning." |
| 112 | :type 'boolean | 112 | :type 'boolean |
| 113 | :version "22.1" | 113 | :version "22.1" |
| 114 | :group 'grep) | 114 | :group 'grep) |
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 406db76487d..de8da09768d 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el | |||
| @@ -1919,7 +1919,7 @@ extension EXTN. Normally EXTN is given as the regular expression | |||
| 1919 | ;; in petticoat junction. | 1919 | ;; in petticoat junction. |
| 1920 | (defun gud-jdb-skip-block () | 1920 | (defun gud-jdb-skip-block () |
| 1921 | 1921 | ||
| 1922 | ;; Find the begining of the block. | 1922 | ;; Find the beginning of the block. |
| 1923 | (while | 1923 | (while |
| 1924 | (not (eq (following-char) ?{)) | 1924 | (not (eq (following-char) ?{)) |
| 1925 | 1925 | ||
| @@ -1936,7 +1936,7 @@ extension EXTN. Normally EXTN is given as the regular expression | |||
| 1936 | (gud-jdb-skip-character-literal)) | 1936 | (gud-jdb-skip-character-literal)) |
| 1937 | (t (forward-char)))) | 1937 | (t (forward-char)))) |
| 1938 | 1938 | ||
| 1939 | ;; Now at the begining of the block. | 1939 | ;; Now at the beginning of the block. |
| 1940 | (forward-char) | 1940 | (forward-char) |
| 1941 | 1941 | ||
| 1942 | ;; Skip over the body of the block as well as the final brace. | 1942 | ;; Skip over the body of the block as well as the final brace. |
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 374a45acec6..82961376669 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el | |||
| @@ -822,7 +822,7 @@ Point is left unchanged." | |||
| 822 | 822 | ||
| 823 | (defun hif-possibly-hide () | 823 | (defun hif-possibly-hide () |
| 824 | "Called at #ifX expression, this hides those parts that should be hidden. | 824 | "Called at #ifX expression, this hides those parts that should be hidden. |
| 825 | It uses the judgement of `hide-ifdef-evaluator'." | 825 | It uses the judgment of `hide-ifdef-evaluator'." |
| 826 | ;; (message "hif-possibly-hide") (sit-for 1) | 826 | ;; (message "hif-possibly-hide") (sit-for 1) |
| 827 | (let ((test (hif-canonicalize)) | 827 | (let ((test (hif-canonicalize)) |
| 828 | (range (hif-find-range))) | 828 | (range (hif-find-range))) |
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index 1328e303d45..dd24aeea9a3 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | ;; This makes these modes easier to use. | 36 | ;; This makes these modes easier to use. |
| 37 | 37 | ||
| 38 | ;; For documentation on the functionality provided by comint mode, and | 38 | ;; For documentation on the functionality provided by comint mode, and |
| 39 | ;; the hooks available for customising it, see the file comint.el. | 39 | ;; the hooks available for customizing it, see the file comint.el. |
| 40 | ;; For further information on inferior-lisp mode, see the comments below. | 40 | ;; For further information on inferior-lisp mode, see the comments below. |
| 41 | 41 | ||
| 42 | ;; Needs fixin: | 42 | ;; Needs fixin: |
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index a81cc107ce3..deac85581d2 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el | |||
| @@ -10812,7 +10812,7 @@ but not if inside a comment or quote." | |||
| 10812 | 10812 | ||
| 10813 | (defvar vhdl-port-list nil | 10813 | (defvar vhdl-port-list nil |
| 10814 | "Variable to hold last port map parsed.") | 10814 | "Variable to hold last port map parsed.") |
| 10815 | ;; structure: (parenthesised expression means list of such entries) | 10815 | ;; structure: (parenthesized expression means list of such entries) |
| 10816 | ;; (ent-name | 10816 | ;; (ent-name |
| 10817 | ;; ((generic-names) generic-type generic-init generic-comment group-comment) | 10817 | ;; ((generic-names) generic-type generic-init generic-comment group-comment) |
| 10818 | ;; ((port-names) port-object port-direct port-type port-comment group-comment) | 10818 | ;; ((port-names) port-object port-direct port-type port-comment group-comment) |
| @@ -11660,7 +11660,7 @@ reflected in a subsequent paste operation." | |||
| 11660 | 11660 | ||
| 11661 | (defvar vhdl-subprog-list nil | 11661 | (defvar vhdl-subprog-list nil |
| 11662 | "Variable to hold last subprogram interface parsed.") | 11662 | "Variable to hold last subprogram interface parsed.") |
| 11663 | ;; structure: (parenthesised expression means list of such entries) | 11663 | ;; structure: (parenthesized expression means list of such entries) |
| 11664 | ;; (subprog-name kind | 11664 | ;; (subprog-name kind |
| 11665 | ;; ((names) object direct type init comment group-comment) | 11665 | ;; ((names) object direct type init comment group-comment) |
| 11666 | ;; return-type return-comment group-comment) | 11666 | ;; return-type return-comment group-comment) |
| @@ -12971,7 +12971,7 @@ This does background highlighting of translate-off regions.") | |||
| 12971 | (defvar vhdl-entity-alist nil | 12971 | (defvar vhdl-entity-alist nil |
| 12972 | "Cache with entities and corresponding architectures for each | 12972 | "Cache with entities and corresponding architectures for each |
| 12973 | project/directory.") | 12973 | project/directory.") |
| 12974 | ;; structure: (parenthesised expression means list of such entries) | 12974 | ;; structure: (parenthesized expression means list of such entries) |
| 12975 | ;; (cache-key | 12975 | ;; (cache-key |
| 12976 | ;; (ent-key ent-name ent-file ent-line | 12976 | ;; (ent-key ent-name ent-file ent-line |
| 12977 | ;; (arch-key arch-name arch-file arch-line | 12977 | ;; (arch-key arch-name arch-file arch-line |
| @@ -12982,7 +12982,7 @@ project/directory.") | |||
| 12982 | 12982 | ||
| 12983 | (defvar vhdl-config-alist nil | 12983 | (defvar vhdl-config-alist nil |
| 12984 | "Cache with configurations for each project/directory.") | 12984 | "Cache with configurations for each project/directory.") |
| 12985 | ;; structure: (parenthesised expression means list of such entries) | 12985 | ;; structure: (parenthesized expression means list of such entries) |
| 12986 | ;; (cache-key | 12986 | ;; (cache-key |
| 12987 | ;; (conf-key conf-name conf-file conf-line ent-key arch-key | 12987 | ;; (conf-key conf-name conf-file conf-line ent-key arch-key |
| 12988 | ;; (inst-key inst-comp-name inst-ent-key inst-arch-key | 12988 | ;; (inst-key inst-comp-name inst-ent-key inst-arch-key |
| @@ -12991,7 +12991,7 @@ project/directory.") | |||
| 12991 | 12991 | ||
| 12992 | (defvar vhdl-package-alist nil | 12992 | (defvar vhdl-package-alist nil |
| 12993 | "Cache with packages for each project/directory.") | 12993 | "Cache with packages for each project/directory.") |
| 12994 | ;; structure: (parenthesised expression means list of such entries) | 12994 | ;; structure: (parenthesized expression means list of such entries) |
| 12995 | ;; (cache-key | 12995 | ;; (cache-key |
| 12996 | ;; (pack-key pack-name pack-file pack-line | 12996 | ;; (pack-key pack-name pack-file pack-line |
| 12997 | ;; (comp-key comp-name comp-file comp-line) | 12997 | ;; (comp-key comp-name comp-file comp-line) |
| @@ -13003,19 +13003,19 @@ project/directory.") | |||
| 13003 | 13003 | ||
| 13004 | (defvar vhdl-ent-inst-alist nil | 13004 | (defvar vhdl-ent-inst-alist nil |
| 13005 | "Cache with instantiated entities for each project/directory.") | 13005 | "Cache with instantiated entities for each project/directory.") |
| 13006 | ;; structure: (parenthesised expression means list of such entries) | 13006 | ;; structure: (parenthesized expression means list of such entries) |
| 13007 | ;; (cache-key (inst-ent-key)) | 13007 | ;; (cache-key (inst-ent-key)) |
| 13008 | 13008 | ||
| 13009 | (defvar vhdl-file-alist nil | 13009 | (defvar vhdl-file-alist nil |
| 13010 | "Cache with design units in each file for each project/directory.") | 13010 | "Cache with design units in each file for each project/directory.") |
| 13011 | ;; structure: (parenthesised expression means list of such entries) | 13011 | ;; structure: (parenthesized expression means list of such entries) |
| 13012 | ;; (cache-key | 13012 | ;; (cache-key |
| 13013 | ;; (file-name (ent-list) (arch-list) (arch-ent-list) (conf-list) | 13013 | ;; (file-name (ent-list) (arch-list) (arch-ent-list) (conf-list) |
| 13014 | ;; (pack-list) (pack-body-list) (inst-list) (inst-ent-list)) | 13014 | ;; (pack-list) (pack-body-list) (inst-list) (inst-ent-list)) |
| 13015 | 13015 | ||
| 13016 | (defvar vhdl-directory-alist nil | 13016 | (defvar vhdl-directory-alist nil |
| 13017 | "Cache with source directories for each project.") | 13017 | "Cache with source directories for each project.") |
| 13018 | ;; structure: (parenthesised expression means list of such entries) | 13018 | ;; structure: (parenthesized expression means list of such entries) |
| 13019 | ;; (cache-key (directory)) | 13019 | ;; (cache-key (directory)) |
| 13020 | 13020 | ||
| 13021 | (defvar vhdl-speedbar-shown-unit-alist nil | 13021 | (defvar vhdl-speedbar-shown-unit-alist nil |
| @@ -13655,7 +13655,7 @@ of PROJECT." | |||
| 13655 | (vhdl-speedbar-update-current-unit) | 13655 | (vhdl-speedbar-update-current-unit) |
| 13656 | (when updated (message "Updating hierarchy...done"))))) | 13656 | (when updated (message "Updating hierarchy...done"))))) |
| 13657 | 13657 | ||
| 13658 | ;; structure (parenthesised expression means list of such entries) | 13658 | ;; structure (parenthesized expression means list of such entries) |
| 13659 | ;; (inst-key inst-file-marker comp-ent-key comp-ent-file-marker | 13659 | ;; (inst-key inst-file-marker comp-ent-key comp-ent-file-marker |
| 13660 | ;; comp-arch-key comp-arch-file-marker comp-conf-key comp-conf-file-marker | 13660 | ;; comp-arch-key comp-arch-file-marker comp-conf-key comp-conf-file-marker |
| 13661 | ;; comp-lib-name level) | 13661 | ;; comp-lib-name level) |
diff --git a/lisp/shell.el b/lisp/shell.el index 47119e6769c..fdfc8b3cf19 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | ;; This makes these modes easier to use. | 35 | ;; This makes these modes easier to use. |
| 36 | 36 | ||
| 37 | ;; For documentation on the functionality provided by comint mode, and | 37 | ;; For documentation on the functionality provided by comint mode, and |
| 38 | ;; the hooks available for customising it, see the file comint.el. | 38 | ;; the hooks available for customizing it, see the file comint.el. |
| 39 | ;; For further information on shell mode, see the comments below. | 39 | ;; For further information on shell mode, see the comments below. |
| 40 | 40 | ||
| 41 | ;; Needs fixin: | 41 | ;; Needs fixin: |
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index f8417791ce5..746a4dc77b5 100644 --- a/lisp/url/url-cookie.el +++ b/lisp/url/url-cookie.el | |||
| @@ -316,7 +316,7 @@ telling Microsoft that." | |||
| 316 | (set (if (> trusted untrusted) 'untrusted 'trusted) nil)) | 316 | (set (if (> trusted untrusted) 'untrusted 'trusted) nil)) |
| 317 | (cond | 317 | (cond |
| 318 | (untrusted | 318 | (untrusted |
| 319 | ;; The site was explicity marked as untrusted by the user. | 319 | ;; The site was explicitly marked as untrusted by the user. |
| 320 | nil) | 320 | nil) |
| 321 | ((or (eq url-privacy-level 'paranoid) | 321 | ((or (eq url-privacy-level 'paranoid) |
| 322 | (and (listp url-privacy-level) (memq 'cookies url-privacy-level))) | 322 | (and (listp url-privacy-level) (memq 'cookies url-privacy-level))) |
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index cfb98c6937e..19e0b621d87 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el | |||
| @@ -62,7 +62,6 @@ | |||
| 62 | (mapc 'make-variable-buffer-local | 62 | (mapc 'make-variable-buffer-local |
| 63 | '( | 63 | '( |
| 64 | url-current-object | 64 | url-current-object |
| 65 | url-current-referer | ||
| 66 | url-current-mime-headers | 65 | url-current-mime-headers |
| 67 | )) | 66 | )) |
| 68 | 67 | ||
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index e759183724e..53f7a016654 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 | |||
| @@ -15816,14 +15816,14 @@ | |||
| 15816 | Add prototypes. | 15816 | Add prototypes. |
| 15817 | 15817 | ||
| 15818 | * macterm.c (mac_draw_bitmap): Add overlay_p arg. | 15818 | * macterm.c (mac_draw_bitmap): Add overlay_p arg. |
| 15819 | (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps; | 15819 | (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps; |
| 15820 | thanks to YAMAMOTO Mitsuharu for advice on how to do this. | 15820 | thanks to YAMAMOTO Mitsuharu for advice on how to do this. |
| 15821 | Use cursor color for displaying cursor in fringe. | 15821 | Use cursor color for displaying cursor in fringe. |
| 15822 | (x_redisplay_interface): Add null handlers for | 15822 | (x_redisplay_interface): Add null handlers for |
| 15823 | define_fringe_bitmap and destroy_fringe_bitmap functions. | 15823 | define_fringe_bitmap and destroy_fringe_bitmap functions. |
| 15824 | 15824 | ||
| 15825 | * w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from | 15825 | * w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from |
| 15826 | xterm.c to handle overlayed fringe bitmaps and to use cursor color | 15826 | xterm.c to handle overlaid fringe bitmaps and to use cursor color |
| 15827 | for displaying cursor in fringe. | 15827 | for displaying cursor in fringe. |
| 15828 | (w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32 | 15828 | (w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32 |
| 15829 | specific functions to define and destroy fringe bitmaps in fringe_bmp. | 15829 | specific functions to define and destroy fringe bitmaps in fringe_bmp. |
| @@ -15849,7 +15849,7 @@ | |||
| 15849 | (display_line): Handle cursor in fringe at eob. | 15849 | (display_line): Handle cursor in fringe at eob. |
| 15850 | (display_line): Set row user fringe bitmaps from iterator. | 15850 | (display_line): Set row user fringe bitmaps from iterator. |
| 15851 | 15851 | ||
| 15852 | * xterm.c (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps. | 15852 | * xterm.c (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps. |
| 15853 | Use cursor color for displaying cursor in fringe. | 15853 | Use cursor color for displaying cursor in fringe. |
| 15854 | (x_redisplay_interface): Add null handlers for | 15854 | (x_redisplay_interface): Add null handlers for |
| 15855 | define_fringe_bitmap and destroy_fringe_bitmap functions. | 15855 | define_fringe_bitmap and destroy_fringe_bitmap functions. |
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index ba61c337efc..d3be0064610 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 | |||
| @@ -2254,7 +2254,7 @@ | |||
| 2254 | Initialize save_color. | 2254 | Initialize save_color. |
| 2255 | 2255 | ||
| 2256 | * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c: | 2256 | * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c: |
| 2257 | Delete/replace unused/conditionalised variables | 2257 | Delete/replace unused/conditionalized variables |
| 2258 | 2258 | ||
| 2259 | 1987-01-15 Richard M. Stallman (rms@prep) | 2259 | 1987-01-15 Richard M. Stallman (rms@prep) |
| 2260 | 2260 | ||
| @@ -2632,7 +2632,7 @@ | |||
| 2632 | * fns.c: Fding requires an arg; pass Qnil. | 2632 | * fns.c: Fding requires an arg; pass Qnil. |
| 2633 | 2633 | ||
| 2634 | * m-alliant.h: define TEXT_START as 0x1000. | 2634 | * m-alliant.h: define TEXT_START as 0x1000. |
| 2635 | Don't define LIBS_STANDARD; the default (sharable) library | 2635 | Don't define LIBS_STANDARD; the default (shareable) library |
| 2636 | is said to work now. | 2636 | is said to work now. |
| 2637 | 2637 | ||
| 2638 | * alloc.c (mark_object): Now pass address of slot being marked. | 2638 | * alloc.c (mark_object): Now pass address of slot being marked. |
| @@ -4220,7 +4220,7 @@ | |||
| 4220 | Increase PURESIZE again (sigh) | 4220 | Increase PURESIZE again (sigh) |
| 4221 | 4221 | ||
| 4222 | * unexec.c (write_segment): | 4222 | * unexec.c (write_segment): |
| 4223 | Kludgey coercions ("(int)") to get this line to compile: | 4223 | Kludgy coercions ("(int)") to get this line to compile: |
| 4224 | nwrite = (((int) ptr + 128) & ~127) - (int) ptr; | 4224 | nwrite = (((int) ptr + 128) & ~127) - (int) ptr; |
| 4225 | Also changed incorrect ~128 to ~127. | 4225 | Also changed incorrect ~128 to ~127. |
| 4226 | 4226 | ||
diff --git a/src/alloc.c b/src/alloc.c index 96d63f53cf9..6f70976c345 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -6399,7 +6399,7 @@ If this portion is smaller than `gc-cons-threshold', this is ignored. */); | |||
| 6399 | Vgc_cons_percentage = make_float (0.1); | 6399 | Vgc_cons_percentage = make_float (0.1); |
| 6400 | 6400 | ||
| 6401 | DEFVAR_INT ("pure-bytes-used", pure_bytes_used, | 6401 | DEFVAR_INT ("pure-bytes-used", pure_bytes_used, |
| 6402 | doc: /* Number of bytes of sharable Lisp data allocated so far. */); | 6402 | doc: /* Number of bytes of shareable Lisp data allocated so far. */); |
| 6403 | 6403 | ||
| 6404 | DEFVAR_INT ("cons-cells-consed", cons_cells_consed, | 6404 | DEFVAR_INT ("cons-cells-consed", cons_cells_consed, |
| 6405 | doc: /* Number of cons cells that have been consed so far. */); | 6405 | doc: /* Number of cons cells that have been consed so far. */); |
diff --git a/src/editfns.c b/src/editfns.c index 83cd4bd5535..7077f40e51c 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -3870,7 +3870,7 @@ usage: (format STRING &rest OBJECTS) */) | |||
| 3870 | enum | 3870 | enum |
| 3871 | { | 3871 | { |
| 3872 | /* Maximum precision for a %f conversion such that the | 3872 | /* Maximum precision for a %f conversion such that the |
| 3873 | trailing output digit might be nonzero. Any precisions | 3873 | trailing output digit might be nonzero. Any precision |
| 3874 | larger than this will not yield useful information. */ | 3874 | larger than this will not yield useful information. */ |
| 3875 | USEFUL_PRECISION_MAX = | 3875 | USEFUL_PRECISION_MAX = |
| 3876 | ((1 - DBL_MIN_EXP) | 3876 | ((1 - DBL_MIN_EXP) |
diff --git a/src/emacs.c b/src/emacs.c index 6bfc0dc60d0..12a48b26553 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -951,7 +951,7 @@ main (int argc, char **argv) | |||
| 951 | } | 951 | } |
| 952 | 952 | ||
| 953 | /* Command line option --no-windows is deprecated and thus not mentioned | 953 | /* Command line option --no-windows is deprecated and thus not mentioned |
| 954 | in the manual and usage informations. */ | 954 | in the manual and usage information. */ |
| 955 | if (argmatch (argv, argc, "-nw", "--no-window-system", 6, NULL, &skip_args) | 955 | if (argmatch (argv, argc, "-nw", "--no-window-system", 6, NULL, &skip_args) |
| 956 | || argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args)) | 956 | || argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args)) |
| 957 | inhibit_window_system = 1; | 957 | inhibit_window_system = 1; |
diff --git a/src/fontset.c b/src/fontset.c index 605d807aa3c..281ac92f82d 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -643,7 +643,7 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face, int id, int fa | |||
| 643 | if (font_has_char (f, font_object, c)) | 643 | if (font_has_char (f, font_object, c)) |
| 644 | goto found; | 644 | goto found; |
| 645 | 645 | ||
| 646 | /* Find a font already opened, maching with the current spec, | 646 | /* Find a font already opened, matching with the current spec, |
| 647 | and supporting C. */ | 647 | and supporting C. */ |
| 648 | font_def = RFONT_DEF_FONT_DEF (rfont_def); | 648 | font_def = RFONT_DEF_FONT_DEF (rfont_def); |
| 649 | for (; found_index + 1 < ASIZE (vec); found_index++) | 649 | for (; found_index + 1 < ASIZE (vec); found_index++) |
diff --git a/src/ftfont.c b/src/ftfont.c index bab97e44fab..dbb2ce2745e 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -960,7 +960,7 @@ ftfont_list (Lisp_Object frame, Lisp_Object spec) | |||
| 960 | /* Need fix because this finds any fonts. */ | 960 | /* Need fix because this finds any fonts. */ |
| 961 | if (fontset->nfont == 0 && ! NILP (family)) | 961 | if (fontset->nfont == 0 && ! NILP (family)) |
| 962 | { | 962 | { |
| 963 | /* Try maching with configuration. For instance, the | 963 | /* Try matching with configuration. For instance, the |
| 964 | configuration may specify "Nimbus Mono L" as an alias of | 964 | configuration may specify "Nimbus Mono L" as an alias of |
| 965 | "Courier". */ | 965 | "Courier". */ |
| 966 | FcPattern *pat = FcPatternBuild (0, FC_FAMILY, FcTypeString, | 966 | FcPattern *pat = FcPatternBuild (0, FC_FAMILY, FcTypeString, |
diff --git a/src/lastfile.c b/src/lastfile.c index d348e4ebb07..ab07e748930 100644 --- a/src/lastfile.c +++ b/src/lastfile.c | |||
| @@ -23,7 +23,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 23 | 23 | ||
| 24 | The files of Emacs are written so as to have no initialized | 24 | The files of Emacs are written so as to have no initialized |
| 25 | data that can ever need to be altered except at the first startup. | 25 | data that can ever need to be altered except at the first startup. |
| 26 | This is so that those words can be dumped as sharable text. | 26 | This is so that those words can be dumped as shareable text. |
| 27 | 27 | ||
| 28 | It is not possible to exercise such control over library files. | 28 | It is not possible to exercise such control over library files. |
| 29 | So it is necessary to refrain from making their data areas shared. | 29 | So it is necessary to refrain from making their data areas shared. |
| @@ -47,4 +47,3 @@ char my_endbss[1]; | |||
| 47 | of the bss area used by Emacs. */ | 47 | of the bss area used by Emacs. */ |
| 48 | static char _my_endbss[1]; | 48 | static char _my_endbss[1]; |
| 49 | char * my_endbss_static = _my_endbss; | 49 | char * my_endbss_static = _my_endbss; |
| 50 | |||
diff --git a/src/lread.c b/src/lread.c index 582d8f46638..7c0b0475786 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -2822,7 +2822,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) | |||
| 2822 | So we now use the same heuristic as for backquote: old-style | 2822 | So we now use the same heuristic as for backquote: old-style |
| 2823 | unquotes are only recognized when first on a list, and when | 2823 | unquotes are only recognized when first on a list, and when |
| 2824 | followed by a space. | 2824 | followed by a space. |
| 2825 | Because it's more difficult to peak 2 chars ahead, a new-style | 2825 | Because it's more difficult to peek 2 chars ahead, a new-style |
| 2826 | ,@ can still not be used outside of a `, unless it's in the middle | 2826 | ,@ can still not be used outside of a `, unless it's in the middle |
| 2827 | of a list. */ | 2827 | of a list. */ |
| 2828 | if (new_backquote_flag | 2828 | if (new_backquote_flag |
diff --git a/src/nsfont.m b/src/nsfont.m index 7d691ced6e1..6a053af344d 100644 --- a/src/nsfont.m +++ b/src/nsfont.m | |||
| @@ -630,7 +630,7 @@ nsfont_list (Lisp_Object frame, Lisp_Object font_spec) | |||
| 630 | } | 630 | } |
| 631 | 631 | ||
| 632 | 632 | ||
| 633 | /* Return a font entity most closely maching with FONT_SPEC on | 633 | /* Return a font entity most closely matching with FONT_SPEC on |
| 634 | FRAME. The closeness is determined by the font backend, thus | 634 | FRAME. The closeness is determined by the font backend, thus |
| 635 | `face-font-selection-order' is ignored here. | 635 | `face-font-selection-order' is ignored here. |
| 636 | Properties to be considered are same as for list(). */ | 636 | Properties to be considered are same as for list(). */ |
diff --git a/src/region-cache.c b/src/region-cache.c index ed7a07a6709..054374eb688 100644 --- a/src/region-cache.c +++ b/src/region-cache.c | |||
| @@ -699,7 +699,7 @@ know_region_cache (struct buffer *buf, struct region_cache *c, | |||
| 699 | 699 | ||
| 700 | /* Return true if the text immediately after POS in BUF is known, for | 700 | /* Return true if the text immediately after POS in BUF is known, for |
| 701 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest | 701 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest |
| 702 | position after POS where the knownness changes. */ | 702 | position after POS where the knowledge changes. */ |
| 703 | int | 703 | int |
| 704 | region_cache_forward (struct buffer *buf, struct region_cache *c, | 704 | region_cache_forward (struct buffer *buf, struct region_cache *c, |
| 705 | ptrdiff_t pos, ptrdiff_t *next) | 705 | ptrdiff_t pos, ptrdiff_t *next) |
| @@ -736,7 +736,7 @@ region_cache_forward (struct buffer *buf, struct region_cache *c, | |||
| 736 | 736 | ||
| 737 | /* Return true if the text immediately before POS in BUF is known, for | 737 | /* Return true if the text immediately before POS in BUF is known, for |
| 738 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest | 738 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest |
| 739 | position before POS where the knownness changes. */ | 739 | position before POS where the knowledge changes. */ |
| 740 | int region_cache_backward (struct buffer *buf, struct region_cache *c, | 740 | int region_cache_backward (struct buffer *buf, struct region_cache *c, |
| 741 | ptrdiff_t pos, ptrdiff_t *next) | 741 | ptrdiff_t pos, ptrdiff_t *next) |
| 742 | { | 742 | { |
diff --git a/src/region-cache.h b/src/region-cache.h index 8e1be716776..6758f8bcd08 100644 --- a/src/region-cache.h +++ b/src/region-cache.h | |||
| @@ -97,7 +97,7 @@ extern void invalidate_region_cache (struct buffer *BUF, | |||
| 97 | 97 | ||
| 98 | /* Return true if the text immediately after POS in BUF is known, for | 98 | /* Return true if the text immediately after POS in BUF is known, for |
| 99 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest | 99 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest |
| 100 | position after POS where the knownness changes. */ | 100 | position after POS where the knowledge changes. */ |
| 101 | extern int region_cache_forward (struct buffer *BUF, | 101 | extern int region_cache_forward (struct buffer *BUF, |
| 102 | struct region_cache *CACHE, | 102 | struct region_cache *CACHE, |
| 103 | ptrdiff_t POS, | 103 | ptrdiff_t POS, |
| @@ -105,7 +105,7 @@ extern int region_cache_forward (struct buffer *BUF, | |||
| 105 | 105 | ||
| 106 | /* Return true if the text immediately before POS in BUF is known, for | 106 | /* Return true if the text immediately before POS in BUF is known, for |
| 107 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest | 107 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest |
| 108 | position before POS where the knownness changes. */ | 108 | position before POS where the knowledge changes. */ |
| 109 | extern int region_cache_backward (struct buffer *BUF, | 109 | extern int region_cache_backward (struct buffer *BUF, |
| 110 | struct region_cache *CACHE, | 110 | struct region_cache *CACHE, |
| 111 | ptrdiff_t POS, | 111 | ptrdiff_t POS, |
diff --git a/src/termhooks.h b/src/termhooks.h index 63d166b6418..5bd081d6d8b 100644 --- a/src/termhooks.h +++ b/src/termhooks.h | |||
| @@ -553,7 +553,7 @@ struct terminal | |||
| 553 | 553 | ||
| 554 | /* Arrange for all scroll bars on FRAME to be removed at the next call | 554 | /* Arrange for all scroll bars on FRAME to be removed at the next call |
| 555 | to `*judge_scroll_bars_hook'. A scroll bar may be spared if | 555 | to `*judge_scroll_bars_hook'. A scroll bar may be spared if |
| 556 | `*redeem_scroll_bar_hook' is applied to its window before the judgement. | 556 | `*redeem_scroll_bar_hook' is applied to its window before the judgment. |
| 557 | 557 | ||
| 558 | This should be applied to each frame each time its window tree is | 558 | This should be applied to each frame each time its window tree is |
| 559 | redisplayed, even if it is not displaying scroll bars at the moment; | 559 | redisplayed, even if it is not displaying scroll bars at the moment; |
| @@ -565,7 +565,7 @@ struct terminal | |||
| 565 | currently displaying them. */ | 565 | currently displaying them. */ |
| 566 | void (*condemn_scroll_bars_hook) (struct frame *frame); | 566 | void (*condemn_scroll_bars_hook) (struct frame *frame); |
| 567 | 567 | ||
| 568 | /* Unmark WINDOW's scroll bar for deletion in this judgement cycle. | 568 | /* Unmark WINDOW's scroll bar for deletion in this judgment cycle. |
| 569 | Note that it's okay to redeem a scroll bar that is not condemned. */ | 569 | Note that it's okay to redeem a scroll bar that is not condemned. */ |
| 570 | void (*redeem_scroll_bar_hook) (struct window *window); | 570 | void (*redeem_scroll_bar_hook) (struct window *window); |
| 571 | 571 | ||
diff --git a/src/xfns.c b/src/xfns.c index 95154395e9c..e44f28df870 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1877,7 +1877,7 @@ static XIMStyle supported_xim_styles[] = | |||
| 1877 | #if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT | 1877 | #if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT |
| 1878 | /* Create an X fontset on frame F with base font name BASE_FONTNAME. */ | 1878 | /* Create an X fontset on frame F with base font name BASE_FONTNAME. */ |
| 1879 | 1879 | ||
| 1880 | static const char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; | 1880 | static const char xic_default_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; |
| 1881 | 1881 | ||
| 1882 | /* Create an Xt fontset spec from the name of a base font. | 1882 | /* Create an Xt fontset spec from the name of a base font. |
| 1883 | If `motif' is True use the Motif syntax. */ | 1883 | If `motif' is True use the Motif syntax. */ |
| @@ -1888,7 +1888,7 @@ xic_create_fontsetname (const char *base_fontname, int motif) | |||
| 1888 | char *fontsetname; | 1888 | char *fontsetname; |
| 1889 | 1889 | ||
| 1890 | /* Make a fontset name from the base font name. */ | 1890 | /* Make a fontset name from the base font name. */ |
| 1891 | if (xic_defaut_fontset == base_fontname) | 1891 | if (xic_default_fontset == base_fontname) |
| 1892 | { /* There is no base font name, use the default. */ | 1892 | { /* There is no base font name, use the default. */ |
| 1893 | ptrdiff_t len = strlen (base_fontname) + 2; | 1893 | ptrdiff_t len = strlen (base_fontname) + 2; |
| 1894 | fontsetname = xmalloc (len); | 1894 | fontsetname = xmalloc (len); |
| @@ -1912,12 +1912,12 @@ xic_create_fontsetname (const char *base_fontname, int motif) | |||
| 1912 | modify it to generalize it to allcs and allfamilies. | 1912 | modify it to generalize it to allcs and allfamilies. |
| 1913 | Use the specified font plus the default. */ | 1913 | Use the specified font plus the default. */ |
| 1914 | ptrdiff_t len = | 1914 | ptrdiff_t len = |
| 1915 | strlen (base_fontname) + strlen (xic_defaut_fontset) + 3; | 1915 | strlen (base_fontname) + strlen (xic_default_fontset) + 3; |
| 1916 | fontsetname = xmalloc (len); | 1916 | fontsetname = xmalloc (len); |
| 1917 | memset (fontsetname, 0, len); | 1917 | memset (fontsetname, 0, len); |
| 1918 | strcpy (fontsetname, base_fontname); | 1918 | strcpy (fontsetname, base_fontname); |
| 1919 | strcat (fontsetname, sep); | 1919 | strcat (fontsetname, sep); |
| 1920 | strcat (fontsetname, xic_defaut_fontset); | 1920 | strcat (fontsetname, xic_default_fontset); |
| 1921 | } | 1921 | } |
| 1922 | else | 1922 | else |
| 1923 | { | 1923 | { |