diff options
| author | Paul Eggert | 2012-07-02 01:00:05 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-07-02 01:00:05 -0700 |
| commit | e3ac128172da6ced7930b8c99d7bf1f2da19cac2 (patch) | |
| tree | 6a875ae0dfb2987b7b25fd815ed5ff2e66e58878 | |
| parent | 3b3e4caca71abc2df49f95090aaccb96cbb75a41 (diff) | |
| download | emacs-e3ac128172da6ced7930b8c99d7bf1f2da19cac2.tar.gz emacs-e3ac128172da6ced7930b8c99d7bf1f2da19cac2.zip | |
Spelling fixes.
| -rw-r--r-- | etc/NEWS | 4 | ||||
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 6 | ||||
| -rw-r--r-- | lisp/loadup.el | 6 | ||||
| -rw-r--r-- | lisp/net/ange-ftp.el | 8 | ||||
| -rw-r--r-- | lisp/org/ChangeLog | 2 | ||||
| -rw-r--r-- | src/dosfns.c | 3 | ||||
| -rw-r--r-- | src/msdos.c | 2 |
9 files changed, 22 insertions, 17 deletions
| @@ -164,8 +164,8 @@ character when doing minibuffer filename prompts. | |||
| 164 | 164 | ||
| 165 | The variables `term-default-fg-color' and `term-default-bg-color' are | 165 | The variables `term-default-fg-color' and `term-default-bg-color' are |
| 166 | now deprecated in favor of the `term-face' face, that you can | 166 | now deprecated in favor of the `term-face' face, that you can |
| 167 | customize. Also, it is now possible to cutomize how are displayed the | 167 | customize. Also, it is now possible to customize how are displayed the |
| 168 | ANSI terminal colors and styles by cutomizing the corresponding | 168 | ANSI terminal colors and styles by customizing the corresponding |
| 169 | `term-color-<COLOR>', `term-color-underline' and `term-color-bold' | 169 | `term-color-<COLOR>', `term-color-underline' and `term-color-bold' |
| 170 | faces. | 170 | faces. |
| 171 | 171 | ||
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d6ad29309e7..cb09a630096 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-07-02 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Spelling fixes. | ||
| 4 | * emacs-lisp/bytecomp.el (byte-compile--reify-function): | ||
| 5 | Rename from byte-compile--refiy-function. All uses changed. | ||
| 6 | |||
| 1 | 2012-07-01 Chong Yidong <cyd@gnu.org> | 7 | 2012-07-01 Chong Yidong <cyd@gnu.org> |
| 2 | 8 | ||
| 3 | * xml.el (xml--parse-buffer): New function. Move most of | 9 | * 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 @@ | |||
| 284 | ;; been preprocessed! | 284 | ;; been preprocessed! |
| 285 | `(function ,fn) | 285 | `(function ,fn) |
| 286 | (byte-compile-preprocess | 286 | (byte-compile-preprocess |
| 287 | (byte-compile--refiy-function fn))))) | 287 | (byte-compile--reify-function fn))))) |
| 288 | (if (eq (car-safe newfn) 'function) | 288 | (if (eq (car-safe newfn) 'function) |
| 289 | (byte-compile-unfold-lambda `(,(cadr newfn) ,@(cdr form))) | 289 | (byte-compile-unfold-lambda `(,(cadr newfn) ,@(cdr form))) |
| 290 | (byte-compile-log-warning | 290 | (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." | |||
| 2367 | ;;(byte-compile-set-symbol-position name) | 2367 | ;;(byte-compile-set-symbol-position name) |
| 2368 | (byte-compile-warn "probable `\"' without `\\' in doc string of %s" | 2368 | (byte-compile-warn "probable `\"' without `\\' in doc string of %s" |
| 2369 | name)) | 2369 | name)) |
| 2370 | 2370 | ||
| 2371 | (if (not (listp body)) | 2371 | (if (not (listp body)) |
| 2372 | ;; The precise definition requires evaluation to find out, so it | 2372 | ;; The precise definition requires evaluation to find out, so it |
| 2373 | ;; will only be known at runtime. | 2373 | ;; will only be known at runtime. |
| @@ -2451,7 +2451,7 @@ If QUOTED is non-nil, print with quoting; otherwise, print without quoting." | |||
| 2451 | (- (position-bytes (point)) (point-min) -1) | 2451 | (- (position-bytes (point)) (point-min) -1) |
| 2452 | (goto-char (point-max)))))) | 2452 | (goto-char (point-max)))))) |
| 2453 | 2453 | ||
| 2454 | (defun byte-compile--refiy-function (fun) | 2454 | (defun byte-compile--reify-function (fun) |
| 2455 | "Return an expression which will evaluate to a function value FUN. | 2455 | "Return an expression which will evaluate to a function value FUN. |
| 2456 | FUN should be either a `lambda' value or a `closure' value." | 2456 | FUN should be either a `lambda' value or a `closure' value." |
| 2457 | (pcase-let* (((or (and `(lambda ,args . ,body) (let env nil)) | 2457 | (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." | |||
| 2488 | (when (symbolp form) | 2488 | (when (symbolp form) |
| 2489 | (unless (memq (car-safe fun) '(closure lambda)) | 2489 | (unless (memq (car-safe fun) '(closure lambda)) |
| 2490 | (error "Don't know how to compile %S" fun)) | 2490 | (error "Don't know how to compile %S" fun)) |
| 2491 | (setq fun (byte-compile--refiy-function fun)) | 2491 | (setq fun (byte-compile--reify-function fun)) |
| 2492 | (setq lexical-binding (eq (car fun) 'closure))) | 2492 | (setq lexical-binding (eq (car fun) 'closure))) |
| 2493 | (unless (eq (car-safe fun) 'lambda) | 2493 | (unless (eq (car-safe fun) 'lambda) |
| 2494 | (error "Don't know how to compile %S" fun)) | 2494 | (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 @@ | |||
| 256 | (load "site-load" t) | 256 | (load "site-load" t) |
| 257 | 257 | ||
| 258 | ;; ¡¡¡ Big Ugly Hack !!! | 258 | ;; ¡¡¡ Big Ugly Hack !!! |
| 259 | ;; src/boostrap-emacs is mostly used to compile .el files, so it needs | 259 | ;; src/bootstrap-emacs is mostly used to compile .el files, so it needs |
| 260 | ;; macroexp, bytecomp, cconv, and byte-opt to be fast. Generally this is done | 260 | ;; macroexp, bytecomp, cconv, and byte-opt to be fast. Generally this is done |
| 261 | ;; by compiling those files first, but this only makes a difference if those | 261 | ;; by compiling those files first, but this only makes a difference if those |
| 262 | ;; files are not preloaded. As it so happens, macroexp.el tends to be | 262 | ;; files are not preloaded. As it so happens, macroexp.el tends to be |
| 263 | ;; accidentally preloaded in src/boostrap-emacs because cl.el and cl-macs.el | 263 | ;; accidentally preloaded in src/bootstrap-emacs because cl.el and cl-macs.el |
| 264 | ;; require it. So lets unload it here, if needed, to make sure the | 264 | ;; require it. So let's unload it here, if needed, to make sure the |
| 265 | ;; byte-compiled version is used. | 265 | ;; byte-compiled version is used. |
| 266 | (if (or (not (fboundp 'macroexpand-all)) | 266 | (if (or (not (fboundp 'macroexpand-all)) |
| 267 | (byte-code-function-p (symbol-function 'macroexpand-all))) | 267 | (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." | |||
| 1201 | (defun ange-ftp-get-passwd (host user) | 1201 | (defun ange-ftp-get-passwd (host user) |
| 1202 | "Return the password for specified HOST and USER, asking user if necessary." | 1202 | "Return the password for specified HOST and USER, asking user if necessary." |
| 1203 | ;; If `non-essential' is non-nil, don't ask for a password. It will | 1203 | ;; If `non-essential' is non-nil, don't ask for a password. It will |
| 1204 | ;; be catched in Tramp. | 1204 | ;; be caught in Tramp. |
| 1205 | (when non-essential | 1205 | (when non-essential |
| 1206 | (throw 'non-essential 'non-essential)) | 1206 | (throw 'non-essential 'non-essential)) |
| 1207 | 1207 | ||
| @@ -1781,7 +1781,7 @@ good, skip, fatal, or unknown." | |||
| 1781 | (defun ange-ftp-gwp-start (host user name args) | 1781 | (defun ange-ftp-gwp-start (host user name args) |
| 1782 | "Login to the gateway machine and fire up an FTP process." | 1782 | "Login to the gateway machine and fire up an FTP process." |
| 1783 | ;; If `non-essential' is non-nil, don't reopen a new connection. It | 1783 | ;; If `non-essential' is non-nil, don't reopen a new connection. It |
| 1784 | ;; will be catched in Tramp. | 1784 | ;; will be caught in Tramp. |
| 1785 | (when non-essential | 1785 | (when non-essential |
| 1786 | (throw 'non-essential 'non-essential)) | 1786 | (throw 'non-essential 'non-essential)) |
| 1787 | (let (;; It would be nice to make process-connection-type nil, | 1787 | (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." | |||
| 1916 | If HOST is only FTP-able through a gateway machine then spawn a shell | 1916 | If HOST is only FTP-able through a gateway machine then spawn a shell |
| 1917 | on the gateway machine to do the FTP instead." | 1917 | on the gateway machine to do the FTP instead." |
| 1918 | ;; If `non-essential' is non-nil, don't reopen a new connection. It | 1918 | ;; If `non-essential' is non-nil, don't reopen a new connection. It |
| 1919 | ;; will be catched in Tramp. | 1919 | ;; will be caught in Tramp. |
| 1920 | (when non-essential | 1920 | (when non-essential |
| 1921 | (throw 'non-essential 'non-essential)) | 1921 | (throw 'non-essential 'non-essential)) |
| 1922 | (let* ((use-gateway (ange-ftp-use-gateway-p host)) | 1922 | (let* ((use-gateway (ange-ftp-use-gateway-p host)) |
| @@ -2138,7 +2138,7 @@ Create a new process if needed." | |||
| 2138 | (if (and proc (memq (process-status proc) '(run open))) | 2138 | (if (and proc (memq (process-status proc) '(run open))) |
| 2139 | proc | 2139 | proc |
| 2140 | ;; If `non-essential' is non-nil, don't reopen a new connection. It | 2140 | ;; If `non-essential' is non-nil, don't reopen a new connection. It |
| 2141 | ;; will be catched in Tramp. | 2141 | ;; will be caught in Tramp. |
| 2142 | (when non-essential | 2142 | (when non-essential |
| 2143 | (throw 'non-essential 'non-essential)) | 2143 | (throw 'non-essential 'non-essential)) |
| 2144 | 2144 | ||
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 @@ | |||
| 11671 | 2010-11-11 Dan Davison <davison@stats.ox.ac.uk> | 11671 | 2010-11-11 Dan Davison <davison@stats.ox.ac.uk> |
| 11672 | 11672 | ||
| 11673 | * org.el (org-src-fontify-natively): Set to nil by default. | 11673 | * org.el (org-src-fontify-natively): Set to nil by default. |
| 11674 | Supply cutomize interface. | 11674 | Supply customize interface. |
| 11675 | 11675 | ||
| 11676 | 2010-11-11 Bastien Guerry <bzg@gnu.org> | 11676 | 2010-11-11 Bastien Guerry <bzg@gnu.org> |
| 11677 | 11677 | ||
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/>. */ | |||
| 23 | /* The entire file is within this conditional */ | 23 | /* The entire file is within this conditional */ |
| 24 | 24 | ||
| 25 | #include <stdio.h> | 25 | #include <stdio.h> |
| 26 | /* gettine and settime in dos.h clash with their namesakes from | 26 | /* gettime and settime in dos.h clash with their namesakes from |
| 27 | gnulib, so we move out of our way the prototypes in dos.h. */ | 27 | gnulib, so we move out of our way the prototypes in dos.h. */ |
| 28 | #define gettime dos_h_gettime_ | 28 | #define gettime dos_h_gettime_ |
| 29 | #define settime dos_h_settime_ | 29 | #define settime dos_h_settime_ |
| @@ -770,4 +770,3 @@ If zero, the decimal point key returns the country code specific value. */); | |||
| 770 | dos_decimal_point = 0; | 770 | dos_decimal_point = 0; |
| 771 | } | 771 | } |
| 772 | #endif /* MSDOS */ | 772 | #endif /* MSDOS */ |
| 773 | |||
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/>. */ | |||
| 31 | #include <time.h> | 31 | #include <time.h> |
| 32 | #include <sys/param.h> | 32 | #include <sys/param.h> |
| 33 | #include <sys/time.h> | 33 | #include <sys/time.h> |
| 34 | /* gettine and settime in dos.h clash with their namesakes from | 34 | /* gettime and settime in dos.h clash with their namesakes from |
| 35 | gnulib, so we move out of our way the prototypes in dos.h. */ | 35 | gnulib, so we move out of our way the prototypes in dos.h. */ |
| 36 | #define gettime dos_h_gettime_ | 36 | #define gettime dos_h_gettime_ |
| 37 | #define settime dos_h_settime_ | 37 | #define settime dos_h_settime_ |