Merge from trunk.

9 files changed, 19 insertions, 15 deletions

diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 9a83d5196db..2028a7c4675 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -317,7 +317,7 @@
                         (match-beginning ,(car highlight))
                         (match-end ,(car highlight))
                         ,(elt highlight 1))))
-                ;; highlight is an "ANCHORED HIGHLIGHER" of the form
+                ;; highlight is an "ANCHORED HIGHLIGHTER" of the form
                 ;; (ANCHORED-MATCHER PRE-FORM POST-FORM SUBEXP-HIGHLIGHTERS...)
                 (when (nth 3 highlight)
                   (error "Match highlights currently not supported in %s"
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index f7965d2cd01..c027b2b7454 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -4007,7 +4007,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and
 /#ebnf2ps#dict 230 dict def
 #ebnf2ps#dict begin
 
-% Initiliaze variables to avoid name-conflicting with document variables.
+% Initialize variables to avoid name-conflicting with document variables.
 % This is the case when using `bind' operator.
 /-fillp-                0 def           /h              0 def
 /-ox-                   0 def           /half           0 def
diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index d8133cb6b90..281fa3cef72 100644
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -268,12 +268,16 @@ file modes."
        (save-restriction
          (widen)
          (string= "#!" (buffer-substring (point-min) (+ 2 (point-min)))))
-       (let* ((current-mode (file-modes (buffer-file-name)))
-              (add-mode (logand ?\111 (default-file-modes))))
-         (or (/= (logand ?\111 current-mode) 0)
-             (zerop add-mode)
-             (set-file-modes (buffer-file-name)
-                             (logior current-mode add-mode))))))
+       (condition-case nil
+           (let* ((current-mode (file-modes (buffer-file-name)))
+                  (add-mode (logand ?\111 (default-file-modes))))
+             (or (/= (logand ?\111 current-mode) 0)
+                 (zerop add-mode)
+                 (set-file-modes (buffer-file-name)
+                                 (logior current-mode add-mode))))
+         ;; Eg file-modes can return nil (bug#9879).  It should not,
+         ;; in this context, but we should handle it all the same.
+         (error (message "Unable to make file executable")))))
 
 (provide 'executable)
 
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 944a412fb63..543539421fe 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2016,7 +2016,7 @@ extension EXTN.  Normally EXTN is given as the regular expression
            ((looking-at "final")
             (forward-char 5))
 
-           ;; Move point past a ClassDeclaraction, but save the class
+           ;; Move point past a ClassDeclaration, but save the class
            ;; Identifier.
            ((looking-at "class")
             (forward-char 5)
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 18f47d14a3f..453badfa46b 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -959,7 +959,7 @@ IDL has currently stepped.")
   ;; Can not use history expansion because "!" is used for system variables.
   (setq comint-input-autoexpand nil)
   ;; (setq comint-input-ring-size 64)
-  
+
   (set (make-local-variable 'completion-ignore-case) t)
   (set (make-local-variable 'comint-completion-addsuffix) '("/" . ""))
   (setq comint-input-ignoredups t)
@@ -3707,7 +3707,7 @@ Existing overlays are recycled, in order to minimize consumption."
 (defun idlwave-shell-make-new-bp-overlay (&optional type disabled)
   "Make a new overlay for highlighting breakpoints.
 
-This stuff is strongly dependant upon the version of Emacs.  If TYPE
+This stuff is strongly dependent upon the version of Emacs.  If TYPE
 is passed, make an overlay of that type ('bp or 'bp-cond, currently
 only for glyphs)."
   (let ((ov (make-overlay 1 1))
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index c77ee4b76a9..95f67a6bf66 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -8961,7 +8961,7 @@ This expects NAME TYPE IDLWAVE-TWIN-CLASS to be bound to the right values."
     (nth 1 source)))
 
 (defun idlwave-downcase-safe (string)
-  "Donwcase if string, else return unchanged."
+  "Downcase if string, else return unchanged."
   (if (stringp string)
       (downcase string)
     string))
diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el
index f0b8f7cbca7..0c43a3ed354 100644
--- a/lisp/progmodes/modula2.el
+++ b/lisp/progmodes/modula2.el
@@ -466,7 +466,7 @@ followed by the first character of the construct.
   '(m2-var) \n _ \n \n
   '(m2-begin)
   '(m2-begin-comment)
-  " Module " str " Initialisation Code "
+  " Module " str " Initialization Code "
   '(m2-end-comment)
   \n \n "END " str "." > \n)
 
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 57ed13969b4..67e3c4a18b4 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -227,7 +227,7 @@ will do all lineups."
   :type '(set :extra-offset 8
               (const :tag "Everything" all)
               (const :tag "Parameter lists" paramlist)
-              (const :tag "Decalrations" declaration)
+              (const :tag "Declarations" declaration)
               (const :tag "Case statements" case))
   :group 'pascal)
 
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index d60e7513651..94d55ee3f61 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -624,7 +624,7 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number
 (defun ps-mode-target-column ()
   "To what column should text on current line be indented?
 
-Identation is increased if the last token on the current line
+Indentation is increased if the last token on the current line
 defines the beginning of a group. These tokens are:  {  [  <<"
   (save-excursion
     (beginning-of-line)