diff options
Diffstat (limited to 'lisp')
| -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 |
6 files changed, 18 insertions, 12 deletions
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> |