diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-03-28 09:38:22 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-28 09:38:22 -0700 |
| commit | 7d8234c0cb9daac31ae2f660f503a3ede7324549 (patch) | |
| tree | 62529bfe7a2ba90f934f416031cbc62930f7124f /lisp/emacs-lisp/bytecomp.el | |
| parent | e6bb547353915b376b663fda32f88d1bf8f24d1f (diff) | |
| parent | 9bff405d09f6eeeb577e6e0111e49f35d3b95b52 (diff) | |
| download | emacs-7d8234c0cb9daac31ae2f660f503a3ede7324549.tar.gz emacs-7d8234c0cb9daac31ae2f660f503a3ede7324549.tar.bz2 emacs-7d8234c0cb9daac31ae2f660f503a3ede7324549.zip | |
Merge from origin/emacs-26
9bff405 (origin/emacs-26) * doc/misc/org.texi (Installation): Fix clo...
613c9a5 Update Org to v9.1.9
1b075a9 ; Fix some tiny doc typos
441fe20 De-obsolete `if-let' and `when-let'
8696038 * lisp/htmlfontify.el (hfy-begin-span-handler): Doc fix.
930f7b1 * doc/lispref/functions.texi (Defining Functions): Improve in...
95ccf50 Fix crash after frame is freed on macOS (bug#30800)
45d0475 More manual editing
2acb9f0 Minor manual changes changes
d481cba * lisp/calculator.el (calculator-paste-decimals): Add version.
7d6c7d0 ; Use GNU not Gnu in docs
1bc4def More proofreading of the Emacs manual
Conflicts:
doc/misc/org.texi
etc/NEWS
lisp/org/org-clock.el
Diffstat (limited to 'lisp/emacs-lisp/bytecomp.el')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 78d3071b168..ea9e3f06555 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -4161,7 +4161,7 @@ Return a list of the form ((TEST . VAR) ((VALUE BODY) ...))" ;; to be non-nil for generating tags for all cases. Since ;; `byte-compile-depth' will increase by at most 1 after compiling ;; all of the clause (which is further enforced by cl-assert below) - ;; it should be safe to preserve it's value. + ;; it should be safe to preserve its value. (let ((byte-compile-depth byte-compile-depth)) (byte-compile-goto 'byte-goto default-tag)) @@ -4179,7 +4179,7 @@ Return a list of the form ((TEST . VAR) ((VALUE BODY) ...))" (let ((byte-compile-depth byte-compile-depth) (init-depth byte-compile-depth)) ;; Since `byte-compile-body' might increase `byte-compile-depth' - ;; by 1, not preserving it's value will cause it to potentially + ;; by 1, not preserving its value will cause it to potentially ;; increase by one for every clause body compiled, causing ;; depth/tag conflicts or violating asserts down the road. ;; To make sure `byte-compile-body' itself doesn't violate this, |