From b5c9c131ca4c0382d32ccb9c59c02a0392276503 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Sun, 28 Dec 2014 15:06:16 -0800
Subject: Spelling fixes

---
 lisp/progmodes/python.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lisp/progmodes/python.el')

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 0d80110f7b7..c16b26100a1 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2531,7 +2531,7 @@ the python shell:
                     (concat
                      (format "# -*- coding: %s -*-\n" encoding)
                      (make-string
-                      ;; Substract 2 because of the coding cookie.
+                      ;; Subtract 2 because of the coding cookie.
                       (- (line-number-at-pos start) 2) ?\n))))
          (toplevel-block-p (save-excursion
                              (goto-char start)
@@ -3951,7 +3951,7 @@ operator."
 
 (defun python-info-encoding-from-cookie ()
   "Detect current buffer's encoding from its coding cookie.
-Returns the enconding as a symbol."
+Returns the encoding as a symbol."
   (let ((first-two-lines
          (save-excursion
            (save-restriction
@@ -3968,9 +3968,9 @@ Returns the enconding as a symbol."
   "Return encoding for file.
 Try `python-info-encoding-from-cookie', if none is found then
 default to utf-8."
-  ;; If no enconding is defined, then it's safe to use UTF-8: Python 2
+  ;; If no encoding is defined, then it's safe to use UTF-8: Python 2
   ;; uses ASCII as default while Python 3 uses UTF-8.  This means that
-  ;; in the worst case escenario python.el will make things work for
+  ;; in the worst case scenario python.el will make things work for
   ;; Python 2 files with unicode data and no encoding defined.
   (or (python-info-encoding-from-cookie)
       'utf-8))
-- 
cgit v1.2.1


From 7e09ef09a479731d01b1ca46e94ddadd73ac98e3 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Thu, 1 Jan 2015 14:26:41 -0800
Subject: Update copyright year to 2015

Run admin/update-copyright.
---
 lisp/progmodes/python.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lisp/progmodes/python.el')

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a1ef9a6fca2..1e8623dd901 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1,6 +1,6 @@
 ;;; python.el --- Python's flying circus support for Emacs -*- lexical-binding: t -*-
 
-;; Copyright (C) 2003-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2015 Free Software Foundation, Inc.
 
 ;; Author: Fabián E. Gallina <fabian@anue.biz>
 ;; URL: https://github.com/fgallina/python.el
-- 
cgit v1.2.1