mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Spelling fixes.

Browse source
This commit is contained in:
Paul Eggert 2011-12-11 21:32:49 -08:00
parent 11636b221d
commit 333f9019e2
78 changed files with 146 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/emacs/ChangeLog
View file

@ -1676,7 +1676,7 @@
2009-08-31 Nick Roberts <nickrob@snap.net.nz> 2009-08-31 Nick Roberts <nickrob@snap.net.nz>
* building.texi (Threads Buffer, Multithreaded Debugging): * building.texi (Threads Buffer, Multithreaded Debugging):
Re-organise these two sections. Reorganize these two sections.
2009-08-29 Eli Zaretskii <eliz@gnu.org> 2009-08-29 Eli Zaretskii <eliz@gnu.org>

2
doc/lispref/ChangeLog
View file

@ -9754,7 +9754,7 @@
directory have been changed to reflect this. directory have been changed to reflect this.
* All instances of @indentedresultt{} have been changed to * All instances of @indentedresultt{} have been changed to
` @result{}', using 5 spaces at the begining of the line. ` @result{}', using 5 spaces at the beginning of the line.
1989-04-24 Robert J. Chassell (bob@rice-chex.ai.mit.edu) 1989-04-24 Robert J. Chassell (bob@rice-chex.ai.mit.edu)

4
doc/lispref/elisp.texi
View file

@ -1381,7 +1381,7 @@ Operating System Interface
* System Environment:: Distinguish the name and kind of system. * System Environment:: Distinguish the name and kind of system.
* User Identification:: Finding the name and user id of the user. * User Identification:: Finding the name and user id of the user.
* Time of Day:: Getting the current time. * Time of Day:: Getting the current time.
* Time Conversion:: Converting a time from numeric form to * Time Conversion:: Converting a time from numeric form to
calendrical data and vice versa. calendrical data and vice versa.
* Time Parsing:: Converting a time from numeric form to text * Time Parsing:: Converting a time from numeric form to text
and vice versa. and vice versa.
@ -1438,7 +1438,7 @@ Tips and Conventions
GNU Emacs Internals GNU Emacs Internals
* Building Emacs:: How the dumped Emacs is made. * Building Emacs:: How the dumped Emacs is made.
* Pure Storage:: A kludge to make preloaded Lisp functions sharable. * Pure Storage:: Kludge to make preloaded Lisp functions shareable.
* Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Garbage Collection:: Reclaiming space for Lisp objects no longer used.
* Memory Usage:: Info about total size of Lisp objects made so far. * Memory Usage:: Info about total size of Lisp objects made so far.
* Writing Emacs Primitives:: Writing C code for Emacs. * Writing Emacs Primitives:: Writing C code for Emacs.

4
doc/lispref/internals.texi
View file

@ -13,7 +13,7 @@ internal aspects of GNU Emacs that may be of interest to C programmers.
@menu @menu
* Building Emacs:: How the dumped Emacs is made. * Building Emacs:: How the dumped Emacs is made.
* Pure Storage:: A kludge to make preloaded Lisp functions sharable. * Pure Storage:: Kludge to make preloaded Lisp functions shareable.
* Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Garbage Collection:: Reclaiming space for Lisp objects no longer used.
* Memory Usage:: Info about total size of Lisp objects made so far. * Memory Usage:: Info about total size of Lisp objects made so far.
* Writing Emacs Primitives:: Writing C code for Emacs. * 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
function definition is copied into pure storage. function definition is copied into pure storage.
This flag is @code{t} while loading all of the basic functions for This flag is @code{t} while loading all of the basic functions for
building Emacs initially (allowing those functions to be sharable and building Emacs initially (allowing those functions to be shareable and
non-collectible). Dumping Emacs as an executable always writes non-collectible). Dumping Emacs as an executable always writes
@code{nil} in this variable, regardless of the value it actually has @code{nil} in this variable, regardless of the value it actually has
before and after dumping. before and after dumping.

2
doc/lispref/nonascii.texi
View file

@ -1580,7 +1580,7 @@ decoding functions (@pxref{Explicit Encoding}).
Sometimes, you need to prefer several coding systems for some Sometimes, you need to prefer several coding systems for some
operation, rather than fix a single one. Emacs lets you specify a operation, rather than fix a single one. Emacs lets you specify a
priority order for using coding systems. This ordering affects the priority order for using coding systems. This ordering affects the
sorting of lists of coding sysems returned by functions such as sorting of lists of coding systems returned by functions such as
@code{find-coding-systems-region} (@pxref{Lisp and Coding Systems}). @code{find-coding-systems-region} (@pxref{Lisp and Coding Systems}).
@defun coding-system-priority-list &optional highestp @defun coding-system-priority-list &optional highestp

6
doc/lispref/vol1.texi
View file

@ -44,7 +44,7 @@
@end ifset @end ifset
@c per rms and peterb, use 10pt fonts for the main text, mostly to @c per rms and peterb, use 10pt fonts for the main text, mostly to
@c save on paper cost. @c save on paper cost.
@c Do this inside @tex for now, so current makeinfo does not complain. @c Do this inside @tex for now, so current makeinfo does not complain.
@tex @tex
@ifset smallbook @ifset smallbook
@ -1402,7 +1402,7 @@ Operating System Interface
* System Environment:: Distinguish the name and kind of system. * System Environment:: Distinguish the name and kind of system.
* User Identification:: Finding the name and user id of the user. * User Identification:: Finding the name and user id of the user.
* Time of Day:: Getting the current time. * Time of Day:: Getting the current time.
* Time Conversion:: Converting a time from numeric form to * Time Conversion:: Converting a time from numeric form to
calendrical data and vice versa. calendrical data and vice versa.
* Time Parsing:: Converting a time from numeric form to text * Time Parsing:: Converting a time from numeric form to text
and vice versa. and vice versa.
@ -1458,7 +1458,7 @@ Tips and Conventions
GNU Emacs Internals GNU Emacs Internals
* Building Emacs:: How the dumped Emacs is made. * Building Emacs:: How the dumped Emacs is made.
* Pure Storage:: A kludge to make preloaded Lisp functions sharable. * Pure Storage:: Kludge to make preloaded Lisp functions shareable.
* Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Garbage Collection:: Reclaiming space for Lisp objects no longer used.
* Memory Usage:: Info about total size of Lisp objects made so far. * Memory Usage:: Info about total size of Lisp objects made so far.
* Writing Emacs Primitives:: Writing C code for Emacs. * Writing Emacs Primitives:: Writing C code for Emacs.

4
doc/lispref/vol2.texi
View file

@ -1401,7 +1401,7 @@ Operating System Interface
* System Environment:: Distinguish the name and kind of system. * System Environment:: Distinguish the name and kind of system.
* User Identification:: Finding the name and user id of the user. * User Identification:: Finding the name and user id of the user.
* Time of Day:: Getting the current time. * Time of Day:: Getting the current time.
* Time Conversion:: Converting a time from numeric form to * Time Conversion:: Converting a time from numeric form to
calendrical data and vice versa. calendrical data and vice versa.
* Time Parsing:: Converting a time from numeric form to text * Time Parsing:: Converting a time from numeric form to text
and vice versa. and vice versa.
@ -1457,7 +1457,7 @@ Tips and Conventions
GNU Emacs Internals GNU Emacs Internals
* Building Emacs:: How the dumped Emacs is made. * Building Emacs:: How the dumped Emacs is made.
* Pure Storage:: A kludge to make preloaded Lisp functions sharable. * Pure Storage:: Kludge to make preloaded Lisp functions shareable.
* Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Garbage Collection:: Reclaiming space for Lisp objects no longer used.
* Memory Usage:: Info about total size of Lisp objects made so far. * Memory Usage:: Info about total size of Lisp objects made so far.
* Writing Emacs Primitives:: Writing C code for Emacs. * Writing Emacs Primitives:: Writing C code for Emacs.

6
doc/misc/calc.texi
View file

@ -16873,7 +16873,7 @@ The @kbd{t U} (@code{calc-unix-time}) [@code{unixtime}] command
converts a date form into a Unix time value, which is the number of converts a date form into a Unix time value, which is the number of
seconds since midnight on Jan 1, 1970, or vice-versa. The numeric result seconds since midnight on Jan 1, 1970, or vice-versa. The numeric result
will be an integer if the current precision is 12 or less; for higher will be an integer if the current precision is 12 or less; for higher
precisions, the result may be a float with (@var{precision}@minus{}12) precision, the result may be a float with (@var{precision}@minus{}12)
digits after the decimal. Just as for @kbd{t J}, the numeric time digits after the decimal. Just as for @kbd{t J}, the numeric time
is interpreted in the GMT time zone and the date form is interpreted is interpreted in the GMT time zone and the date form is interpreted
in the current or specified zone. Some systems use Unix-like 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.
The @kbd{M-6 t P} [@code{second}] function extracts the second The @kbd{M-6 t P} [@code{second}] function extracts the second
from a date form. If the current precision is 12 or less, from a date form. If the current precision is 12 or less,
the result is an integer in the range 0 to 59. For higher the result is an integer in the range 0 to 59. For higher
precisions, the result may instead be a floating-point number. precision, the result may instead be a floating-point number.
@tindex weekday @tindex weekday
The @kbd{M-7 t P} [@code{weekday}] function extracts the weekday 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}
Calc can compute a variety of less common functions that arise in Calc can compute a variety of less common functions that arise in
various branches of mathematics. All of the functions described in various branches of mathematics. All of the functions described in
this section allow arbitrary complex arguments and, except as noted, this section allow arbitrary complex arguments and, except as noted,
will work to arbitrarily large precisions. They can not at present will work to arbitrarily large precision. They can not at present
handle error forms or intervals as arguments. handle error forms or intervals as arguments.
NOTE: These functions are still experimental. In particular, their NOTE: These functions are still experimental. In particular, their

2
doc/misc/cc-mode.texi
View file

@ -2160,7 +2160,7 @@ A space between the function name and opening parenthesis when calling
a user function. The last character of the function name and the a user function. The last character of the function name and the
opening parenthesis are highlighted. This font-locking rule will opening parenthesis are highlighted. This font-locking rule will
spuriously highlight a valid concatenation expression where an spuriously highlight a valid concatenation expression where an
identifier precedes a parenthesised expression. Unfortunately. identifier precedes a parenthesized expression. Unfortunately.
@item @item
Whitespace following the @samp{\} in what otherwise looks like an Whitespace following the @samp{\} in what otherwise looks like an

2
doc/misc/dbus.texi
View file

