auto upstream

5 files changed, 20 insertions, 20 deletions

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 977bc755e32..368b1fc50dc 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -1,4 +1,4 @@
-;;; cc-engine.el --- core syntax guessing engine for CC mode
+;;; cc-engine.el --- core syntax guessing engine for CC mode -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1985, 1987, 1992-2013 Free Software Foundation, Inc.
 
@@ -2280,25 +2280,25 @@ comment at the start of cc-engine.el for more info."
         (while (and c (> (car c) c-state-semi-nonlit-pos-cache-limit))
           (setq c (cdr c)))
         (setq c-state-semi-nonlit-pos-cache c)
-        
+
         (while (and c (> (car c) here))
           (setq high-pos (car c))
           (setq c (cdr c)))
         (setq pos (or (car c) (point-min)))
-        
+
         (unless high-pos
           (while
               ;; Add an element to `c-state-semi-nonlit-pos-cache' each iteration.
               (and
                (<= (setq npos (+ pos c-state-nonlit-pos-interval)) here)
-               
+
                ;; Test for being in a literal.  If so, go to after it.
                (progn
                  (setq lit (car (cddr (c-state-pp-to-literal pos npos))))
                  (or (null lit)
                      (prog1 (<= (cdr lit) here)
                        (setq npos (cdr lit))))))
-               
+
             (setq pos npos)
             (setq c-state-semi-nonlit-pos-cache
                   (cons pos c-state-semi-nonlit-pos-cache))))
@@ -2606,11 +2606,11 @@ comment at the start of cc-engine.el for more info."
   ;; OLD:   {                       (.)    {...........}
   ;;                                       ^             ^
   ;;                                     FROM          HERE
-  ;;                                     
+  ;;
   ;; NEW:   {             {....}    (.)    {.........
   ;;                         ^           ^           ^
   ;;                LOWER BRACE PAIR   HERE   or   HERE
-  ;;                                       
+  ;;
   ;; This routine should be fast.  Since it can get called a LOT, we maintain
   ;; `c-state-brace-pair-desert', a small cache of "failures", such that we
   ;; reduce the time wasted in repeated fruitless searches in brace deserts.
@@ -2907,7 +2907,7 @@ comment at the start of cc-engine.el for more info."
                     start-point))
         (goto-char pos)
         (while (and c-state-cache
-                    (or (numberp (car c-state-cache)) ; Have we a { at all? 
+                    (or (numberp (car c-state-cache)) ; Have we a { at all?
                         (cdr c-state-cache))
                     (< (point) here))
           (cond
@@ -4610,7 +4610,7 @@ comment at the start of cc-engine.el for more info."
                      s                  ; state
                      'syntax-table)))   ; stop-comment
         (setq pos (point)))
-    
+
       ;; Now try and find enough non-literal characters recorded on the stack.
       ;; Go back one recorded literal each time round this loop.
       (while (and (< count how-far-back)
@@ -8516,8 +8516,8 @@ comment at the start of cc-engine.el for more info."
    ))
 
 (defun c-looking-at-special-brace-list (&optional lim)
-  ;; If we're looking at the start of a pike-style list, ie `({ })',
-  ;; `([ ])', `(< >)' etc, a cons of a cons of its starting and ending
+  ;; If we're looking at the start of a pike-style list, i.e., `({ })',
+  ;; `([ ])', `(< >)', etc., a cons of a cons of its starting and ending
   ;; positions and its entry in c-special-brace-lists is returned, nil
   ;; otherwise.  The ending position is nil if the list is still open.
   ;; LIM is the limit for forward search.  The point may either be at
@@ -8762,7 +8762,7 @@ comment at the start of cc-engine.el for more info."
        (c-simple-skip-symbol-backward)
        (looking-at c-macro-with-semi-re)
        (goto-char pos)
-       (not (c-in-literal))))))         ; The most expensive check last. 
+       (not (c-in-literal))))))         ; The most expensive check last.
 
 (defun c-macro-vsemi-status-unknown-p () t) ; See cc-defs.el.
 
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 0d5549e4441..ba9c42e4c89 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -1,4 +1,4 @@
-;;; cc-langs.el --- language specific settings for CC Mode
+;;; cc-langs.el --- language specific settings for CC Mode -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1985, 1987, 1992-2013 Free Software Foundation, Inc.
 
@@ -2907,7 +2907,7 @@ is in effect or not."
 
 (c-lang-defconst c-special-brace-lists
 "List of open- and close-chars that makes up a pike-style brace list,
-i.e. for a ([ ]) list there should be a cons (?\\[ . ?\\]) in this
+i.e. for a ([ ]) list there should be a cons (?\\[ . ?\\]) in this
 list."
   t    nil
   pike '((?{ . ?}) (?\[ . ?\]) (?< . ?>)))
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index fbd1ded35a0..fc753bf7264 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -1,4 +1,4 @@
-;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks
+;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
@@ -207,7 +207,7 @@
 ;;  Dean Andrews, Alf-Ivar Holm, Holger Bauer, Christoph Conrad, Dave Love,
 ;;  Dirk Herrmann, Gael Marziou, Jan Djarv, Guillaume Leray, Moody Ahmad,
 ;;  Preston F. Crow, Lars Lindberg, Reto Zimmermann, Keith Sheffield,
-;;  Chew Meng Kuan, Tony Lam, Pete Ware, François Pinard, Stefan Monnier,
+;;  Chew Meng Kuan, Tony Lam, Pete Ware, François Pinard, Stefan Monnier,
 ;;  Joseph Eydelnant, Michael Ernst, Peter Heslin
 ;;
 ;; Special thanks go to Dan Nicolaescu, who reimplemented hideshow using
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 460dcd69447..85e4172c8fe 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -1,9 +1,9 @@
-;;; prolog.el --- major mode for editing and running Prolog (and Mercury) code
+;;; prolog.el --- major mode for Prolog (and Mercury) -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1986-1987, 1997-1999, 2002-2003, 2011-2013 Free
 ;; Software Foundation, Inc.
 
-;; Authors: Emil Åström <emil_astrom(at)hotmail(dot)com>
+;; Authors: Emil Åström <emil_astrom(at)hotmail(dot)com>
 ;;          Milan Zamazal <pdm(at)freesoft(dot)cz>
 ;;          Stefan Bruda <stefan(at)bruda(dot)ca>
 ;;          * See below for more details
@@ -31,7 +31,7 @@
 ;; Original author: Masanobu UMEDA <umerin(at)mse(dot)kyutech(dot)ac(dot)jp>
 ;; Parts of this file was taken from a modified version of the original
 ;; by Johan Andersson, Peter Olin, Mats Carlsson, Johan Bevemyr, Stefan
-;; Andersson, and Per Danielsson (all SICS people), and Henrik Båkman
+;; Andersson, and Per Danielsson (all SICS people), and Henrik BÃ¥kman
 ;; at Uppsala University, Sweden.
 ;;
 ;; Some ideas and also a few lines of code have been borrowed (not stolen ;-)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index da30edf272b..8f1954402e5 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1842,7 +1842,7 @@ May return nil if the line should not be treated as continued."
 ;; (defconst sh-smie-csh-grammar
 ;;   (smie-prec2->grammar
 ;;    (smie-bnf->prec2
-;;     '((exp)                   ;A constant, or a $var, or a sequence of them…
+;;     '((exp)              ;A constant, or a $var, or a sequence of them...
 ;;       (elseifcmd (cmd)
 ;;                  (cmd "else" "else-if" exp "then" elseifcmd))
 ;;       (cmd ("switch" branches "endsw")