summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-07-02 01:00:05 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-07-02 01:00:05 -0700
commite3ac128172da6ced7930b8c99d7bf1f2da19cac2 (patch)
tree6a875ae0dfb2987b7b25fd815ed5ff2e66e58878
parent3b3e4caca71abc2df49f95090aaccb96cbb75a41 (diff)
downloademacs-e3ac128172da6ced7930b8c99d7bf1f2da19cac2.tar.gz
emacs-e3ac128172da6ced7930b8c99d7bf1f2da19cac2.tar.bz2
emacs-e3ac128172da6ced7930b8c99d7bf1f2da19cac2.zip
Spelling fixes.
-rw-r--r--etc/NEWS4
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/emacs-lisp/byte-opt.el2
-rw-r--r--lisp/emacs-lisp/bytecomp.el6
-rw-r--r--lisp/loadup.el6
-rw-r--r--lisp/net/ange-ftp.el8
-rw-r--r--lisp/org/ChangeLog2
-rw-r--r--src/dosfns.c3
-rw-r--r--src/msdos.c2
9 files changed, 22 insertions, 17 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 89cbe4ec584..d66be111956 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -164,8 +164,8 @@ character when doing minibuffer filename prompts.
The variables `term-default-fg-color' and `term-default-bg-color' are
now deprecated in favor of the `term-face' face, that you can
-customize. Also, it is now possible to cutomize how are displayed the
-ANSI terminal colors and styles by cutomizing the corresponding
+customize. Also, it is now possible to customize how are displayed the
+ANSI terminal colors and styles by customizing the corresponding
`term-color-<COLOR>', `term-color-underline' and `term-color-bold'
faces.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6ad29309e7..cb09a630096 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-02 Paul Eggert <eggert@cs.ucla.edu>
+
+ Spelling fixes.
+ * emacs-lisp/bytecomp.el (byte-compile--reify-function):
+ Rename from byte-compile--refiy-function. All uses changed.
+
2012-07-01 Chong Yidong <cyd@gnu.org>
* xml.el (xml--parse-buffer): New function. Move most of
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 106946b0037..8822c03c103 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -284,7 +284,7 @@
;; been preprocessed!
`(function ,fn)
(byte-compile-preprocess
- (byte-compile--refiy-function fn)))))
+ (byte-compile--reify-function fn)))))
(if (eq (car-safe newfn) 'function)
(byte-compile-unfold-lambda `(,(cadr newfn) ,@(cdr form)))
(byte-compile-log-warning
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index af7bc81fef0..71b61ec74cc 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2367,7 +2367,7 @@ not to take responsibility for the actual compilation of the code."
;;(byte-compile-set-symbol-position name)
(byte-compile-warn "probable `\"' without `\\' in doc string of %s"
name))
-
+
(if (not (listp body))
;; The precise definition requires evaluation to find out, so it
;; will only be known at runtime.
@@ -2451,7 +2451,7 @@ If QUOTED is non-nil, print with quoting; otherwise, print without quoting."
(- (position-bytes (point)) (point-min) -1)
(goto-char (point-max))))))
-(defun byte-compile--refiy-function (fun)
+(defun byte-compile--reify-function (fun)
"Return an expression which will evaluate to a function value FUN.
FUN should be either a `lambda' value or a `closure' value."
(pcase-let* (((or (and `(lambda ,args . ,body) (let env nil))
@@ -2488,7 +2488,7 @@ If FORM is a lambda or a macro, byte-compile it as a function."
(when (symbolp form)
(unless (memq (car-safe fun) '(closure lambda))
(error "Don't know how to compile %S" fun))
- (setq fun (byte-compile--refiy-function fun))
+ (setq fun (byte-compile--reify-function fun))
(setq lexical-binding (eq (car fun) 'closure)))
(unless (eq (car-safe fun) 'lambda)
(error "Don't know how to compile %S" fun))
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 11e5f1e5833..b24e3ccf7f7 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -256,12 +256,12 @@
(load "site-load" t)
;; ¡¡¡ Big Ugly Hack !!!
-;; src/boostrap-emacs is mostly used to compile .el files, so it needs
+;; src/bootstrap-emacs is mostly used to compile .el files, so it needs
;; macroexp, bytecomp, cconv, and byte-opt to be fast. Generally this is done
;; by compiling those files first, but this only makes a difference if those
;; files are not preloaded. As it so happens, macroexp.el tends to be
-;; accidentally preloaded in src/boostrap-emacs because cl.el and cl-macs.el
-;; require it. So lets unload it here, if needed, to make sure the
+;; accidentally preloaded in src/bootstrap-emacs because cl.el and cl-macs.el
+;; require it. So let's unload it here, if needed, to make sure the
;; byte-compiled version is used.
(if (or (not (fboundp 'macroexpand-all))
(byte-code-function-p (symbol-function 'macroexpand-all)))
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 16ebff1cce5..478261d02d0 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1201,7 +1201,7 @@ only return the directory part of FILE."
(defun ange-ftp-get-passwd (host user)
"Return the password for specified HOST and USER, asking user if necessary."
;; If `non-essential' is non-nil, don't ask for a password. It will
- ;; be catched in Tramp.
+ ;; be caught in Tramp.
(when non-essential
(throw 'non-essential 'non-essential))
@@ -1781,7 +1781,7 @@ good, skip, fatal, or unknown."
(defun ange-ftp-gwp-start (host user name args)
"Login to the gateway machine and fire up an FTP process."
;; If `non-essential' is non-nil, don't reopen a new connection. It
- ;; will be catched in Tramp.
+ ;; will be caught in Tramp.
(when non-essential
(throw 'non-essential 'non-essential))
(let (;; It would be nice to make process-connection-type nil,
@@ -1916,7 +1916,7 @@ been queued with no result. CONT will still be called, however."
If HOST is only FTP-able through a gateway machine then spawn a shell
on the gateway machine to do the FTP instead."
;; If `non-essential' is non-nil, don't reopen a new connection. It
- ;; will be catched in Tramp.
+ ;; will be caught in Tramp.
(when non-essential
(throw 'non-essential 'non-essential))
(let* ((use-gateway (ange-ftp-use-gateway-p host))
@@ -2138,7 +2138,7 @@ Create a new process if needed."
(if (and proc (memq (process-status proc) '(run open)))
proc
;; If `non-essential' is non-nil, don't reopen a new connection. It
- ;; will be catched in Tramp.
+ ;; will be caught in Tramp.
(when non-essential
(throw 'non-essential 'non-essential))
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index b98fd272b38..f6db37667ef 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -11671,7 +11671,7 @@
2010-11-11 Dan Davison <davison@stats.ox.ac.uk>
* org.el (org-src-fontify-natively): Set to nil by default.
- Supply cutomize interface.
+ Supply customize interface.
2010-11-11 Bastien Guerry <bzg@gnu.org>
diff --git a/src/dosfns.c b/src/dosfns.c
index 0561a941162..e87b63cf8da 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -23,7 +23,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* The entire file is within this conditional */
#include <stdio.h>
-/* gettine and settime in dos.h clash with their namesakes from
+/* gettime and settime in dos.h clash with their namesakes from
gnulib, so we move out of our way the prototypes in dos.h. */
#define gettime dos_h_gettime_
#define settime dos_h_settime_
@@ -770,4 +770,3 @@ If zero, the decimal point key returns the country code specific value. */);
dos_decimal_point = 0;
}
#endif /* MSDOS */
-
diff --git a/src/msdos.c b/src/msdos.c
index 4dec901988b..ba26b7462e4 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -31,7 +31,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <time.h>
#include <sys/param.h>
#include <sys/time.h>
-/* gettine and settime in dos.h clash with their namesakes from
+/* gettime and settime in dos.h clash with their namesakes from
gnulib, so we move out of our way the prototypes in dos.h. */
#define gettime dos_h_gettime_
#define settime dos_h_settime_