@ -1816,7 +1816,7 @@ handled by a hook function.
@defvar dbus-event-error-hooks @defvar dbus-event-error-hooks
This hook variable keeps a list of functions, which are called when a This hook variable keeps a list of functions, which are called when a
D-Bus error happens in the event handler. Every function must accept D-Bus error happens in the event handler. Every function must accept
two arguments, the event and the error variable catched in two arguments, the event and the error variable caught in
@code{condition-case} by @code{dbus-error}. @code{condition-case} by @code{dbus-error}.
Such functions can be used the adapt the error signal to be raised. Such functions can be used the adapt the error signal to be raised.

2
doc/misc/ebrowse.texi
View file

@ -482,7 +482,7 @@ name.
@table @kbd @table @kbd
@item SPC @item SPC
This command views the class declaration if the database This command views the class declaration if the database
contains informations about it. If you don't parse the entire source contains information about it. If you don't parse the entire source
you are working on, some classes will only be known to exist but the you are working on, some classes will only be known to exist but the
location of their declarations and definitions will not be known.@refill location of their declarations and definitions will not be known.@refill

2
doc/misc/emacs-mime.texi
View file

@ -417,7 +417,7 @@ called with a @acronym{MIME} handle as the argument.
@vindex mm-inline-text-html-with-images @vindex mm-inline-text-html-with-images
Some @acronym{HTML} mails might have the trick of spammers using Some @acronym{HTML} mails might have the trick of spammers using
@samp{<img>} tags. It is likely to be intended to verify whether you @samp{<img>} tags. It is likely to be intended to verify whether you
have read the mail. You can prevent your personal informations from have read the mail. You can prevent your personal information from
leaking by setting this option to @code{nil} (which is the default). leaking by setting this option to @code{nil} (which is the default).
It is currently ignored by Emacs/w3. For emacs-w3m, you may use the It is currently ignored by Emacs/w3. For emacs-w3m, you may use the
command @kbd{t} on the image anchor to show an image even if it is command @kbd{t} on the image anchor to show an image even if it is

2
doc/misc/gnus-faq.texi
View file

@ -1838,7 +1838,7 @@ inconvenient since you are not displaying the found mail
in Gnus. Here comes nnir into action. Nnir is a front end in Gnus. Here comes nnir into action. Nnir is a front end
to search engines like swish-e or swish++ and to search engines like swish-e or swish++ and
others. You index your mail with one of those search others. You index your mail with one of those search
engines and with the help of nnir you can search trough engines and with the help of nnir you can search through
the indexed mail and generate a temporary group with all the indexed mail and generate a temporary group with all
messages which met your search criteria. If this sound messages which met your search criteria. If this sound
cool to you get nnir.el from cool to you get nnir.el from

4
doc/misc/gnus.texi
View file

@ -4622,7 +4622,7 @@ Sieve is a server-side mail filtering language. In Gnus you can use
the @code{sieve} group parameter (@pxref{Group Parameters}) to specify the @code{sieve} group parameter (@pxref{Group Parameters}) to specify
sieve rules that should apply to each group. Gnus provides two sieve rules that should apply to each group. Gnus provides two
commands to translate all these group parameters into a proper Sieve commands to translate all these group parameters into a proper Sieve
script that can be transfered to the server somehow. script that can be transferred to the server somehow.
@vindex gnus-sieve-file @vindex gnus-sieve-file
@vindex gnus-sieve-region-start @vindex gnus-sieve-region-start
@ -8332,7 +8332,7 @@ Files with name matching this regular expression won't be viewed.
Files with a @acronym{MIME} type matching this variable won't be viewed. Files with a @acronym{MIME} type matching this variable won't be viewed.
Note that Gnus tries to guess what type the file is based on the name. Note that Gnus tries to guess what type the file is based on the name.
@code{gnus-uu} is not a @acronym{MIME} package (yet), so this is slightly @code{gnus-uu} is not a @acronym{MIME} package (yet), so this is slightly
kludgey. kludgy.
@item gnus-uu-tmp-dir @item gnus-uu-tmp-dir
@vindex gnus-uu-tmp-dir @vindex gnus-uu-tmp-dir

4
doc/misc/tramp.texi
View file

@ -528,8 +528,8 @@ differ.
@cindex methods, inline @cindex methods, inline
@cindex methods, external @cindex methods, external
Loading or saving a remote file requires that the content of the file Loading or saving a remote file requires that the content of the file
be transfered between the two machines. The content of the file can be transferred between the two machines. The content of the file can
be transfered using one of two methods: the @dfn{inline method} over be transferred using one of two methods: the @dfn{inline method} over
the same connection used to log in to the remote machine, or the the same connection used to log in to the remote machine, or the
@dfn{external method} through another connection using a remote copy @dfn{external method} through another connection using a remote copy
program such as @command{rcp}, @command{scp} or @command{rsync}. program such as @command{rcp}, @command{scp} or @command{rsync}.

2
etc/srecode/el.srt
View file

@ -109,7 +109,7 @@ $<MODEFCN:declaration:function$
'($MODESYM$-mode-font-lock-keywords '($MODESYM$-mode-font-lock-keywords
nil ;; perform string/comment fontification nil ;; perform string/comment fontification
nil ;; keywords are case sensitive. nil ;; keywords are case sensitive.
;; This puts _ & - as a word constituant, ;; This puts _ & - as a word constituent,
;; simplifying our keywords significantly ;; simplifying our keywords significantly
((?_ . "w") (?- . "w")))) ((?_ . "w") (?- . "w"))))
(run-hooks '$MODESYM$-mode-hook) (run-hooks '$MODESYM$-mode-hook)

2
lib-src/ChangeLog
View file

@ -3137,7 +3137,7 @@
(main): Call put_entries here even in CTAGS mode. (main): Call put_entries here even in CTAGS mode.
(main, process_file): Check the return values of fclose and pclose. (main, process_file): Check the return values of fclose and pclose.
(process_file): Do not call put_entries after parsing each file. (process_file): Do not call put_entries after parsing each file.
(process_file): Canonicalise file names even for ctags. (process_file): Canonicalize file names even for ctags.
(process_file): Set curfile here... (process_file): Set curfile here...
(find_entries): ... not here any more. (find_entries): ... not here any more.
(add_node): In etags mode, build a linked list of entries (on (add_node): In etags mode, build a linked list of entries (on

2
lisp/ChangeLog.13
View file

@ -7261,7 +7261,7 @@
* progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable. * progmodes/gdb-ui.el (gdb-parent-bptno-enabled): New variable.
(gdb-breakpoint-regexp, gdb-mouse-toggle-breakpoint-margin) (gdb-breakpoint-regexp, gdb-mouse-toggle-breakpoint-margin)
(gdb-mouse-toggle-breakpoint-fringe, gdb-delete-breakpoint) (gdb-mouse-toggle-breakpoint-fringe, gdb-delete-breakpoint)
(gdb-goto-breakpoint): Generalise for breakpoints with multiple (gdb-goto-breakpoint): Generalize for breakpoints with multiple
locations. locations.
(gdb-info-breakpoints-custom, gdb-assembler-custom) (gdb-info-breakpoints-custom, gdb-assembler-custom)
(gdb-toggle-breakpoint): Update for new gdb-breakpoint-regexp. (gdb-toggle-breakpoint): Update for new gdb-breakpoint-regexp.

2
lisp/ChangeLog.15
View file

@ -8618,7 +8618,7 @@
(menu-bar-showhide-tool-bar-menu-customize-enable-right) (menu-bar-showhide-tool-bar-menu-customize-enable-right)
(menu-bar-showhide-tool-bar-menu-customize-enable-bottom) (menu-bar-showhide-tool-bar-menu-customize-enable-bottom)
(menu-bar-showhide-tool-bar-menu-customize-enable-top): New functions (menu-bar-showhide-tool-bar-menu-customize-enable-top): New functions
(menu-bar-showhide-tool-bar-menu): If tool bar is moveable, (menu-bar-showhide-tool-bar-menu): If tool bar is movable,
make a menu for Options => toolbar that can move it. make a menu for Options => toolbar that can move it.
2010-07-29 Chong Yidong <cyd@stupidchicken.com> 2010-07-29 Chong Yidong <cyd@stupidchicken.com>

2
lisp/ChangeLog.3
View file

@ -8647,7 +8647,7 @@
* comint.el, inf-lisp.el, shell.el: Updated to meet Olin's * comint.el, inf-lisp.el, shell.el: Updated to meet Olin's
version 2.0 comint offerings. version 2.0 comint offerings.
* ring.el: The underlying history mechanism for comint. * ring.el: The underlying history mechanism for comint.
Generalised handling of a ring data type based on vectors. Generalized handling of a ring data type based on vectors.
* history.el: For now, a symlink to ring.el. * history.el: For now, a symlink to ring.el.
* loaddefs.el: Updated shell-prompt-pattern doc string. * loaddefs.el: Updated shell-prompt-pattern doc string.

14
lisp/ChangeLog.7
View file

@ -13088,7 +13088,7 @@
1997-07-25 Simon Marshall <simon@frobnitz.gnu.ai.mit.edu> 1997-07-25 Simon Marshall <simon@frobnitz.gnu.ai.mit.edu>
* complete.el: Customise; as subgroup of minibuffer. * complete.el: Customize; as subgroup of minibuffer.
(partial-completion-mode): New option to toggle mode. (partial-completion-mode): New option to toggle mode.
(partial-completion-mode): New command to toggle mode. (partial-completion-mode): New command to toggle mode.
Add and remove hooks here, i.e., not at the top-level. Add and remove hooks here, i.e., not at the top-level.
@ -13617,7 +13617,7 @@
1997-07-15 Simon Marshall <simon@albert.gnu.ai.mit.edu> 1997-07-15 Simon Marshall <simon@albert.gnu.ai.mit.edu>
* mouse-sel.el: Customise; create mouse-sel as subgroup of mouse. * mouse-sel.el: Customize; create mouse-sel as subgroup of mouse.
(mouse-sel-mode): New option to toggle mode. (mouse-sel-mode): New option to toggle mode.
(mouse-sel-mode): New command to toggle mode. (mouse-sel-mode): New command to toggle mode.
(mouse-sel-set-selection-function): If mouse-sel-default-bindings is (mouse-sel-set-selection-function): If mouse-sel-default-bindings is
@ -13625,7 +13625,7 @@
(mouse-sel-bindings): New function to install/restore mouse bindings. (mouse-sel-bindings): New function to install/restore mouse bindings.
This is called by mouse-sel-mode, i.e., not at the top-level. This is called by mouse-sel-mode, i.e., not at the top-level.
* delsel.el: Customise; as part of editing-basics group. * delsel.el: Customize; as part of editing-basics group.
(delete-selection-mode): Convert to autoloaded option. Default to nil. (delete-selection-mode): Convert to autoloaded option. Default to nil.
(delete-selection-mode): Define before option. (delete-selection-mode): Define before option.
Modify pre-command-hook here, i.e., not at the top-level. Modify pre-command-hook here, i.e., not at the top-level.
@ -14943,7 +14943,7 @@
paren-matching) and put all blink-matching-paren variables in the paren-matching) and put all blink-matching-paren variables in the
former (as opposed to the latter) group. former (as opposed to the latter) group.
* paren.el: Customise; paren-showing as a subgroup of paren-matching. * paren.el: Customize; paren-showing as a subgroup of paren-matching.
(show-paren-style): New variable. (show-paren-style): New variable.
(show-paren-match-face) (show-paren-match-face)
(show-paren-mismatch-face): New faces. (show-paren-mismatch-face): New faces.
@ -18871,7 +18871,7 @@
1997-04-16 Simon Marshall <simon@wombat.gnu.ai.mit.edu> 1997-04-16 Simon Marshall <simon@wombat.gnu.ai.mit.edu>
* font-lock.el: Customise. * font-lock.el: Customize.
(font-lock-defaults-alist): Leave ~ syntax alone in C++. (font-lock-defaults-alist): Leave ~ syntax alone in C++.
(font-lock-match-c++-style-declaration-item-and-skip-to-next): Match ~ (font-lock-match-c++-style-declaration-item-and-skip-to-next): Match ~
characters here. characters here.
@ -18883,10 +18883,10 @@
(font-lock-compile-keywords): Don't set font-lock-keywords. (font-lock-compile-keywords): Don't set font-lock-keywords.
(font-lock-fontify-keywords-region): Set it here. (font-lock-fontify-keywords-region): Set it here.
* fast-lock.el: Customise. * fast-lock.el: Customize.
(fast-lock-cache-data): Simplify calls of font-lock-compile-keywords. (fast-lock-cache-data): Simplify calls of font-lock-compile-keywords.
* lazy-lock.el: Customise. * lazy-lock.el: Customize.
(lazy-lock-fontify-conservatively): Fontify around WINDOW's point. (lazy-lock-fontify-conservatively): Fontify around WINDOW's point.
* shell.el (shell-font-lock-keywords): Use EVAL form for prompt. * shell.el (shell-font-lock-keywords): Use EVAL form for prompt.

