From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 9 Sep 2013 16:26:38 +0000 (-0700)
Subject: Spelling fixes and tidy up a comment.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1662^2~65
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71bd1a008412d223ffa16a5eabd51771b8c94e50;p=emacs.git

Spelling fixes and tidy up a comment.
---

diff --git a/configure.ac b/configure.ac
index 9fcf30ccab3..a9ea5d7a58f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1026,15 +1026,11 @@ dnl (Don't use `-z nocombreloc' as -z takes no arg on Irix.)
 dnl Treat GCC specially since it just gives a non-fatal `unrecognized option'
 dnl if not built to support GNU ld.
 
-dnl For a long time, this was added to LDFLAGS rather than
-dnl LD_SWITCH_SYSTEM_TEMACS.  That is: i) inappropriate, since
-dnl LDFLAGS is supposed to be a user option, and this flag is
-dnl essential.  It can leads to problems if the user overrides
-dnl LDFLAGS at _build_ time (make LDFLAGS=... all), eg
-dnl http://bugs.debian.org/684788.
-dnl ii) unnecessary, since temacs is the only thing
-dnl that actually needs this option - this is where it was orginally:
-dnl http://lists.gnu.org/archive/html/emacs-pretest-bug/2004-03/msg00170.html
+dnl Adding -znocombreloc to LDFLAGS rather than LD_SWITCH_SYSTEM_TEMACS is:
+dnl * inappropriate, as LDFLAGS is a build option but this is essential.  See:
+dnl   http://bugs.debian.org/684788
+dnl * unnecessary, since temacs is the only thing that actually needs it.  See:
+dnl   http://lists.gnu.org/archive/html/emacs-pretest-bug/2004-03/msg00170.html
 late_LDFLAGS="$LDFLAGS"
 if test x$GCC = xyes; then
   LDFLAGS_NOCOMBRELOC="-Wl,-znocombreloc"
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index be151bf8114..05d707acf43 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2140,7 +2140,7 @@ the python shell:
   1. When Optional Argument NOMAIN is non-nil everything under an
      \"if __name__ == '__main__'\" block will be removed.
   2. When a subregion of the buffer is sent, it takes care of
-     appending extra whitelines so tracebacks are correct.
+     appending extra empty lines so tracebacks are correct.
   3. Wraps indented regions under an \"if True:\" block so the
      interpreter evaluates them correctly."
   (let ((substring (buffer-substring-no-properties start end))