26
lisp/calc/calc-poly.el
View file

@ -147,7 +147,7 @@
;;; Return only quotient to top of stack (nil if zero) ;;; Return only quotient to top of stack (nil if zero)
;; calc-poly-div-remainder is a local variable for ;; calc-poly-div-remainder is a local variable for
;; calc-poly-div (in calc-alg.el), but is used by ;; calc-poly-div (in calc-alg.el), but is used by
;; calcFunc-pdiv, which is called by calc-poly-div. ;; calcFunc-pdiv, which is called by calc-poly-div.
(defvar calc-poly-div-remainder) (defvar calc-poly-div-remainder)
@ -512,7 +512,7 @@
;;; Given an expression find all variables that are polynomial bases. ;;; Given an expression find all variables that are polynomial bases.
;;; Return list in the form '( (var1 degree1) (var2 degree2) ... ). ;;; Return list in the form '( (var1 degree1) (var2 degree2) ... ).
;; The variable math-poly-base-total-base is local to ;; The variable math-poly-base-total-base is local to
;; math-total-polynomial-base, but is used by math-polynomial-p1, ;; math-total-polynomial-base, but is used by math-polynomial-p1,
;; which is called by math-total-polynomial-base. ;; which is called by math-total-polynomial-base.
(defvar math-poly-base-total-base) (defvar math-poly-base-total-base)
@ -539,19 +539,19 @@
nil) nil)
;; The variable math-factored-vars is local to calcFunc-factors and ;; The variable math-factored-vars is local to calcFunc-factors and
;; calcFunc-factor, but is used by math-factor-expr and ;; calcFunc-factor, but is used by math-factor-expr and
;; math-factor-expr-part, which are called (directly and indirectly) by ;; math-factor-expr-part, which are called (directly and indirectly) by
;; calcFunc-factor and calcFunc-factors. ;; calcFunc-factor and calcFunc-factors.
(defvar math-factored-vars) (defvar math-factored-vars)
;; The variable math-fact-expr is local to calcFunc-factors, ;; The variable math-fact-expr is local to calcFunc-factors,
;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try ;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try
;; and math-factor-expr-part, which are called (directly and indirectly) by ;; and math-factor-expr-part, which are called (directly and indirectly) by
;; calcFunc-factor, calcFunc-factors and math-factor-expr. ;; calcFunc-factor, calcFunc-factors and math-factor-expr.
(defvar math-fact-expr) (defvar math-fact-expr)
;; The variable math-to-list is local to calcFunc-factors and ;; The variable math-to-list is local to calcFunc-factors and
;; calcFunc-factor, but is used by math-accum-factors, which is ;; calcFunc-factor, but is used by math-accum-factors, which is
;; called (indirectly) by calcFunc-factors and calcFunc-factor. ;; called (indirectly) by calcFunc-factors and calcFunc-factor.
(defvar math-to-list) (defvar math-to-list)
@ -729,7 +729,7 @@
'(1))) '(1)))
;; We now have a square-free polynomial with integer coefs. ;; We now have a square-free polynomial with integer coefs.
;; For now, we use a kludgey method that finds linear and ;; For now, we use a kludgy method that finds linear and
;; quadratic terms using floating-point root-finding. ;; quadratic terms using floating-point root-finding.
(if (setq t1 (let ((calc-symbolic-mode nil)) (if (setq t1 (let ((calc-symbolic-mode nil))
(math-poly-all-roots nil p t))) (math-poly-all-roots nil p t)))
@ -749,7 +749,7 @@
(math-add (math-add
(math-add (math-add
(math-mul den (math-pow math-fet-x 2)) (math-mul den (math-pow math-fet-x 2))
(math-mul (math-mul coef1 den) (math-mul (math-mul coef1 den)
math-fet-x)) math-fet-x))
(math-mul coef0 den))) (math-mul coef0 den)))
(let ((den (math-lcm-denoms coef0))) (let ((den (math-lcm-denoms coef0)))
@ -1077,7 +1077,7 @@ If no partial fraction representation can be found, return nil."
((and (eq (car-safe expr) '^) ((and (eq (car-safe expr) '^)
(memq (car-safe (nth 1 expr)) '(+ -)) (memq (car-safe (nth 1 expr)) '(+ -))
(integerp (nth 2 expr)) (integerp (nth 2 expr))
(if (and (if (and
(or (math-known-matrixp (nth 1 (nth 1 expr))) (or (math-known-matrixp (nth 1 (nth 1 expr)))
(math-known-matrixp (nth 2 (nth 1 expr))) (math-known-matrixp (nth 2 (nth 1 expr)))
(and (and
@ -1090,11 +1090,11 @@ If no partial fraction representation can be found, return nil."
(math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr)) (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr))
(list '* (nth 2 (nth 1 expr)) (nth 1 expr)) (list '* (nth 2 (nth 1 expr)) (nth 1 expr))
nil (eq (car (nth 1 expr)) '-)) nil (eq (car (nth 1 expr)) '-))
(math-add-or-sub (list '* (nth 1 (nth 1 expr)) (math-add-or-sub (list '* (nth 1 (nth 1 expr))
(list '^ (nth 1 expr) (list '^ (nth 1 expr)
(1- (nth 2 expr)))) (1- (nth 2 expr))))
(list '* (nth 2 (nth 1 expr)) (list '* (nth 2 (nth 1 expr))
(list '^ (nth 1 expr) (list '^ (nth 1 expr)
(1- (nth 2 expr)))) (1- (nth 2 expr))))
nil (eq (car (nth 1 expr)) '-))) nil (eq (car (nth 1 expr)) '-)))
(if (> (nth 2 expr) 0) (if (> (nth 2 expr) 0)

8
lisp/cedet/semantic/bovine/el.el
View file

@ -497,15 +497,15 @@ used to perform the override."
Unfortunately, this requires that the tag in question has been loaded Unfortunately, this requires that the tag in question has been loaded
into Emacs Lisp's memory." into Emacs Lisp's memory."
(let ((obsoletethis (intern-soft (semantic-tag-name tag))) (let ((obsoletethis (intern-soft (semantic-tag-name tag)))
(obsoletor nil)) (obsoleter nil))
;; This asks if our tag is available in the Emacs name space for querying. ;; This asks if our tag is available in the Emacs name space for querying.
(when obsoletethis (when obsoletethis
(mapatoms (lambda (a) (mapatoms (lambda (a)
(let ((oi (get a 'byte-obsolete-info))) (let ((oi (get a 'byte-obsolete-info)))
(if (and oi (eq (car oi) obsoletethis)) (if (and oi (eq (car oi) obsoletethis))
(setq obsoletor a))))) (setq obsoleter a)))))
(if obsoletor (if obsoleter
(format "\n@obsolete{%s,%s}" obsoletor (semantic-tag-name tag)) (format "\n@obsolete{%s,%s}" obsoleter (semantic-tag-name tag))
"")))) ""))))
(define-mode-local-override semantic-documentation-for-tag (define-mode-local-override semantic-documentation-for-tag

2
lisp/cedet/semantic/find.el
View file

@ -427,7 +427,7 @@ TABLE is a tag table. See `semantic-something-to-tag-table'."
;;; Old Style Brute Force Search Routines ;;; Old Style Brute Force Search Routines
;; ;;
;; These functions will search through tags lists explicity for ;; These functions will search through tags lists explicitly for
;; desired information. ;; desired information.
;; The -by-name nonterminal search can use the built in fcn ;; The -by-name nonterminal search can use the built in fcn

2
lisp/cedet/semantic/grammar.el
View file

@ -1290,7 +1290,7 @@ the change bounds to encompass the whole nonterminal tag."
semantic-grammar-mode-keywords-3) semantic-grammar-mode-keywords-3)
nil ;; perform string/comment fontification nil ;; perform string/comment fontification
nil ;; keywords are case sensitive. nil ;; keywords are case sensitive.
;; This puts _ & - as a word constituant, ;; This puts _ & - as a word constituent,
;; simplifying our keywords significantly ;; simplifying our keywords significantly
((?_ . "w") (?- . "w")))) ((?_ . "w") (?- . "w"))))
;; Setup Semantic to parse grammar ;; Setup Semantic to parse grammar

2
lisp/cedet/semantic/wisent/comp.el
View file

@ -2640,7 +2640,7 @@ there are any reduce/reduce conflicts.")
(defun wisent-print-results () (defun wisent-print-results ()
"Print information on generated parser. "Print information on generated parser.
Report detailed informations if `wisent-verbose-flag' or Report detailed information if `wisent-verbose-flag' or
`wisent-debug-flag' are non-nil." `wisent-debug-flag' are non-nil."
(when (or wisent-verbose-flag wisent-debug-flag) (when (or wisent-verbose-flag wisent-debug-flag)
(wisent-print-useless)) (wisent-print-useless))

2
lisp/cedet/srecode/srt-mode.el
View file

@ -194,7 +194,7 @@ we can tell font lock about them.")
'(srecode-font-lock-keywords '(srecode-font-lock-keywords
nil ;; perform string/comment fontification nil ;; perform string/comment fontification
nil ;; keywords are case sensitive. nil ;; keywords are case sensitive.
;; This puts _ & - as a word constituant, ;; This puts _ & - as a word constituent,
;; simplifying our keywords significantly ;; simplifying our keywords significantly
((?_ . "w") (?- . "w"))))) ((?_ . "w") (?- . "w")))))

2
lisp/comint.el
View file

@ -45,7 +45,7 @@
;; It is pretty easy to make new derived modes for other processes. ;; It is pretty easy to make new derived modes for other processes.
;; For documentation on the functionality provided by Comint mode, and ;; For documentation on the functionality provided by Comint mode, and
;; the hooks available for customising it, see the comments below. ;; the hooks available for customizing it, see the comments below.
;; For further information on the standard derived modes (shell, ;; For further information on the standard derived modes (shell,
;; inferior-lisp, inferior-scheme, ...), see the relevant source files. ;; inferior-lisp, inferior-scheme, ...), see the relevant source files.

14
lisp/delim-col.el
View file

@ -97,7 +97,7 @@
;; operates over the text rectangle selected which rectangle diagonal is ;; operates over the text rectangle selected which rectangle diagonal is
;; given by the region start and end. ;; given by the region start and end.
;; ;;
;; See `delimit-columns-format' variable documentation for column formating. ;; See `delimit-columns-format' variable documentation for column formatting.
;; ;;
;; `delimit-columns-region' is useful when you have columns of text that ;; `delimit-columns-region' is useful when you have columns of text that
;; are not well aligned, like: ;; are not well aligned, like:
@ -171,7 +171,7 @@ For examples below, consider:
Valid values are: Valid values are:
nil no formating. That is, `delimit-columns-after' is followed by nil no formatting. That is, `delimit-columns-after' is followed by
`delimit-columns-separator'. `delimit-columns-separator'.
For example, the result is: \"<ccc>:<dddd>:\" For example, the result is: \"<ccc>:<dddd>:\"
@ -190,9 +190,9 @@ Valid values are:
For example, the result is: \"<ccc >:<dddd >:\" For example, the result is: \"<ccc >:<dddd >:\"
Any other value is treated as t." Any other value is treated as t."
:type '(choice :menu-tag "Column Formating" :type '(choice :menu-tag "Column Formatting"
:tag "Column Formating" :tag "Column Formatting"
(const :tag "No Formating" nil) (const :tag "No Formatting" nil)
(const :tag "Column Alignment" t) (const :tag "Column Alignment" t)
(const :tag "Separator Alignment" separator) (const :tag "Separator Alignment" separator)
(const :tag "Column Padding" padding)) (const :tag "Column Padding" padding))
@ -404,7 +404,7 @@ START and END delimits the corners of text rectangle."
(re-search-forward delimit-columns-separator (re-search-forward delimit-columns-separator
delimit-columns-limit 'move)) delimit-columns-limit 'move))
(setq ncol (1+ ncol))) (setq ncol (1+ ncol)))
;; insert first formating ;; insert first formatting
(insert delimit-columns-str-before delimit-columns-before) (insert delimit-columns-str-before delimit-columns-before)
;; Adjust all columns but last one ;; Adjust all columns but last one
(while (progn (while (progn
@ -436,7 +436,7 @@ START and END delimits the corners of text rectangle."
(setq spaces (and delimit-columns-format (setq spaces (and delimit-columns-format
(make-string (aref delimit-columns-max ncol) (make-string (aref delimit-columns-max ncol)
?\s))))) ?\s)))))
;; insert last formating ;; insert last formatting
(cond ((null delimit-columns-format) (cond ((null delimit-columns-format)
(insert delimit-columns-after delimit-columns-str-after)) (insert delimit-columns-after delimit-columns-str-after))
((eq delimit-columns-format 'padding) ((eq delimit-columns-format 'padding)

2
lisp/emulation/cua-base.el
View file

@ -368,7 +368,7 @@ interpreted as a register number."
(defcustom cua-check-pending-input t (defcustom cua-check-pending-input t
"If non-nil, don't override prefix key if input pending. "If non-nil, don't override prefix key if input pending.
It is rumoured that `input-pending-p' is unreliable under some window It is rumored that `input-pending-p' is unreliable under some window
managers, so try setting this to nil, if prefix override doesn't work." managers, so try setting this to nil, if prefix override doesn't work."
:type 'boolean :type 'boolean
:group 'cua) :group 'cua)

2
lisp/epa-dired.el
View file

@ -67,7 +67,7 @@ If no one is selected, default secret key is used. "
(while file-list (while file-list
(epa-encrypt-file (epa-encrypt-file
(expand-file-name (car file-list)) (expand-file-name (car file-list))
(epa-select-keys (epg-make-context) "Select recipents for encryption. (epa-select-keys (epg-make-context) "Select recipients for encryption.
If no one is selected, symmetric encryption will be performed. ")) If no one is selected, symmetric encryption will be performed. "))
(setq file-list (cdr file-list))) (setq file-list (cdr file-list)))
(revert-buffer))) (revert-buffer)))

4
lisp/epa-file.el
View file

@ -235,7 +235,7 @@ encryption is used."
(current-buffer))))) (current-buffer)))))
(epa-select-keys (epa-select-keys
context context
"Select recipents for encryption. "Select recipients for encryption.
If no one is selected, symmetric encryption will be performed. " If no one is selected, symmetric encryption will be performed. "
recipients) recipients)
(if epa-file-encrypt-to (if epa-file-encrypt-to
@ -273,7 +273,7 @@ If no one is selected, symmetric encryption will be performed. "
(epg-sub-key-id (car (epg-key-sub-key-list key)))) (epg-sub-key-id (car (epg-key-sub-key-list key))))
(epa-select-keys (epa-select-keys
(epg-make-context) (epg-make-context)
"Select recipents for encryption. "Select recipients for encryption.
If no one is selected, symmetric encryption will be performed. ")))) If no one is selected, symmetric encryption will be performed. "))))
;;;###autoload ;;;###autoload

8
lisp/erc/ChangeLog.03
View file

@ -416,7 +416,7 @@
* erc-button.el: New variable erc-button-wrap-long-urls. * erc-button.el: New variable erc-button-wrap-long-urls.
Modified erc-button-add-buttons: Modified erc-button-add-buttons:
New optional argument REGEXP. New optional argument REGEXP.
If we're buttonising a URL and erc-button-wrap-long-urls is If we're buttonizing a URL and erc-button-wrap-long-urls is
non-nil, try and wrap them non-nil, try and wrap them
Modified erc-button-add-buttons-1: Modified erc-button-add-buttons-1:
@ -822,7 +822,7 @@
(define-erc-module): the enable and disable routines now update erc-modules (define-erc-module): the enable and disable routines now update erc-modules
accordingly accordingly
erc-modules: new variable controlling the modules which erc has loaded/will erc-modules: new variable controlling the modules which erc has loaded/will
load. when customising, it will automatically enable modules. it won't load. when customizing, it will automatically enable modules. it won't
automatically disable modules which are removed, yet. automatically disable modules which are removed, yet.
(erc-update-modules): enable all modules in `erc-modules' (erc-update-modules): enable all modules in `erc-modules'
@ -1058,7 +1058,7 @@
* erc.el(erc-process-input-line): * erc.el(erc-process-input-line):
when displaying the help for a function, if no when displaying the help for a function, if no
documentation exists, don't fall over documentation exists, don't fall over
(erc-cmd-SAY): new function for quoting lines begining with / (erc-cmd-SAY): new function for quoting lines beginning with /
(erc-server-NICK): (erc-server-NICK):
- fix a bug where the "is now known as" message doesn't appear on newly - fix a bug where the "is now known as" message doesn't appear on newly
created /query buffers created /query buffers
@ -1491,7 +1491,7 @@
* erc.el: * erc.el:
* removed duplicate do-no-parse-args properties for the defaliased defuns * removed duplicate do-no-parse-args properties for the defaliased defuns
(erc-process-input-line): show function signature when incorrect args (erc-process-input-line): show function signature when incorrect args
(erc-extract-command-from-line): canonicalise defaliases before extracting (erc-extract-command-from-line): canonicalize defaliases before extracting
plist plist
(erc-cmd-CLEAR): fixed (erc-cmd-CLEAR): fixed
(erc-cmd-UNIGNORE): fixed again (erc-cmd-UNIGNORE): fixed again

2
lisp/eshell/em-dirs.el
View file

@ -160,7 +160,7 @@ it's far more automatic. `pushd' allows the user to decide which
directories gets pushed, and its size is unlimited. directories gets pushed, and its size is unlimited.
`eshell-last-dir-ring' is meant for users who don't use `pushd' `eshell-last-dir-ring' is meant for users who don't use `pushd'
explicity very much, but every once in a while would like to return to explicitly very much, but every once in a while would like to return to
a previously visited directory without having to type in the whole a previously visited directory without having to type in the whole
thing again." thing again."
:type 'integer :type 'integer

2
lisp/forms.el
View file

@ -709,7 +709,7 @@ Commands: Equivalent keys in read-only mode:
(forms-first-record)) (forms-first-record))
) )
;; user customising ;; user customizing
;;(message "forms: proceeding setup (user hooks)...") ;;(message "forms: proceeding setup (user hooks)...")
(run-mode-hooks 'forms-mode-hook 'forms-mode-hooks) (run-mode-hooks 'forms-mode-hook 'forms-mode-hooks)
;;(message "forms: setting up... done.") ;;(message "forms: setting up... done.")

4
lisp/gnus/ChangeLog
View file

@ -3595,7 +3595,7 @@
(autoload): Silence byte-compiler. (autoload): Silence byte-compiler.
(nnir-open-server): Add a hook for nnir groups. (nnir-open-server): Add a hook for nnir groups.
(nnir-request-move-article): Don't mangle the header. Better to use (nnir-request-move-article): Don't mangle the header. Better to use
formating variables (which will be added in the future). formatting variables (which will be added in the future).
(nnir-registry-action): Update the registry using the original article (nnir-registry-action): Update the registry using the original article
group name. group name.
(nnir-mode): Install nnir-specific hooks for updating the registry. (nnir-mode): Install nnir-specific hooks for updating the registry.
@ -21851,7 +21851,7 @@
2004-01-06 Steve Youngs <sryoungs@bigpond.net.au> 2004-01-06 Steve Youngs <sryoungs@bigpond.net.au>
* gnus-ems.el (gnus-mode-line-modified): Don't conditionalise on * gnus-ems.el (gnus-mode-line-modified): Don't conditionalize on
XEmacs version. XEmacs version.
* dns.el (dns-make-network-process): Use `open-network-stream' * dns.el (dns-make-network-process): Use `open-network-stream'

2
lisp/gnus/plstore.el
View file

@ -420,7 +420,7 @@ SECRET-KEYS is a plist containing secret data."
(current-buffer))))) (current-buffer)))))
(epa-select-keys (epa-select-keys
context context
"Select recipents for encryption. "Select recipients for encryption.
If no one is selected, symmetric encryption will be performed. " If no one is selected, symmetric encryption will be performed. "
recipients) recipients)
(if plstore-encrypt-to (if plstore-encrypt-to

2
lisp/ibuf-ext.el
View file

@ -26,7 +26,7 @@
;;; Commentary: ;;; Commentary:
;; These functions should be automatically loaded when called, but you ;; These functions should be automatically loaded when called, but you
;; can explicity (require 'ibuf-ext) in your ~/.emacs to have them ;; can explicitly (require 'ibuf-ext) in your ~/.emacs to have them
;; preloaded. ;; preloaded.
;;; Code: ;;; Code:

2
lisp/international/mule-util.el
View file

@ -314,7 +314,7 @@ Optional 5th argument NIL-FOR-TOO-LONG non-nil means return nil
(defmacro with-coding-priority (coding-systems &rest body) (defmacro with-coding-priority (coding-systems &rest body)
"Execute BODY like `progn' with CODING-SYSTEMS at the front of priority list. "Execute BODY like `progn' with CODING-SYSTEMS at the front of priority list.
CODING-SYSTEMS is a list of coding systems. See `set-coding-system-priority'. CODING-SYSTEMS is a list of coding systems. See `set-coding-system-priority'.
This affects the implicit sorting of lists of coding sysems returned by This affects the implicit sorting of lists of coding systems returned by
operations such as `find-coding-systems-region'." operations such as `find-coding-systems-region'."
(let ((current (make-symbol "current"))) (let ((current (make-symbol "current")))
`(let ((,current (coding-system-priority-list))) `(let ((,current (coding-system-priority-list)))

2
lisp/mail/emacsbug.el
View file

@ -437,7 +437,7 @@ and send the mail again%s."
(car bug)) (car bug))
items)) items))
(nreverse items)))) (nreverse items))))
(widget-insert "No bugs maching your keywords found.\n")) (widget-insert "No bugs matching your keywords found.\n"))
(widget-insert "\n") (widget-insert "\n")
(widget-create 'push-button (widget-create 'push-button
:notify (lambda (&rest ignore) :notify (lambda (&rest ignore)

2
lisp/net/ange-ftp.el
View file

@ -2854,7 +2854,7 @@ NO-ERROR, if a listing for DIRECTORY cannot be obtained."
;; that a wasted listing is not done: ;; that a wasted listing is not done:
;; 1. When looking for a .dired file in dired-x.el. ;; 1. When looking for a .dired file in dired-x.el.
;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid ;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid
;; subdirectory. This is of course an OS dependent judgement. ;; subdirectory. This is of course an OS dependent judgment.
(defvar dired-local-variables-file) (defvar dired-local-variables-file)
(defmacro ange-ftp-allow-child-lookup (dir file) (defmacro ange-ftp-allow-child-lookup (dir file)

2
lisp/net/dbus.el
View file

@ -101,7 +101,7 @@ Otherwise, return result of last form in BODY, or all other errors."
(defvar dbus-event-error-hooks nil (defvar dbus-event-error-hooks nil
"Functions to be called when a D-Bus error happens in the event handler. "Functions to be called when a D-Bus error happens in the event handler.
Every function must accept two arguments, the event and the error variable Every function must accept two arguments, the event and the error variable
catched in `condition-case' by `dbus-error'.") caught in `condition-case' by `dbus-error'.")
;;; Hash table of registered functions. ;;; Hash table of registered functions.

6
lisp/net/tramp-sh.el
View file

@ -44,7 +44,7 @@
(defcustom tramp-inline-compress-start-size 4096 (defcustom tramp-inline-compress-start-size 4096
"*The minimum size of compressing where inline transfer. "*The minimum size of compressing where inline transfer.
When inline transfer, compress transfered data of file When inline transfer, compress transferred data of file
whose size is this value or above (up to `tramp-copy-size-limit'). whose size is this value or above (up to `tramp-copy-size-limit').
If it is nil, no compression at all will be applied." If it is nil, no compression at all will be applied."
:group 'tramp :group 'tramp
@ -3726,7 +3726,7 @@ process to set up. VEC specifies the connection."
;; Check whether the output of "uname -sr" has been changed. If ;; Check whether the output of "uname -sr" has been changed. If
;; yes, this is a strong indication that we must expire all ;; yes, this is a strong indication that we must expire all
;; connection properties. We start again with ;; connection properties. We start again with
;; `tramp-maybe-open-connection', it will be catched there. ;; `tramp-maybe-open-connection', it will be caught there.
(tramp-message vec 5 "Checking system information") (tramp-message vec 5 "Checking system information")
(let ((old-uname (tramp-get-connection-property vec "uname" nil)) (let ((old-uname (tramp-get-connection-property vec "uname" nil))
(new-uname (new-uname
@ -4215,7 +4215,7 @@ connection if a previous connection has died for some reason."
(tramp-send-command vec "echo are you awake" t t) (tramp-send-command vec "echo are you awake" t t)
(unless (and (memq (process-status p) '(run open)) (unless (and (memq (process-status p) '(run open))
(tramp-wait-for-output p 10)) (tramp-wait-for-output p 10))
;; The error will be catched locally. ;; The error will be caught locally.
(tramp-error vec 'file-error "Awake did fail"))) (tramp-error vec 'file-error "Awake did fail")))
(file-error (file-error
(tramp-flush-connection-property vec) (tramp-flush-connection-property vec)

2
lisp/net/xesam.el
View file

@ -172,7 +172,7 @@
(defface xesam-highlight '((t :inherit match)) (defface xesam-highlight '((t :inherit match))
"Face to highlight query entries. "Face to highlight query entries.
It will be overlayed by `widget-documentation-face', so it shall It will be overlaid by `widget-documentation-face', so it shall
be different at least in one face property not set in that face." be different at least in one face property not set in that face."
:group 'xesam) :group 'xesam)

8
lisp/obsolete/old-whitespace.el
View file

@ -515,12 +515,12 @@ See `whitespace-buffer' docstring for a summary of the problems."
(whitespace-check-whitespace-mode current-prefix-arg) (whitespace-check-whitespace-mode current-prefix-arg)
(if (and buffer-file-name whitespace-mode) (if (and buffer-file-name whitespace-mode)
(let ((whitespace-any nil) (let ((whitespace-any nil)
(whitespace-tabwith 8) (whitespace-tabwidth 8)
(whitespace-tabwith-saved tab-width)) (whitespace-tabwidth-saved tab-width))
;; since all printable TABS should be 8, irrespective of how ;; since all printable TABS should be 8, irrespective of how
;; they are displayed. ;; they are displayed.
(setq tab-width whitespace-tabwith) (setq tab-width whitespace-tabwidth)
(if (and whitespace-check-buffer-leading (if (and whitespace-check-buffer-leading
(whitespace-buffer-leading)) (whitespace-buffer-leading))
@ -562,7 +562,7 @@ See `whitespace-buffer' docstring for a summary of the problems."
(message "The region is now clean") (message "The region is now clean")
(message "%s is now clean" buffer-file-name))) (message "%s is now clean" buffer-file-name)))
(whitespace-update-modeline))) (whitespace-update-modeline)))
(setq tab-width whitespace-tabwith-saved)))) (setq tab-width whitespace-tabwidth-saved))))
;;;###autoload ;;;###autoload
(defun whitespace-cleanup-region (s e) (defun whitespace-cleanup-region (s e)

2
lisp/org/ChangeLog
View file

@ -7124,7 +7124,7 @@
2010-11-11 Dan Davison <davison@stats.ox.ac.uk> 2010-11-11 Dan Davison <davison@stats.ox.ac.uk>
* ob.el (org-babel-get-src-block-info): Form info list correctly * ob.el (org-babel-get-src-block-info): Form info list correctly
when parenthesised arguments are missing. when parenthesized arguments are missing.
2010-11-11 Dan Davison <davison@stats.ox.ac.uk> 2010-11-11 Dan Davison <davison@stats.ox.ac.uk>

6
lisp/org/org.el
View file

@ -2580,7 +2580,7 @@ To turn this on on a per-file basis, insert anywhere in the file:
(defcustom org-time-stamp-custom-formats (defcustom org-time-stamp-custom-formats
'("<%m/%d/%y %a>" . "<%m/%d/%y %a %H:%M>") ; american '("<%m/%d/%y %a>" . "<%m/%d/%y %a %H:%M>") ; american
"Custom formats for time stamps. See `format-time-string' for the syntax. "Custom formats for time stamps. See `format-time-string' for the syntax.
These are overlayed over the default ISO format if the variable These are overlaid over the default ISO format if the variable
`org-display-custom-times' is set. Time like %H:%M should be at the `org-display-custom-times' is set. Time like %H:%M should be at the
end of the second format. The custom formats are also honored by export end of the second format. The custom formats are also honored by export
commands, if custom time display is turned on at the time of export." commands, if custom time display is turned on at the time of export."
@ -15109,7 +15109,7 @@ The command returns the inserted time stamp."
(org-restart-font-lock) (org-restart-font-lock)
(setq org-table-may-need-update t) (setq org-table-may-need-update t)
(if org-display-custom-times (if org-display-custom-times
(message "Time stamps are overlayed with custom format") (message "Time stamps are overlaid with custom format")
(message "Time stamp overlays removed"))) (message "Time stamp overlays removed")))
(defun org-display-custom-time (beg end) (defun org-display-custom-time (beg end)
@ -18961,7 +18961,7 @@ contexts are:
:target on a <<target>> :target on a <<target>>
:radio-target on a <<<radio-target>>> :radio-target on a <<<radio-target>>>
:latex-fragment on a LaTeX fragment :latex-fragment on a LaTeX fragment
:latex-preview on a LaTeX fragment with overlayed preview image :latex-preview on a LaTeX fragment with overlaid preview image
This function expects the position to be visible because it uses font-lock This function expects the position to be visible because it uses font-lock
faces as a help to recognize the following contexts: :table-special, :link, faces as a help to recognize the following contexts: :table-special, :link,

2
lisp/proced.el
View file

@ -1332,7 +1332,7 @@ Prefix ARG controls sort order, see `proced-sort-interactive'."
(proced-sort-interactive key arg) (proced-sort-interactive key arg)
(message "No sorter defined here.")))))) (message "No sorter defined here."))))))
;;; Formating ;;; Formatting
(defun proced-format-time (time) (defun proced-format-time (time)
"Format time interval TIME." "Format time interval TIME."

6
lisp/progmodes/ada-mode.el
View file

@ -499,7 +499,7 @@ Used to define `ada-*-keywords.'"))
(defvar ada-case-exception-substring '() (defvar ada-case-exception-substring '()
"Alist of substrings (entities) that have special casing. "Alist of substrings (entities) that have special casing.
The substrings are detected for word constituant when the word The substrings are detected for word constituent when the word
is not itself in `ada-case-exception', and only for substrings that is not itself in `ada-case-exception', and only for substrings that
either are at the beginning or end of the word, or start after '_'.") either are at the beginning or end of the word, or start after '_'.")
@ -1773,7 +1773,7 @@ ATTENTION: This function might take very long for big buffers!"
;; `ada-insert-paramlist'. ;; `ada-insert-paramlist'.
;; Both steps are called from `ada-format-paramlist'. ;; Both steps are called from `ada-format-paramlist'.
;; Note: Comments inside the parameter list are lost. ;; Note: Comments inside the parameter list are lost.
;; The syntax has to be correct, or the reformating will fail. ;; The syntax has to be correct, or the reformatting will fail.
;;-------------------------------------------------------------- ;;--------------------------------------------------------------
(defun ada-format-paramlist () (defun ada-format-paramlist ()
@ -2139,7 +2139,7 @@ command like:
(while command-line-args-left (while command-line-args-left
(let ((source (car command-line-args-left))) (let ((source (car command-line-args-left)))
(message "Formating %s" source) (message "Formatting %s" source)
(find-file source) (find-file source)
(ada-indent-region (point-min) (point-max)) (ada-indent-region (point-min) (point-max))
(ada-adjust-case-buffer) (ada-adjust-case-buffer)

2
lisp/progmodes/ada-xref.el
View file

@ -30,7 +30,7 @@
;;; for lookup and completion in Ada mode. ;;; for lookup and completion in Ada mode.
;;; ;;;
;;; If a file *.`adp' exists in the ada-file directory, then it is ;;; If a file *.`adp' exists in the ada-file directory, then it is
;;; read for configuration informations. It is read only the first ;;; read for configuration information. It is read only the first
;;; time a cross-reference is asked for, and is not read later. ;;; time a cross-reference is asked for, and is not read later.
;;; You need Emacs >= 20.2 to run this package ;;; You need Emacs >= 20.2 to run this package

2
lisp/progmodes/cc-awk.el
View file

@ -545,7 +545,7 @@
(defun c-awk-vsemi-status-unknown-p () (defun c-awk-vsemi-status-unknown-p ()
;; Are we unsure whether there is a virtual semicolon on the current line? ;; Are we unsure whether there is a virtual semicolon on the current line?
;; DO NOT under any circumstances attempt to calculate this; that would ;; DO NOT under any circumstances attempt to calculate this; that would
;; defeat the (admittedly kludgey) purpose of this function, which is to ;; defeat the (admittedly kludgy) purpose of this function, which is to
;; prevent an infinite recursion in c-beginning-of-statement-1 when point ;; prevent an infinite recursion in c-beginning-of-statement-1 when point
;; starts at a `while' token. ;; starts at a `while' token.
(not (c-get-char-property (c-point 'eol) 'c-awk-NL-prop))) (not (c-get-char-property (c-point 'eol) 'c-awk-NL-prop)))

2
lisp/progmodes/cc-cmds.el
View file

@ -1360,7 +1360,7 @@ No indentation or other \"electric\" behavior is performed."
;; Determine where we are with respect to functions (or other brace ;; Determine where we are with respect to functions (or other brace
;; constructs, included in the term "function" in the rest of this comment). ;; constructs, included in the term "function" in the rest of this comment).
;; Point is assumed to be outside any macro or literal. ;; Point is assumed to be outside any macro or literal.
;; This is used by c-\(begining\|end\)-of-defun. ;; This is used by c-\(beginning\|end\)-of-defun.
;; ;;
;; Return one of these symbols: ;; Return one of these symbols:
;; at-header : we're at the start of a function's header. ;; at-header : we're at the start of a function's header.

2
lisp/progmodes/cc-engine.el
View file

@ -2113,7 +2113,7 @@ comment at the start of cc-engine.el for more info."
;; buffer). Otherwise, return nil. ;; buffer). Otherwise, return nil.
;; ;;
;; This function is almost the same as `c-literal-limits'. It differs in ;; This function is almost the same as `c-literal-limits'. It differs in
;; that it is a lower level function, and that it rigourously follows the ;; that it is a lower level function, and that it rigorously follows the
;; syntax from BOB, whereas `c-literal-limits' uses a "local" safe position. ;; syntax from BOB, whereas `c-literal-limits' uses a "local" safe position.
;; ;;
;; NOTE: This function manipulates `c-state-nonlit-pos-cache'. This cache ;; NOTE: This function manipulates `c-state-nonlit-pos-cache'. This cache

2
lisp/progmodes/cc-fonts.el
View file

@ -1211,7 +1211,7 @@ casts and declarations are fontified. Used on level 2 and higher."
;; o - '<> if the arglist is of angle bracket type; ;; o - '<> if the arglist is of angle bracket type;
;; o - 'arglist if it's some other arglist; ;; o - 'arglist if it's some other arglist;
;; o - nil, if not in an arglist at all. This includes the ;; o - nil, if not in an arglist at all. This includes the
;; parenthesised condition which follows "if", "while", etc. ;; parenthesized condition which follows "if", "while", etc.
context context
;; The position of the next token after the closing paren of ;; The position of the next token after the closing paren of
;; the last detected cast. ;; the last detected cast.

2
lisp/progmodes/cc-langs.el
View file

@ -522,7 +522,7 @@ don't have EOL terminated statements. "
(c-lang-defconst c-vsemi-status-unknown-p-fn (c-lang-defconst c-vsemi-status-unknown-p-fn
"Contains a function \"are we unsure whether there is a virtual semicolon on this line?\". "Contains a function \"are we unsure whether there is a virtual semicolon on this line?\".
The (admittedly kludgey) purpose of such a function is to prevent an infinite The (admittedly kludgy) purpose of such a function is to prevent an infinite
recursion in c-beginning-of-statement-1 when point starts at a `while' token. recursion in c-beginning-of-statement-1 when point starts at a `while' token.
The function MUST NOT UNDER ANY CIRCUMSTANCES call c-beginning-of-statement-1, The function MUST NOT UNDER ANY CIRCUMSTANCES call c-beginning-of-statement-1,
even indirectly. This variable contains nil for languages which don't have even indirectly. This variable contains nil for languages which don't have

2
lisp/progmodes/cc-mode.el
View file

@ -943,7 +943,7 @@ Note that the style variables are always made local to the buffer."
;; Note that this function must be FAST rather than accurate. Note ;; Note that this function must be FAST rather than accurate. Note
;; also that it only has any effect when font locking is enabled. ;; also that it only has any effect when font locking is enabled.
;; We exploit this by checking for font-lock-*-face instead of doing ;; We exploit this by checking for font-lock-*-face instead of doing
;; rigourous syntactic analysis. ;; rigorous syntactic analysis.
;; If either change boundary is wholly inside an identifier, delete ;; If either change boundary is wholly inside an identifier, delete
;; it/them from the cache. Don't worry about being inside a string ;; it/them from the cache. Don't worry about being inside a string

2
lisp/progmodes/grep.el
View file

@ -108,7 +108,7 @@ To change the default value, use Customize or call the function
Setting it causes the grep commands to put point at the end of their Setting it causes the grep commands to put point at the end of their
output window so that the end of the output is always visible rather output window so that the end of the output is always visible rather
than the begining." than the beginning."
:type 'boolean :type 'boolean
:version "22.1" :version "22.1"
:group 'grep) :group 'grep)

4
lisp/progmodes/gud.el
View file

@ -1919,7 +1919,7 @@ extension EXTN. Normally EXTN is given as the regular expression
;; in petticoat junction. ;; in petticoat junction.
(defun gud-jdb-skip-block () (defun gud-jdb-skip-block ()
;; Find the begining of the block. ;; Find the beginning of the block.
(while (while
(not (eq (following-char) ?{)) (not (eq (following-char) ?{))
@ -1936,7 +1936,7 @@ extension EXTN. Normally EXTN is given as the regular expression
(gud-jdb-skip-character-literal)) (gud-jdb-skip-character-literal))
(t (forward-char)))) (t (forward-char))))
;; Now at the begining of the block. ;; Now at the beginning of the block.
(forward-char) (forward-char)
;; Skip over the body of the block as well as the final brace. ;; Skip over the body of the block as well as the final brace.

2
lisp/progmodes/hideif.el
View file

@ -822,7 +822,7 @@ Point is left unchanged."
(defun hif-possibly-hide () (defun hif-possibly-hide ()
"Called at #ifX expression, this hides those parts that should be hidden. "Called at #ifX expression, this hides those parts that should be hidden.
It uses the judgement of `hide-ifdef-evaluator'." It uses the judgment of `hide-ifdef-evaluator'."
;; (message "hif-possibly-hide") (sit-for 1) ;; (message "hif-possibly-hide") (sit-for 1)
(let ((test (hif-canonicalize)) (let ((test (hif-canonicalize))
(range (hif-find-range))) (range (hif-find-range)))

2
lisp/progmodes/inf-lisp.el
View file

@ -36,7 +36,7 @@
;; This makes these modes easier to use. ;; This makes these modes easier to use.
;; For documentation on the functionality provided by comint mode, and ;; For documentation on the functionality provided by comint mode, and
;; the hooks available for customising it, see the file comint.el. ;; the hooks available for customizing it, see the file comint.el.
;; For further information on inferior-lisp mode, see the comments below. ;; For further information on inferior-lisp mode, see the comments below.
;; Needs fixin: ;; Needs fixin:

18
lisp/progmodes/vhdl-mode.el
View file

@ -10812,7 +10812,7 @@ but not if inside a comment or quote."
(defvar vhdl-port-list nil (defvar vhdl-port-list nil
"Variable to hold last port map parsed.") "Variable to hold last port map parsed.")
;; structure: (parenthesised expression means list of such entries) ;; structure: (parenthesized expression means list of such entries)
;; (ent-name ;; (ent-name
;; ((generic-names) generic-type generic-init generic-comment group-comment) ;; ((generic-names) generic-type generic-init generic-comment group-comment)
;; ((port-names) port-object port-direct port-type port-comment group-comment) ;; ((port-names) port-object port-direct port-type port-comment group-comment)
@ -11660,7 +11660,7 @@ reflected in a subsequent paste operation."
(defvar vhdl-subprog-list nil (defvar vhdl-subprog-list nil
"Variable to hold last subprogram interface parsed.") "Variable to hold last subprogram interface parsed.")
;; structure: (parenthesised expression means list of such entries) ;; structure: (parenthesized expression means list of such entries)
;; (subprog-name kind ;; (subprog-name kind
;; ((names) object direct type init comment group-comment) ;; ((names) object direct type init comment group-comment)
;; return-type return-comment group-comment) ;; return-type return-comment group-comment)
@ -12971,7 +12971,7 @@ This does background highlighting of translate-off regions.")
(defvar vhdl-entity-alist nil (defvar vhdl-entity-alist nil
"Cache with entities and corresponding architectures for each "Cache with entities and corresponding architectures for each
project/directory.") project/directory.")
;; structure: (parenthesised expression means list of such entries) ;; structure: (parenthesized expression means list of such entries)
;; (cache-key ;; (cache-key
;; (ent-key ent-name ent-file ent-line ;; (ent-key ent-name ent-file ent-line
;; (arch-key arch-name arch-file arch-line ;; (arch-key arch-name arch-file arch-line
@ -12982,7 +12982,7 @@ project/directory.")
(defvar vhdl-config-alist nil (defvar vhdl-config-alist nil
"Cache with configurations for each project/directory.") "Cache with configurations for each project/directory.")
;; structure: (parenthesised expression means list of such entries) ;; structure: (parenthesized expression means list of such entries)
;; (cache-key ;; (cache-key
;; (conf-key conf-name conf-file conf-line ent-key arch-key ;; (conf-key conf-name conf-file conf-line ent-key arch-key
;; (inst-key inst-comp-name inst-ent-key inst-arch-key ;; (inst-key inst-comp-name inst-ent-key inst-arch-key
@ -12991,7 +12991,7 @@ project/directory.")
(defvar vhdl-package-alist nil (defvar vhdl-package-alist nil
"Cache with packages for each project/directory.") "Cache with packages for each project/directory.")
;; structure: (parenthesised expression means list of such entries) ;; structure: (parenthesized expression means list of such entries)
;; (cache-key ;; (cache-key
;; (pack-key pack-name pack-file pack-line ;; (pack-key pack-name pack-file pack-line
;; (comp-key comp-name comp-file comp-line) ;; (comp-key comp-name comp-file comp-line)
@ -13003,19 +13003,19 @@ project/directory.")
(defvar vhdl-ent-inst-alist nil (defvar vhdl-ent-inst-alist nil
"Cache with instantiated entities for each project/directory.") "Cache with instantiated entities for each project/directory.")
;; structure: (parenthesised expression means list of such entries) ;; structure: (parenthesized expression means list of such entries)
;; (cache-key (inst-ent-key)) ;; (cache-key (inst-ent-key))
(defvar vhdl-file-alist nil (defvar vhdl-file-alist nil
"Cache with design units in each file for each project/directory.") "Cache with design units in each file for each project/directory.")
;; structure: (parenthesised expression means list of such entries) ;; structure: (parenthesized expression means list of such entries)
;; (cache-key ;; (cache-key
;; (file-name (ent-list) (arch-list) (arch-ent-list) (conf-list) ;; (file-name (ent-list) (arch-list) (arch-ent-list) (conf-list)
;; (pack-list) (pack-body-list) (inst-list) (inst-ent-list)) ;; (pack-list) (pack-body-list) (inst-list) (inst-ent-list))
(defvar vhdl-directory-alist nil (defvar vhdl-directory-alist nil
"Cache with source directories for each project.") "Cache with source directories for each project.")
;; structure: (parenthesised expression means list of such entries) ;; structure: (parenthesized expression means list of such entries)
;; (cache-key (directory)) ;; (cache-key (directory))
(defvar vhdl-speedbar-shown-unit-alist nil (defvar vhdl-speedbar-shown-unit-alist nil
@ -13655,7 +13655,7 @@ of PROJECT."
(vhdl-speedbar-update-current-unit) (vhdl-speedbar-update-current-unit)
(when updated (message "Updating hierarchy...done"))))) (when updated (message "Updating hierarchy...done")))))
;; structure (parenthesised expression means list of such entries) ;; structure (parenthesized expression means list of such entries)
;; (inst-key inst-file-marker comp-ent-key comp-ent-file-marker ;; (inst-key inst-file-marker comp-ent-key comp-ent-file-marker
;; comp-arch-key comp-arch-file-marker comp-conf-key comp-conf-file-marker ;; comp-arch-key comp-arch-file-marker comp-conf-key comp-conf-file-marker
;; comp-lib-name level) ;; comp-lib-name level)

2
lisp/shell.el
View file

@ -35,7 +35,7 @@
;; This makes these modes easier to use. ;; This makes these modes easier to use.
;; For documentation on the functionality provided by comint mode, and ;; For documentation on the functionality provided by comint mode, and
;; the hooks available for customising it, see the file comint.el. ;; the hooks available for customizing it, see the file comint.el.
;; For further information on shell mode, see the comments below. ;; For further information on shell mode, see the comments below.
;; Needs fixin: ;; Needs fixin:

2
lisp/url/url-cookie.el
View file

@ -316,7 +316,7 @@ telling Microsoft that."
(set (if (> trusted untrusted) 'untrusted 'trusted) nil)) (set (if (> trusted untrusted) 'untrusted 'trusted) nil))
(cond (cond
(untrusted (untrusted
;; The site was explicity marked as untrusted by the user. ;; The site was explicitly marked as untrusted by the user.
nil) nil)
((or (eq url-privacy-level 'paranoid) ((or (eq url-privacy-level 'paranoid)
(and (listp url-privacy-level) (memq 'cookies url-privacy-level))) (and (listp url-privacy-level) (memq 'cookies url-privacy-level)))

1
lisp/url/url-vars.el
View file

@ -62,7 +62,6 @@
(mapc 'make-variable-buffer-local (mapc 'make-variable-buffer-local
'( '(
url-current-object url-current-object
url-current-referer
url-current-mime-headers url-current-mime-headers
)) ))

6
src/ChangeLog.10
View file

@ -15816,14 +15816,14 @@
Add prototypes. Add prototypes.
* macterm.c (mac_draw_bitmap): Add overlay_p arg. * macterm.c (mac_draw_bitmap): Add overlay_p arg.
(x_draw_fringe_bitmap): Handle overlayed fringe bitmaps; (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps;
thanks to YAMAMOTO Mitsuharu for advice on how to do this. thanks to YAMAMOTO Mitsuharu for advice on how to do this.
Use cursor color for displaying cursor in fringe. Use cursor color for displaying cursor in fringe.
(x_redisplay_interface): Add null handlers for (x_redisplay_interface): Add null handlers for
define_fringe_bitmap and destroy_fringe_bitmap functions. define_fringe_bitmap and destroy_fringe_bitmap functions.
* w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from * w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from
xterm.c to handle overlayed fringe bitmaps and to use cursor color xterm.c to handle overlaid fringe bitmaps and to use cursor color
for displaying cursor in fringe. for displaying cursor in fringe.
(w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32 (w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32
specific functions to define and destroy fringe bitmaps in fringe_bmp. specific functions to define and destroy fringe bitmaps in fringe_bmp.
@ -15849,7 +15849,7 @@
(display_line): Handle cursor in fringe at eob. (display_line): Handle cursor in fringe at eob.
(display_line): Set row user fringe bitmaps from iterator. (display_line): Set row user fringe bitmaps from iterator.
* xterm.c (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps. * xterm.c (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps.
Use cursor color for displaying cursor in fringe. Use cursor color for displaying cursor in fringe.
(x_redisplay_interface): Add null handlers for (x_redisplay_interface): Add null handlers for
define_fringe_bitmap and destroy_fringe_bitmap functions. define_fringe_bitmap and destroy_fringe_bitmap functions.

6
src/ChangeLog.2
View file

@ -2254,7 +2254,7 @@
Initialize save_color. Initialize save_color.
* fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c: * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c:
Delete/replace unused/conditionalised variables Delete/replace unused/conditionalized variables
1987-01-15 Richard M. Stallman (rms@prep) 1987-01-15 Richard M. Stallman (rms@prep)
@ -2632,7 +2632,7 @@
* fns.c: Fding requires an arg; pass Qnil. * fns.c: Fding requires an arg; pass Qnil.
* m-alliant.h: define TEXT_START as 0x1000. * m-alliant.h: define TEXT_START as 0x1000.
Don't define LIBS_STANDARD; the default (sharable) library Don't define LIBS_STANDARD; the default (shareable) library
is said to work now. is said to work now.
* alloc.c (mark_object): Now pass address of slot being marked. * alloc.c (mark_object): Now pass address of slot being marked.
@ -4220,7 +4220,7 @@
Increase PURESIZE again (sigh) Increase PURESIZE again (sigh)
* unexec.c (write_segment): * unexec.c (write_segment):
Kludgey coercions ("(int)") to get this line to compile: Kludgy coercions ("(int)") to get this line to compile:
nwrite = (((int) ptr + 128) & ~127) - (int) ptr; nwrite = (((int) ptr + 128) & ~127) - (int) ptr;
Also changed incorrect ~128 to ~127. Also changed incorrect ~128 to ~127.

2
src/alloc.c
View file

@ -6399,7 +6399,7 @@ If this portion is smaller than `gc-cons-threshold', this is ignored. */);
Vgc_cons_percentage = make_float (0.1); Vgc_cons_percentage = make_float (0.1);
DEFVAR_INT ("pure-bytes-used", pure_bytes_used, DEFVAR_INT ("pure-bytes-used", pure_bytes_used,
doc: /* Number of bytes of sharable Lisp data allocated so far. */); doc: /* Number of bytes of shareable Lisp data allocated so far. */);
DEFVAR_INT ("cons-cells-consed", cons_cells_consed, DEFVAR_INT ("cons-cells-consed", cons_cells_consed,
doc: /* Number of cons cells that have been consed so far. */); doc: /* Number of cons cells that have been consed so far. */);

2
src/editfns.c
View file

@ -3870,7 +3870,7 @@ usage: (format STRING &rest OBJECTS) */)
enum enum
{ {
/* Maximum precision for a %f conversion such that the /* Maximum precision for a %f conversion such that the
trailing output digit might be nonzero. Any precisions trailing output digit might be nonzero. Any precision
larger than this will not yield useful information. */ larger than this will not yield useful information. */
USEFUL_PRECISION_MAX = USEFUL_PRECISION_MAX =
((1 - DBL_MIN_EXP) ((1 - DBL_MIN_EXP)

2
src/emacs.c
View file

@ -951,7 +951,7 @@ main (int argc, char **argv)
} }
/* Command line option --no-windows is deprecated and thus not mentioned /* Command line option --no-windows is deprecated and thus not mentioned
in the manual and usage informations. */ in the manual and usage information. */
if (argmatch (argv, argc, "-nw", "--no-window-system", 6, NULL, &skip_args) if (argmatch (argv, argc, "-nw", "--no-window-system", 6, NULL, &skip_args)
|| argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args)) || argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args))
inhibit_window_system = 1; inhibit_window_system = 1;

2
src/fontset.c
View file

@ -643,7 +643,7 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face, int id, int fa
if (font_has_char (f, font_object, c)) if (font_has_char (f, font_object, c))
goto found; goto found;
/* Find a font already opened, maching with the current spec, /* Find a font already opened, matching with the current spec,
and supporting C. */ and supporting C. */
font_def = RFONT_DEF_FONT_DEF (rfont_def); font_def = RFONT_DEF_FONT_DEF (rfont_def);
for (; found_index + 1 < ASIZE (vec); found_index++) for (; found_index + 1 < ASIZE (vec); found_index++)

2
src/ftfont.c
View file

@ -960,7 +960,7 @@ ftfont_list (Lisp_Object frame, Lisp_Object spec)
/* Need fix because this finds any fonts. */ /* Need fix because this finds any fonts. */
if (fontset->nfont == 0 && ! NILP (family)) if (fontset->nfont == 0 && ! NILP (family))
{ {
/* Try maching with configuration. For instance, the /* Try matching with configuration. For instance, the
configuration may specify "Nimbus Mono L" as an alias of configuration may specify "Nimbus Mono L" as an alias of
"Courier". */ "Courier". */
FcPattern *pat = FcPatternBuild (0, FC_FAMILY, FcTypeString, FcPattern *pat = FcPatternBuild (0, FC_FAMILY, FcTypeString,

3
src/lastfile.c
View file

@ -23,7 +23,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
The files of Emacs are written so as to have no initialized The files of Emacs are written so as to have no initialized
data that can ever need to be altered except at the first startup. data that can ever need to be altered except at the first startup.
This is so that those words can be dumped as sharable text. This is so that those words can be dumped as shareable text.
It is not possible to exercise such control over library files. It is not possible to exercise such control over library files.
So it is necessary to refrain from making their data areas shared. So it is necessary to refrain from making their data areas shared.
@ -47,4 +47,3 @@ char my_endbss[1];
of the bss area used by Emacs. */ of the bss area used by Emacs. */
static char _my_endbss[1]; static char _my_endbss[1];
char * my_endbss_static = _my_endbss; char * my_endbss_static = _my_endbss;

2
src/lread.c
View file

@ -2822,7 +2822,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
So we now use the same heuristic as for backquote: old-style So we now use the same heuristic as for backquote: old-style
unquotes are only recognized when first on a list, and when unquotes are only recognized when first on a list, and when
followed by a space. followed by a space.
Because it's more difficult to peak 2 chars ahead, a new-style Because it's more difficult to peek 2 chars ahead, a new-style
,@ can still not be used outside of a `, unless it's in the middle ,@ can still not be used outside of a `, unless it's in the middle
of a list. */ of a list. */
if (new_backquote_flag if (new_backquote_flag

2
src/nsfont.m
View file

@ -630,7 +630,7 @@ nsfont_list (Lisp_Object frame, Lisp_Object font_spec)
} }
/* Return a font entity most closely maching with FONT_SPEC on /* Return a font entity most closely matching with FONT_SPEC on
FRAME. The closeness is determined by the font backend, thus FRAME. The closeness is determined by the font backend, thus
`face-font-selection-order' is ignored here. `face-font-selection-order' is ignored here.
Properties to be considered are same as for list(). */ Properties to be considered are same as for list(). */

4
src/region-cache.c
View file

@ -699,7 +699,7 @@ know_region_cache (struct buffer *buf, struct region_cache *c,
/* Return true if the text immediately after POS in BUF is known, for /* Return true if the text immediately after POS in BUF is known, for
the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest
position after POS where the knownness changes. */ position after POS where the knowledge changes. */
int int
region_cache_forward (struct buffer *buf, struct region_cache *c, region_cache_forward (struct buffer *buf, struct region_cache *c,
ptrdiff_t pos, ptrdiff_t *next) ptrdiff_t pos, ptrdiff_t *next)
@ -736,7 +736,7 @@ region_cache_forward (struct buffer *buf, struct region_cache *c,
/* Return true if the text immediately before POS in BUF is known, for /* Return true if the text immediately before POS in BUF is known, for
the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest
position before POS where the knownness changes. */ position before POS where the knowledge changes. */
int region_cache_backward (struct buffer *buf, struct region_cache *c, int region_cache_backward (struct buffer *buf, struct region_cache *c,
ptrdiff_t pos, ptrdiff_t *next) ptrdiff_t pos, ptrdiff_t *next)
{ {

4
src/region-cache.h
View file

@ -97,7 +97,7 @@ extern void invalidate_region_cache (struct buffer *BUF,
/* Return true if the text immediately after POS in BUF is known, for /* Return true if the text immediately after POS in BUF is known, for
the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest
position after POS where the knownness changes. */ position after POS where the knowledge changes. */
extern int region_cache_forward (struct buffer *BUF, extern int region_cache_forward (struct buffer *BUF,
struct region_cache *CACHE, struct region_cache *CACHE,
ptrdiff_t POS, ptrdiff_t POS,
@ -105,7 +105,7 @@ extern int region_cache_forward (struct buffer *BUF,
/* Return true if the text immediately before POS in BUF is known, for /* Return true if the text immediately before POS in BUF is known, for
the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest
position before POS where the knownness changes. */ position before POS where the knowledge changes. */
extern int region_cache_backward (struct buffer *BUF, extern int region_cache_backward (struct buffer *BUF,
struct region_cache *CACHE, struct region_cache *CACHE,
ptrdiff_t POS, ptrdiff_t POS,

4
src/termhooks.h
View file

@ -553,7 +553,7 @@ struct terminal
/* Arrange for all scroll bars on FRAME to be removed at the next call /* Arrange for all scroll bars on FRAME to be removed at the next call
to `*judge_scroll_bars_hook'. A scroll bar may be spared if to `*judge_scroll_bars_hook'. A scroll bar may be spared if
`*redeem_scroll_bar_hook' is applied to its window before the judgement. `*redeem_scroll_bar_hook' is applied to its window before the judgment.
This should be applied to each frame each time its window tree is This should be applied to each frame each time its window tree is
redisplayed, even if it is not displaying scroll bars at the moment; redisplayed, even if it is not displaying scroll bars at the moment;
@ -565,7 +565,7 @@ struct terminal
currently displaying them. */ currently displaying them. */
void (*condemn_scroll_bars_hook) (struct frame *frame); void (*condemn_scroll_bars_hook) (struct frame *frame);
/* Unmark WINDOW's scroll bar for deletion in this judgement cycle. /* Unmark WINDOW's scroll bar for deletion in this judgment cycle.
Note that it's okay to redeem a scroll bar that is not condemned. */ Note that it's okay to redeem a scroll bar that is not condemned. */
void (*redeem_scroll_bar_hook) (struct window *window); void (*redeem_scroll_bar_hook) (struct window *window);

8
src/xfns.c
View file

@ -1877,7 +1877,7 @@ static XIMStyle supported_xim_styles[] =
#if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT #if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT
/* Create an X fontset on frame F with base font name BASE_FONTNAME. */ /* Create an X fontset on frame F with base font name BASE_FONTNAME. */
static const char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; static const char xic_default_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";
/* Create an Xt fontset spec from the name of a base font. /* Create an Xt fontset spec from the name of a base font.
If `motif' is True use the Motif syntax. */ If `motif' is True use the Motif syntax. */
@ -1888,7 +1888,7 @@ xic_create_fontsetname (const char *base_fontname, int motif)
char *fontsetname; char *fontsetname;
/* Make a fontset name from the base font name. */ /* Make a fontset name from the base font name. */
if (xic_defaut_fontset == base_fontname) if (xic_default_fontset == base_fontname)
{ /* There is no base font name, use the default. */ { /* There is no base font name, use the default. */
ptrdiff_t len = strlen (base_fontname) + 2; ptrdiff_t len = strlen (base_fontname) + 2;
fontsetname = xmalloc (len); fontsetname = xmalloc (len);
@ -1912,12 +1912,12 @@ xic_create_fontsetname (const char *base_fontname, int motif)
modify it to generalize it to allcs and allfamilies. modify it to generalize it to allcs and allfamilies.
Use the specified font plus the default. */ Use the specified font plus the default. */
ptrdiff_t len = ptrdiff_t len =
strlen (base_fontname) + strlen (xic_defaut_fontset) + 3; strlen (base_fontname) + strlen (xic_default_fontset) + 3;
fontsetname = xmalloc (len); fontsetname = xmalloc (len);
memset (fontsetname, 0, len); memset (fontsetname, 0, len);
strcpy (fontsetname, base_fontname); strcpy (fontsetname, base_fontname);
strcat (fontsetname, sep); strcat (fontsetname, sep);
strcat (fontsetname, xic_defaut_fontset); strcat (fontsetname, xic_default_fontset);
} }
else else
{ {